ttt

Controller/OrderContrller.py

@@ -56,6 +56,8 @@ class OrderView(View):
         userID = tko.userID
         if operation == 'querylist':
             return self.do_querylist(request_dict, userID, response)
+        elif operation == 'delete':
+            return self.do_deleteOrder(request_dict, userID, response)
         else:
             return response.json(444, 'error path')
 
@@ -80,34 +82,20 @@ class OrderView(View):
         if did:
             omqs.order_by()
         count = omqs.count()
-        order_ql = omqs[(page - 1) * line:page * line].values("orderID", "UID", "channel", "desc", "price","currency", "addTime",
+        order_ql = omqs[(page - 1) * line:page * line].values("orderID", "UID", "channel", "desc", "price", "currency",
+                                                              "addTime",
                                                               "updTime", "endTime", "paypal", "rank__day",
                                                               "rank__price", "status",
-                                                              "rank__content", "rank__title", "rank__currency","rank_id")
+                                                              "rank__content", "rank__title", "rank__currency",
+                                                              "rank_id")
         order_list = list(order_ql)
         data = []
         nowTime = CommonService.get_utc()
         # 这里需要进行优化
-        # for d in order_list:
-        #     # 未付款的一个小时后过期
-        #     if d['status'] == 0:
-        #         if d['addTime'] + 3600 < nowTime:
-        #             d['status'] = 3
-        #     if did:
-        #         d['did'] = did
-        #     else:
-        #         didqs = Device_Info.objects.filter(userID_id=userID, UID=d['UID']).values('id')
-        #         if didqs.exists():
-        #             did = didqs[0]['id']
-        #         else:
-        #             did = ''
-        #         d['did'] = did
-        #     data.append(d)
-        #################
         uid_list = []
         for od in order_list:
             uid_list.append(od['UID'])
-        didqs = Device_Info.objects.filter(userID_id=userID, UID__in=uid_list).values('id','UID')
+        didqs = Device_Info.objects.filter(userID_id=userID, UID__in=uid_list).values('id', 'UID','Type')
         for d in order_list:
             if d['status'] == 0:
                 if d['addTime'] + 3600 < nowTime:
@@ -115,5 +103,11 @@ class OrderView(View):
             for did in didqs:
                 if d['UID'] == did['UID']:
                     d['did'] = did['id']
+                    d['Type'] = did['Type']
                     data.append(d)
         return response.json(0, {'data': data, 'count': count})
+
+    def do_deleteOrder(self, request_dict, userID, response):
+        orderID = request_dict.get('orderID')
+        Order_Model.objects.filter(orderID=orderID, userID_id=userID).delete()
+        return response.json(0)