|
|
@@ -1362,10 +1362,11 @@ class CronComparedDataView(View):
|
|
|
('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_order,
|
|
|
- args=(order_list['transaction_details']))
|
|
|
+ args=(order_list['transaction_details'],))
|
|
|
thread.start()
|
|
|
return response.json(0)
|
|
|
except Exception as e:
|
|
|
@@ -1387,7 +1388,6 @@ class CronComparedDataView(View):
|
|
|
order_dict = {
|
|
|
'trade_no': trade_no,
|
|
|
'agreement_id': agreement_id,
|
|
|
- 'order_id': order_id,
|
|
|
'pay_time': pay_time,
|
|
|
'username': item['payer_info']['email_address'],
|
|
|
'price': item['transaction_info']['transaction_amount']['value'],
|
|
|
@@ -1395,8 +1395,9 @@ class CronComparedDataView(View):
|
|
|
'upd_time': now_time,
|
|
|
'status': 0
|
|
|
}
|
|
|
- if order_id and agreement_id:
|
|
|
+ if agreement_id:
|
|
|
order_dict['pay_type'] = 0
|
|
|
+ order_dict['order_id'] = order_id
|
|
|
params = {'trade_no': trade_no}
|
|
|
response = requests.get('https://www.zositeche.com/testApi/checkOrderExist', params=params)
|
|
|
if response.status_code != 200:
|
