|
@@ -1432,8 +1432,8 @@ class CronComparedDataView(View):
|
|
def compared_ansjer_order(response):
|
|
def compared_ansjer_order(response):
|
|
today = datetime.datetime.today()
|
|
today = datetime.datetime.today()
|
|
start_date = today - datetime.timedelta(days=1)
|
|
start_date = today - datetime.timedelta(days=1)
|
|
- start_date = datetime.datetime(start_date.year, start_date.month, 2)
|
|
|
|
- end_date = datetime.datetime(today.year, today.month, 3)
|
|
|
|
|
|
+ start_date = datetime.datetime(start_date.year, start_date.month, start_date.day)
|
|
|
|
+ end_date = datetime.datetime(today.year, today.month, today.day)
|
|
start_date_stamp = int(start_date.timestamp())
|
|
start_date_stamp = int(start_date.timestamp())
|
|
end_date_stamp = int(end_date.timestamp())
|
|
end_date_stamp = int(end_date.timestamp())
|
|
try:
|
|
try:
|
|
@@ -1459,9 +1459,9 @@ class CronComparedDataView(View):
|
|
if result['result_code'] == 0:
|
|
if result['result_code'] == 0:
|
|
eur_order_list = result['result']
|
|
eur_order_list = result['result']
|
|
break
|
|
break
|
|
- begin_date = datetime.datetime(start_time.year, start_time.month, 1)
|
|
|
|
|
|
+ begin_date = start_time - datetime.timedelta(days=15)
|
|
|
|
+ end_date = start_time + datetime.timedelta(days=15)
|
|
start_timestamp = int(start_time.timestamp())
|
|
start_timestamp = int(start_time.timestamp())
|
|
- end_date = begin_date + relativedelta(months=1)
|
|
|
|
now_time = int(time.time())
|
|
now_time = int(time.time())
|
|
more_order_list = []
|
|
more_order_list = []
|
|
total = 0
|
|
total = 0
|
|
@@ -1476,8 +1476,9 @@ class CronComparedDataView(View):
|
|
if all_order_list.index(order) != index:
|
|
if all_order_list.index(order) != index:
|
|
more_order_list.append(order['orderID'])
|
|
more_order_list.append(order['orderID'])
|
|
continue
|
|
continue
|
|
- paypal_url = 'v1/reporting/transactions?start_date={}-{}-01T00:00:00-0700&end_date={}-{}-01T00:00:00-0700&transaction_id={}&fields=all&page_size=100&page=1'.format(
|
|
|
|
- begin_date.year, begin_date.month, end_date.year, end_date.month, order['trade_no'])
|
|
|
|
|
|
+ paypal_url = 'v1/reporting/transactions?start_date={}-{}-{}T00:00:00-0000&end_date={}-{}-{}T00:00:00-0000&transaction_id={}&fields=all&page_size=100&page=1'.format(
|
|
|
|
+ begin_date.year, begin_date.month, begin_date.day, end_date.year, end_date.month, end_date.day,
|
|
|
|
+ order['trade_no'])
|
|
paypal_order_list = paypal_api.get(paypal_url)
|
|
paypal_order_list = paypal_api.get(paypal_url)
|
|
if not paypal_order_list['transaction_details']:
|
|
if not paypal_order_list['transaction_details']:
|
|
more_order_list.append(order['orderID'])
|
|
more_order_list.append(order['orderID'])
|