feature:订单删除

Controller/CloudVod.py

@@ -112,6 +112,9 @@ class CloudVodView(View):
                 return self.do_filter_playlist(request_dict, userID, response)
             elif operation == 'findVod':
                 return self.do_find_playlist(request_dict, userID, response)
+            # 支付宝支付
+            elif operation == 'aliPay':
+                return
             else:
                 return response.json(414)
 
@@ -215,8 +218,10 @@ class CloudVodView(View):
         if ubqs.exists():
             if ubqs[0]['bucket__region'] != smqs[0]['bucket__region']:
                 return response.json(712)  # 区域不一致
-            elif ubqs[0]['bucket__storeDay'] > smqs[0]['bucket__storeDay']:
-                return response.json(711)  # 不可降级
+            # elif ubqs[0]['bucket__storeDay'] > smqs[0]['bucket__storeDay']:
+            #     return response.json(711)  # 不可降级
+            elif ubqs[0]['bucket__storeDay'] != smqs[0]['bucket__storeDay']:
+                return response.json(713)  # 不可更改套餐
             # 续费流程
         nowTime = int(time.time())
         # 判断是否存在未完成订单

Controller/OrderContrller.py

@@ -114,7 +114,7 @@ class OrderView(View):
         own_perm = ModelService.check_perm(userID, 20)
         if own_perm is True:
             orderID = request_dict.get('orderID')
-            Order_Model.objects.filter(orderID=orderID, userID_id=userID).delete()
+            Order_Model.objects.filter(orderID=orderID).delete()
             return response.json(0)
         else:
             return response.json(404)

Model/models.py

@@ -497,6 +497,7 @@ class Order_Model(models.Model):
     # 订单关联套餐
     rank = models.ForeignKey(Store_Meal, to_field='id', default='', on_delete=models.CASCADE, verbose_name='套餐类型')
     paypal = models.CharField(max_length=150, default='', verbose_name='paypal付款url')
+    payType = models.SmallIntegerField(default=0,verbose_name='付款类型0:paypal,1:alipay')
 
     def __str__(self):
         return self.orderID

Object/ResponseObject.py

@@ -50,6 +50,7 @@ class ResponseObject(object):
             701: 'The file does not exist!',
             711: 'Do not downgrade',
             712: 'Area needs to be consistent',
+            713: 'Storage rules cannot be changed during the validity period',
             900: 'There is no information about this version!',
             901: 'Getting URL failure!',
             902: 'No update!',
@@ -100,6 +101,7 @@ class ResponseObject(object):
             701: '文件不存在',
             711: '不可降级',
             712: '区域不一致',
+            713: '有效期内不可更改存储规则',
             900: '版本信息不存在',
             901: '获取链接失败',
             902: '无更新！',