Merge branch 'dev' into lang

# Conflicts:
#	Controller/CloudStorage.py

Controller/CloudStorage.py

@@ -253,12 +253,12 @@ class CloudStorageView(View):
         bucket_name = vh_qs[0]['bucket__bucket']
         print(bucket__region)
         print(bucket_name)
-        aws_access_key_id = 'AKIA2E67UIMD45Y3HL53'
-        aws_secret_access_key = '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'
+
+
         session = Session(
-            aws_access_key_id=aws_access_key_id,
-            aws_secret_access_key=aws_secret_access_key,
-            region_name=bucket__region
+            aws_access_key_id=AWS_ACCESS_KEY_ID[vh_qs[0]["bucket__mold"]],
+            aws_secret_access_key = AWS_SECRET_ACCESS_KEY[vh_qs[0]["bucket__mold"]],
+            aws_arn = AWS_ARN[vh_qs[0]["bucket__mold"]]
         )
         '''
             http://test.dvema.com/cloudstorage/signplaym3u8?uid=VVDHCVBYDKFMJRWA111A&channel=1&time=1586940120&sign=tktktktk
@@ -985,10 +985,10 @@ class CloudStorageView(View):
 
         orderID = CommonService.createOrderID()
         if pay_type == 1:
-            #call_sub_url = "{SERVER_DOMAIN}cloudstorage/dopaypalcallback?orderID={orderID}". \
-                #format(SERVER_DOMAIN=SERVER_DOMAIN, orderID=orderID)
-            call_sub_url = "http://binbin.uicp.vip/cloudstorage/dopaypalcallback?orderID={orderID}".format(
-                 SERVER_DOMAIN=SERVER_DOMAIN, orderID=orderID)
+            call_sub_url = "{SERVER_DOMAIN}cloudstorage/dopaypalcallback?orderID={orderID}". \
+                format(SERVER_DOMAIN=SERVER_DOMAIN, orderID=orderID)
+            # call_sub_url = "http://binbin.uicp.vip/cloudstorage/dopaypalcallback?orderID={orderID}".format(
+            # SERVER_DOMAIN=SERVER_DOMAIN, orderID=orderID)
             call_clc_url = "{SERVER_DOMAIN}web/paid2/fail.html".format(SERVER_DOMAIN=SERVER_DOMAIN)
             paypalrestsdk.configure(PAYPAL_CRD)
             payment = paypalrestsdk.Payment({
@@ -1070,12 +1070,11 @@ class CloudStorageView(View):
             # 获取参数
             response = ResponseObject()
 
-            price = float(price) * 100
-            parameter_dict = pay.get_parameter(orderID, content, price, ip, notify_url)
+            parameter_dict = pay.get_parameter(orderID, content, float(price) * 100, ip, notify_url)
             print('parameter_dict', parameter_dict)
             # parameter_dict 参数中获取MWEB_URL 调转页面在路径后面添加redirect_url
             # 统一调用接口
-            response = pay.re_finall()
+            response = pay.re_finall(orderid=orderID)
             if not response:
                 return response.json(10, '生成订单错误.')
             # 回调函数

Controller/MealManage.py

@@ -127,9 +127,11 @@ class MealManage(View):
         line = int(request_dict.get('line', None))
         if page is None or line is None:
             return response.json(444)
+
         qs = Store_Meal.objects.values("id", "title", "price", "content", "day", "add_time", "update_time", "currency"
-                                       , "bucket_id", "bucket__bucket", "bucket__area", "commodity_type", "commodity_code",
-                                       "bucket__storeDay", "virtual_price", "is_discounts", "discount_price", "discount_content", "expire", "symbol")
+                                       , "bucket_id", "commodity_type", "commodity_code", "virtual_price", "is_discounts"
+                                       , "discount_price", "discount_content", "expire", "symbol"
+                                       , "bucket__bucket", "bucket__area", "bucket__storeDay")
         res = {}
         if qs.exists():
             ql = list(qs)
@@ -137,16 +139,13 @@ class MealManage(View):
             from itertools import groupby
             ql.sort(key=itemgetter('bucket__area'))
             ql=CommonService.qs_to_list(ql[(page - 1) * line:page * line])
-            for area, items in groupby(ql, key=itemgetter('bucket__area')):
-                items_list = list(items)
-                for key, val in enumerate(items_list):
-                    pay_types = Pay_Type.objects.filter(store_meal=items_list[key]['id']).values("id", "payment")
-                    items_list[key]['pay_type'] = list(pay_types)
-
-
-                res['count'] = len(ql)
-                res['data'] = items_list
-
+            # for area, items in groupby(ql, key=itemgetter('bucket__area')):
+            items_list = list(ql)
+            for key, val in enumerate(items_list):
+                pay_types = Pay_Type.objects.filter(store_meal=items_list[key]['id']).values("id", "payment")
+                items_list[key]['pay_type'] = list(pay_types)
+        res['count'] = len(ql)
+        res['data'] = items_list
         return response.json(0, res)
 
     def update(self, request_dict, userID, response):