修改套餐转移功能_5

Controller/CloudTest.py

@@ -78,7 +78,6 @@ class cloudTestView(View):
 
     def mealTransfer(self, request_dict, response, userID):
         # 云存套餐转移
-        # username = request_dict.get("username", None)
         old_uid = request_dict.get("old_uid", None)
         new_uid = request_dict.get("new_uid", None)
         nowTime = int(time.time())
@@ -94,24 +93,20 @@ class cloudTestView(View):
             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')
             if old_orderModel_qs.exists():
+                # 首次转移,只能转移购买的的套餐(支付类型为体验套餐和激活码不能转移,即pay_type不能为10,11)
                 payType = old_orderModel_qs[0]['payType']
                 old_uid_bucket_id = old_orderModel_qs[0]['uid_bucket_id']
                 if payType == 10 or payType == 11:
-                    return response.json(10014)
-                # old_UIDbucket_qs = UID_Bucket.objects.filter(id=old_uid_bucket_id, endTime__lt=nowTime)
-                old_UIDbucket_qs = UID_Bucket.objects.filter(id=old_uid_bucket_id).values('endTime')
-                old_endTime = old_UIDbucket_qs[0]['endTime']
-                if old_endTime < nowTime:
-                    return response.json(10015)
+                    return response.json(10012)
+                old_UIDbucket_qs = UID_Bucket.objects.filter(id=old_uid_bucket_id, endTime__gt=nowTime)
             else:
                 # 多次转移,根据vod_uid_bucket的uid和endTime查找是否有未过期套餐
                 old_UIDbucket_qs = UID_Bucket.objects.filter(uid=old_uid, endTime__gt=nowTime)
-                if not old_UIDbucket_qs.exists():
-                    return response.json(10015)
+            if not old_UIDbucket_qs.exists():
+                return response.json(10013)
 
             # 确认转入设备套餐是否开通过套餐和套餐已过期
             new_orderModel_qs = Order_Model.objects.filter(userID_id=userID, UID=new_uid).values('uid_bucket_id')
@@ -120,7 +115,7 @@ class cloudTestView(View):
                 new_UIDbucket_qs = UID_Bucket.objects.filter(id=new_uid_bucket_id, endTime__gt=nowTime).values(
                     'endTime')
                 if new_UIDbucket_qs.exists():
-                    return response.json(10013)
+                    return response.json(10014)
 
             with transaction.atomic():
                 # vod_uid_bucket表更新uid
@@ -143,7 +138,7 @@ class cloudTestView(View):
         if UID_Bucket_id:
             nowTime = int(time.time())
             try:
-                UID_Bucket.objects.filter(id=UID_Bucket_id).update(endTime=nowTime-1)
+                UID_Bucket.objects.filter(id=UID_Bucket_id).update(endTime=nowTime - 1)
             except Exception as e:
                 # print(e)
                 return response.json(500, repr(e))

Object/ResponseObject.py

@@ -147,10 +147,9 @@ class ResponseObject(object):
             10009: '用户已拥有此设备，无法转移',
             10010: '不是同一账户下的设备，无法转移',
             10011: '接受转移设备不存在，无法转移',
-            # 10012: '接受转移设备未开通过云存储服务，无法转移',
-            10013: '接受转移设备套餐未过期，无法转移',
-            10014: '体验套餐无法转移',
-            10015: '原设备套餐已过期，无法转移',
+            10012: '体验套餐无法转移',
+            10013: '原设备套餐已过期，无法转移',
+            10014: '接受转移设备套餐未过期，无法转移',
         }
         if self.lang == 'cn':
             msg = data_cn