修改套餐转移功能_3

Controller/CloudTest.py

@@ -90,6 +90,10 @@ class cloudTestView(View):
             if not (old_deviceInfo_qs.exists() and new_deviceInfo_qs.exists()):
                 return response.json(10010)
 
+            new_isExist = new_deviceInfo_qs[0]['isExist']
+            if not new_isExist:
+                return response.json(10011)
+
             # 只能转移购买的的套餐(支付类型为体验套餐和激活码不能转移,即pay_type不能为10,11)
             old_orderModel_qs = Order_Model.objects.filter(userID_id=userID, UID=old_uid).values('payType',
                                                                                                  'uid_bucket_id')
@@ -109,13 +113,6 @@ class cloudTestView(View):
                 if not old_UIDbucket_qs.exists():
                     return response.json(10015)
 
-            # 转出设备套餐未过期或已删除或不在线才能进行转移
-            old_isExist = old_deviceInfo_qs[0]['isExist']
-            old_Online = old_deviceInfo_qs[0]['Online']
-            new_isExist = new_deviceInfo_qs[0]['isExist']
-            if old_isExist or old_Online or not new_isExist:
-                return response.json(10011)
-
             # 确认转入设备套餐是否开通过套餐和套餐已过期
             new_orderModel_qs = Order_Model.objects.filter(userID_id=userID, UID=new_uid).values('uid_bucket_id')
             if new_orderModel_qs.exists():

Object/ResponseObject.py

@@ -146,7 +146,7 @@ class ResponseObject(object):
             10008: '用户没有此设备，无法转移',
             10009: '用户已拥有此设备，无法转移',
             10010: '不是同一账户下的设备，无法转移',
-            10011: '原设备正在正常使用云存储服务，无法转移',
+            10011: '接受转移设备不存在，无法转移',
             # 10012: '接受转移设备未开通过云存储服务，无法转移',
             10013: '接受转移设备套餐未过期，无法转移',
             10014: '体验套餐无法转移',