优化自动续费及停用套餐

AdminController/ServeManagementController.py

@@ -1662,7 +1662,7 @@ class serveManagement(View):
                         if not unused_meal_qs.exists():
                             UID_Bucket.objects.filter(uid=uid).update(has_unused=0, updateTime=nowTime)
                         return response.json(0)
-                    unused_uid_Meal_qs = Unused_Uid_Meal.objects.filter(uid=uid, bucket_id=bucket_id)
+                    unused_uid_Meal_qs = Unused_Uid_Meal.objects.filter(uid=uid, bucket_id=bucket_id, order_id='')
                     if unused_uid_Meal_qs.exists():  # 如果通过uid查询到未使用套餐则删除套餐
                         unused_uid_Meal_qs.first().delete()
                         unused_meal_qs = Unused_Uid_Meal.objects.filter(uid=uid)

Controller/PaymentCycle.py

@@ -26,7 +26,7 @@ PAY_LOGGER = logging.getLogger('pay')
 class Paypal:
     # 检查是否有重复订阅
     def checkSubscriptions(userID, uid, rank):
-        hasOrder = Order_Model.objects.filter(UID=uid, rank=rank)
+        hasOrder = Order_Model.objects.filter(UID=uid)
         hasOrder = hasOrder.filter(~Q(agreement_id='')).values('agreement_id', 'orderID').order_by('-addTime')[0:1]
         if not hasOrder.exists():
             return True