|
@@ -41,7 +41,7 @@ class cloudTestView(View):
|
|
if operation == 'deviceTransfer':
|
|
if operation == 'deviceTransfer':
|
|
return self.deviceTransfer(request_dict, response)
|
|
return self.deviceTransfer(request_dict, response)
|
|
elif operation == 'mealTransfer':
|
|
elif operation == 'mealTransfer':
|
|
- return self.mealTransfer(request_dict, response)
|
|
|
|
|
|
+ return self.mealTransfer(request_dict, response, userID)
|
|
|
|
|
|
def deviceTransfer(self, request_dict, response):
|
|
def deviceTransfer(self, request_dict, response):
|
|
# 设备转移
|
|
# 设备转移
|
|
@@ -68,16 +68,16 @@ class cloudTestView(View):
|
|
else:
|
|
else:
|
|
return response.json(0)
|
|
return response.json(0)
|
|
|
|
|
|
- def mealTransfer(self, request_dict, response):
|
|
|
|
|
|
+ def mealTransfer(self, request_dict, response, userID):
|
|
# 云存套餐转移
|
|
# 云存套餐转移
|
|
- username = request_dict.get("username", None)
|
|
|
|
|
|
+ # username = request_dict.get("username", None)
|
|
old_uid = request_dict.get("old_uid", None)
|
|
old_uid = request_dict.get("old_uid", None)
|
|
new_uid = request_dict.get("new_uid", None)
|
|
new_uid = request_dict.get("new_uid", None)
|
|
|
|
|
|
try:
|
|
try:
|
|
# 查询两个UID是否在同一账号下
|
|
# 查询两个UID是否在同一账号下
|
|
- deviceUser_qs = Device_User.objects.filter(username=username).values('userID')
|
|
|
|
- userID = deviceUser_qs[0]['userID']
|
|
|
|
|
|
+ # deviceUser_qs = Device_User.objects.filter(username=username).values('userID')
|
|
|
|
+ # userID = deviceUser_qs[0]['userID']
|
|
old_deviceInfo_qs = Device_Info.objects.filter(userID_id=userID,UID=old_uid).values('isExist','Online')
|
|
old_deviceInfo_qs = Device_Info.objects.filter(userID_id=userID,UID=old_uid).values('isExist','Online')
|
|
new_deviceInfo_qs = Device_Info.objects.filter(userID_id=userID, UID=new_uid).values('isExist')
|
|
new_deviceInfo_qs = Device_Info.objects.filter(userID_id=userID, UID=new_uid).values('isExist')
|
|
if not(old_deviceInfo_qs.exists() and new_deviceInfo_qs.exists()):
|
|
if not(old_deviceInfo_qs.exists() and new_deviceInfo_qs.exists()):
|
|
@@ -125,7 +125,7 @@ class cloudTestView(View):
|
|
stscrdModel_qs.delete()
|
|
stscrdModel_qs.delete()
|
|
|
|
|
|
except Exception as e:
|
|
except Exception as e:
|
|
- print(e)
|
|
|
|
|
|
+ # print(e)
|
|
return response.json(500, repr(e))
|
|
return response.json(500, repr(e))
|
|
else:
|
|
else:
|
|
return response.json(0)
|
|
return response.json(0)
|