Merge branch 'test' of http://192.168.136.99:3000/servers/ASJServer into locky

Controller/Cron/CronTaskController.py

@@ -1494,15 +1494,19 @@ class CronComparedDataView(View):
             start_date = datetime.datetime(start_date.year, start_date.month, start_date.day)
             end_date = start_date + datetime.timedelta(days=1)
         try:
-            data = (
-                ('start_date', '{}-{}-{}T08:00:00-0800'.format(start_date.year, start_date.month, start_date.day)),
-                ('end_date', '{}-{}-{}T08:00:00-0800'.format(end_date.year, end_date.month, end_date.day)),
-                ('fields', 'all'),
-                ('page_size', '500'),
-                ('page', '1'),
-                ('transaction_status', 'S')
-            )
-            order_list = PayPalService(PAYPAL_CRD['client_id'], PAYPAL_CRD['client_secret']).get_transactions(data)
+            paypal_api = paypalrestsdk.Api(PAYPAL_CRD)
+            paypal_url = 'v1/reporting/transactions?start_date={}-{}-{}T08:00:00-0800&end_date={}-{}-{}T08:00:00-0800&fields=all&page_size=500&page=1&transaction_status=S'.format(
+                start_date.year, start_date.month, start_date.day, end_date.year, end_date.month, end_date.day)
+            order_list = paypal_api.get(paypal_url)
+            # data = (
+            #     ('start_date', '{}-{}-{}T08:00:00-0800'.format(start_date.year, start_date.month, start_date.day)),
+            #     ('end_date', '{}-{}-{}T08:00:00-0800'.format(end_date.year, end_date.month, end_date.day)),
+            #     ('fields', 'all'),
+            #     ('page_size', '500'),
+            #     ('page', '1'),
+            #     ('transaction_status', 'S')
+            # )
+            # order_list = PayPalService(PAYPAL_CRD['client_id'], PAYPAL_CRD['client_secret']).get_transactions(data)
             thread = threading.Thread(target=CronComparedDataView.thread_compared_paypal_order,
                                       args=(order_list['transaction_details'], end_date))
             thread.start()  # 启动线程
@@ -1565,6 +1569,7 @@ class CronComparedDataView(View):
                 if result['result_code'] != 0 or not result['result']['is_exist']:
                     # 如果响应结果为空，记录在数据库
                     AbnormalOrder.objects.create(**order_dict)
+                    more_order_list.append(trade_no)
             else:
                 if not refund_order:
                     order_qs.update(payTime=pay_time)
@@ -1572,7 +1577,8 @@ class CronComparedDataView(View):
         daily_reconciliation = DailyReconciliation.objects.filter(time=timestamp)
         if daily_reconciliation.exists():
             if daily_reconciliation.first().order_ids:
-                more_order_list = daily_reconciliation.first().order_ids.split(',') + more_order_list
+                old_order_list = daily_reconciliation.first().order_ids.split(',')
+                more_order_list = list(set(old_order_list) | set(more_order_list))
             order_ids = ','.join(more_order_list)
             daily_reconciliation.update(paypal_num=count, paypal_total=total, upd_time=now_time, order_ids=order_ids)
         else:
@@ -1743,7 +1749,8 @@ class CronComparedDataView(View):
         daily_reconciliation = DailyReconciliation.objects.filter(time=start_timestamp)
         if daily_reconciliation.exists():
             if daily_reconciliation.first().order_ids:
-                more_order_list = daily_reconciliation.first().order_ids.split(',') + more_order_list
+                old_order_list = daily_reconciliation.first().order_ids.split(',')
+                more_order_list = list(set(old_order_list) | set(more_order_list))
             order_ids = ','.join(more_order_list)
             daily_reconciliation.update(ansjer_total=total, ansjer_num=count, order_ids=order_ids, upd_time=now_time)
         else: