chanjunkai 5 年之前
父節點
當前提交
e9e8e5de4f
共有 2 個文件被更改,包括 7 次插入7 次删除
  1. 5 1
      Controller/CloudStorage.py
  2. 2 6
      Controller/OrderContrller.py

+ 5 - 1
Controller/CloudStorage.py

@@ -35,8 +35,12 @@ from Service.CommonService import CommonService
 from Object.m3u8generate import PlaylistGenerator
 
 SERVER_DOMAIN = 'http://cloudstroage.dvema.com/'
+
 '''
-http://test.dvema.com/cloudstorage/createpayorder
+eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySUQiOiIxNTY3NzU4MjE4NjE5MTM4MDAxMzgwMDAiLCJleHAiOjE1ODk1MjM0OTIsIm1fY29kZSI6IjEyMzQxMzI0MzIxNCIsImxhbmciOiJlbiIsInVzZXIiOiIxMzExOTY1NzcxMyJ9.e2NdhJtbXrDngZTSmOX_52Y-oxyfUEXjZD_qNxg6VrU
+
+http://test.dvema.com/cloudstorage/createpayorder?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySUQiOiIxNTY3NzU4MjE4NjE5MTM4MDAxMzgwMDAiLCJleHAiOjE1ODk1MjM0OTIsIm1fY29kZSI6IjEyMzQxMzI0MzIxNCIsImxhbmciOiJlbiIsInVzZXIiOiIxMzExOTY1NzcxMyJ9.e2NdhJtbXrDngZTSmOX_52Y-oxyfUEXjZD_qNxg6VrU&uid=VVDHCVBYDKFMJRWA111A&channel=1&pay_type=0&commodity_code=aws_us_vod_7_val_30
+
 '''
 
 

+ 2 - 6
Controller/OrderContrller.py

@@ -146,17 +146,13 @@ class OrderView(View):
                 return response.json(0, [])
             count = omqs.count()
             order_ql = omqs[(page - 1) * line:page * line].values("orderID", "UID", "channel", "desc", "price",
-                                                                  "currency", "addTime", "updTime", "endTime",
+                                                                  "currency", "addTime", "updTime", "endTime", "paypal",
                                                                   "payType",
                                                                   "rank__day",
                                                                   "rank__price", "status",
                                                                   "rank__content", "rank__title", "rank__currency",
-                                                                  "rank_id","pay_url")
+                                                                  "rank_id")
             order_list = list(order_ql)
-            order_list_data = []
-            for order_data in order_list:
-                order_data['paypal'] = ''
-                order_list_data.append(order_data)
             return response.json(0, {'data': order_list, 'count': count})
 
         else: