浏览代码

异常订单更新订单交易时间

peng 1 年之前
父节点
当前提交
0aa669fdad
共有 3 个文件被更改,包括 14 次插入5 次删除
  1. 6 2
      AdminController/ServeManagementController.py
  2. 1 1
      Controller/Cron/CronTaskController.py
  3. 7 2
      Controller/TestApi.py

+ 6 - 2
AdminController/ServeManagementController.py

@@ -26,6 +26,7 @@ from Model.models import VodBucketModel, CDKcontextModel, Store_Meal, Order_Mode
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Object.UnicomObject import UnicomObjeect
+from Object.utils.PayPalUtil import PayPalService
 from Service.CommonService import CommonService
 
 
@@ -1222,12 +1223,15 @@ class serveManagement(View):
         if not abnormal_order.exists():
             return response.json(173)
         try:
-            trade_no = abnormal_order.values('trade_no')[0]['trade_no']
+            abnormal_order_qs = abnormal_order.values('trade_no', 'pay_time')
+            trade_no = abnormal_order_qs[0]['trade_no']
+            pay_time = abnormal_order_qs[0]['pay_time']
             order_qs = Order_Model.objects.filter(trade_no=trade_no)
             if order_qs.exists():
+                order_qs.update(payTime=pay_time)
                 abnormal_order.update(status=1)
                 return response.json(0)
-            params = {'trade_no': trade_no}
+            params = {'trade_no': trade_no, 'pay_time': pay_time}
             eur_response = requests.get('https://www.zositeche.com/testApi/checkOrderExist', params=params)
             if eur_response.status_code == 200:
                 result = eur_response.json()

+ 1 - 1
Controller/Cron/CronTaskController.py

@@ -1454,7 +1454,7 @@ class CronComparedDataView(View):
                 params = {'trade_no': trade_no}
                 response = requests.get('https://www.zositeche.com/testApi/checkOrderExist', params=params)
                 if response.status_code != 200:
-                    # 如果响应失败,记录记录在数据库
+                    # 如果响应失败,记录在数据库
                     AbnormalOrder.objects.create(**order_dict)
                     continue
                 result = response.json()

+ 7 - 2
Controller/TestApi.py

@@ -32,6 +32,7 @@ from Ansjer.config import (
     SECRET_ACCESS_KEY,
     SERVER_DOMAIN_SSL,
     SERVER_TYPE,
+    CONFIG_TEST,
 )
 from Model.models import (
     CompanySerialModel,
@@ -158,7 +159,7 @@ class testView(View):
             return self.get_pay_pal_transactions(request_dict, response)
         elif operation == 'convertTimestamp':  # 转换时间戳
             return self.convertTimestamp(request_dict, response)
-        elif operation == 'checkOrderExist':  # 转换时间戳
+        elif operation == 'checkOrderExist':  # 检查paypal订单是否存在
             return self.checkOrderExist(request_dict, response)
         else:
             return response.json(414)
@@ -1094,9 +1095,13 @@ class testView(View):
     @staticmethod
     def checkOrderExist(request_dict, response):
         trade_no = request_dict.get('trade_no', None)
+        pay_time = request_dict.get('pay_time', None)
         try:
             order_qs = Order_Model.objects.filter(trade_no=trade_no)
-            is_exist = 1 if order_qs.exists() else 0
+            is_exist = 0
+            if order_qs.exists():
+                is_exist = 1
+                order_qs.update(payTime=pay_time)
             return response.json(0, {'is_exist': is_exist})
         except Exception as e:
             return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))