fix:orderdetail

Controller/CloudVod.py

@@ -27,7 +27,8 @@ from django.views.generic.base import View
 from alipay import AliPay
 
 from Ansjer.config import BASE_DIR
-from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, OSS_ROLE_ARN, SERVER_DOMAIN, PAYPAL_CRD,SERVER_DOMAIN_SSL
+from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, OSS_ROLE_ARN, SERVER_DOMAIN, PAYPAL_CRD, \
+    SERVER_DOMAIN_SSL
 from Model.models import Device_Info, Order_Model, Store_Meal, VodHlsModel, OssCrdModel, UID_Bucket
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
@@ -263,7 +264,8 @@ class CloudVodView(View):
                                        price=price, currency=currency, addTime=nowTime, updTime=nowTime,
                                        endTime=nowTime + int(day) * 3600 * 24, rank_id=rank, paypal='', payType=1)
             return JsonResponse(status=200,
-                                data={'result_code': 0, 'reason': 'success', 'result': {"redirectUrl": redirectUrl},
+                                data={'result_code': 0, 'reason': 'success',
+                                      'result': {"redirectUrl": redirectUrl, "orderID": orderID},
                                       'error_code': 0})
         else:
             return response.json(10, '生成订单错误')
@@ -588,7 +590,7 @@ class CloudVodView(View):
             'arn': token['AssumedRoleUser']['Arn'],
             'code': 0,
             'storage': storage,
-            'endTime':ubqs[0]['endTime'],
+            'endTime': ubqs[0]['endTime'],
             'ip': ip}
         if oc_qs.exists():
             oc_qs.update(data=json.dumps(res), addTime=now_time)

Controller/OrderContrller.py

@@ -60,9 +60,19 @@ class OrderView(View):
             return self.do_admin_delete(request_dict, userID, response)
         elif operation == 'adminQuery':
             return self.do_admin_query(request_dict, userID, response)
+        elif operation == 'detail':
+            return self.do_detail(request_dict, userID, response)
         else:
             return response.json(444, 'error path')
 
+    def do_detail(self, request_dict, userID, response):
+        orderID = request_dict.get('order', None)
+        om_qs = Order_Model.objects.filter(userID_id=userID, orderID=orderID).values('status')
+        if om_qs.exists():
+            return response.json(0, {'status': om_qs[0]['status']})
+        else:
+            return response.json(173)
+
     def do_querylist(self, request_dict, userID, response):
         page = request_dict.get('page', None)
         line = request_dict.get('line', None)
@@ -76,7 +86,6 @@ class OrderView(View):
         if uid:
             omqs.filter(UID=uid)
         if not omqs.exists():
-
             return response.json(173)
             # return response.json(10, '订单不存在')
         count = omqs.count()

Model/models.py

@@ -492,7 +492,7 @@ class Order_Model(models.Model):
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
     updTime = models.IntegerField(verbose_name='更新时间', default=0)
     endTime = models.IntegerField(verbose_name='结束时间', default=0)
-    status = models.SmallIntegerField(default=0, verbose_name='付款状态')
+    status = models.SmallIntegerField(default=0, verbose_name='付款状态') # 0:否，1：成功
     # 订单关联套餐
     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')