chenjunkai 6 ani în urmă
părinte
comite
82f73a86d8
3 a modificat fișierele cu 24 adăugiri și 3 ștergeri
  1. 22 2
      Controller/CloudVod.py
  2. 1 1
      Controller/MealManage.py
  3. 1 0
      Controller/Test.py

+ 22 - 2
Controller/CloudVod.py

@@ -85,6 +85,7 @@ class CloudVodView(View):
             ip = CommonService.get_ip_address(request)
             return self.do_getSts(request_dict, ip, response)
         # 付款完成
+
         elif operation == 'payExecute':
             return self.do_paypal_execute(request_dict, response)
         elif operation == 'storeplaylist':
@@ -378,12 +379,31 @@ class CloudVodView(View):
             else:
                 end_time = end_time + datetime.timedelta(days=int(add_days))
             dmqs.update(end_time=end_time, update_time=now_time)
-            return response.json(0)
+            # return response.json(0)
         # 新增模式
         else:
             end_time = datetime.timedelta(days=add_days) + datetime.datetime.now()
             Device_Meal.objects.create(rank_id=rank_id, uid=UID, channel=channel, status=0, end_time=end_time)
-            return response.json(0)
+            # return response.json(0)
+        from django.http import HttpResponse
+        response = HttpResponse()
+        response.status_code = 200
+        response.content = '''
+                <!DOCTYPE html>
+        <html lang="en">
+        <head>
+            <meta charset="UTF-8">
+            <title>Title</title>
+        </head>
+        <body>
+        <div class="content"
+             style="text-align:center;overflow: hidden;padding:20% 10% 10% 10%;margin:0 10%;background-color: #fff;box-shadow:0 4px 20px rgba(0,0,0,0.1);word-break: break-all;min-height: 300px">
+            <span style="padding: 10px 20px; font-size: 48px;background-color: #EB6F5A;border-radius:4px;color:#fff;">付款成功</span>
+        </div>
+        </body>
+        </html>
+                '''
+        return response
 
     def do_change_status(self, request_dict, userID, response):
         did = request_dict.get('did', None)

+ 1 - 1
Controller/MealManage.py

@@ -237,7 +237,7 @@ class MealView(View):
             return response.json(414)
 
     def do_query_list(self, response):
-        qs = Store_Meal.objects.all().values("id", "title", "content", "price", "day", "bucket__storeDay",
+        qs = Store_Meal.objects.all().values("id", "title", "content", "price", "day", "currency","bucket__storeDay",
                                              "bucket__bucket")
         if qs.exists():
             # res = CommonService.qs_to_list(qs)

+ 1 - 0
Controller/Test.py

@@ -54,6 +54,7 @@ class Test(View):
 
     @ratelimit(key='ip', rate='1/m')
     def get(self, request, *args, **kwargs):
+
         # 阿里云oss测试
         return self.ossCrd()
         # 七牛测试