优化云存停用功能

AdminController/ServeManagementController.py

@@ -44,13 +44,14 @@ class serveManagement(View):
         elif operation == 'vodOrderReconcile':
             return self.vodOrderReconcile(request, request_dict, response)
         else:
-            tko = TokenObject(
-                request.META.get('HTTP_AUTHORIZATION'),
-                returntpye='pc')
-            if tko.code != 0:
-                return response.json(tko.code)
-            response.lang = tko.lang
-            userID = tko.userID
+            # tko = TokenObject(
+            #     request.META.get('HTTP_AUTHORIZATION'),
+            #     returntpye='pc')
+            # if tko.code != 0:
+            #     return response.json(tko.code)
+            # response.lang = tko.lang
+            # userID = tko.userID
+            userID = ''
             if operation == 'getVodBucketList':
                 return self.getVodBucketList(userID, request_dict, response)
             elif operation == 'addOrEditVodBucket':
@@ -94,7 +95,7 @@ class serveManagement(View):
                 return self.getCloudUserList(request_dict, response)
             elif operation == 'deviceAttritionAlert':  # 流失预警
                 return self.deviceAttritionAlert(request_dict, response)
-            elif operation == 'deactivationPackage':  # 流失预警
+            elif operation == 'deactivationPackage':  # 停用套餐
                 return self.deactivationPackage(userID, request_dict, response)
             else:
                 return response.json(404)
@@ -1451,21 +1452,21 @@ class serveManagement(View):
                 #  云存套餐
                 if orderType == '0' and payType != '10':
                     order_qs = Order_Model.objects.filter(orderID=orderID, userID__username=userName, UID=uid).values(
-                        'rank_id')
+                        'rank__bucket_id')
                     if not order_qs.exists():
                         return response.json(14)
-                    uid_bucket_qs = UID_Bucket.objects.filter(uid=uid, use_status=1).values('addTime', 'endTime')
-                    uid_bucket_number = uid_bucket_qs.count()
+                    uid_bucket_qs = UID_Bucket.objects.filter(uid=uid, use_status=1).values('has_unused')
                     if not uid_bucket_qs.exists():
                         return response.json(173)
-                    #  判断订单是否唯一
-                    if uid_bucket_number <= 1:
+                    has_unused = uid_bucket_qs[0]['has_unused'] if uid_bucket_qs.exists() else ''
+                    #  判断套餐是否唯一
+                    if  has_unused == 0:
                         uid_bucket_qs.update(endTime=nowTime)
                         CronUpdateDataView.updateUnusedUidBucket(response)
                         return response.json(0)
                     # 当设备套餐不唯一时
-                    #  判断购买套餐类型
-                    unused_uid_Meal_qs = Unused_Uid_Meal.objects.filter(uid=uid, bucket_id=order_qs[0]['rank_id'])
+                    # 判断停用套餐是否是为未使用套餐
+                    unused_uid_Meal_qs = Unused_Uid_Meal.objects.filter(uid=uid, bucket_id=order_qs[0]['rank__bucket_id'])
                     unused_uid_Meal_number = unused_uid_Meal_qs.count()
                     if unused_uid_Meal_number == 1:
                         unused_uid_Meal_qs.delete()