|
|
@@ -259,14 +259,17 @@ def get_zhangdu_order_task(st, et, account):
|
|
|
order['amount'] = order_item['amount']
|
|
|
order['channel_id'] = uid
|
|
|
order['order_id'] = str(order_item['orderno'])
|
|
|
- order['order_time'] = date_util.stamp_to_str(int(order_item['ctime']))
|
|
|
+ order['order_time']=order_item['ctime']
|
|
|
+ # order['order_time'] = date_util.stamp_to_str(int(order_item['ctime']))
|
|
|
order['user_id'] = order_item['openid']
|
|
|
order['platform'] = '掌读'
|
|
|
order['channel'] = channel
|
|
|
- order['reg_time'] = date_util.stamp_to_str(int(order_item['regtime']))
|
|
|
+ order['reg_time']=order_item['regtime']
|
|
|
+ # order['reg_time'] = date_util.stamp_to_str(int(order_item['regtime']))
|
|
|
order['from_novel'] = order_item.get('book_entry','')
|
|
|
order['stage'] = ''
|
|
|
- order['date']=int(time.mktime(time.strptime(order['order_time'][:10],'%Y-%m-%d')))
|
|
|
+ order_time=date_util.stamp_to_str(int(order_item['ctime']))
|
|
|
+ order['date']=int(time.mktime(time.strptime(order_time[:10],'%Y-%m-%d')))
|
|
|
|
|
|
x = sorted(order.items(), key=lambda item: item[0])
|
|
|
x = dict(x)
|
|
|
@@ -488,14 +491,17 @@ def get_zhangzhongyun_order_task(st, et, account, channel):
|
|
|
order = {}
|
|
|
order['user_id'] = str(order_item['member']['openid'])
|
|
|
order['channel'] = channel_name
|
|
|
- order['reg_time'] = datetime.datetime.strptime(order_item['member']['created_at'],"%Y-%m-%dT%H:%M:%S+08:00").strftime("%Y-%m-%d %H:%M:%S")
|
|
|
+ order['reg_time']=order_item['member']['created_at']
|
|
|
+ # order['reg_time'] = datetime.datetime.strptime(order_item['member']['created_at'],"%Y-%m-%dT%H:%M:%S+08:00").strftime("%Y-%m-%d %H:%M:%S")
|
|
|
order['channel_id'] = channel_id
|
|
|
order['amount'] = round(order_item['price'] / 100, 2)
|
|
|
order['order_id'] = str(order_item['id'])
|
|
|
- order['order_time'] = datetime.datetime.strptime(order_item['created_at'],"%Y-%m-%dT%H:%M:%S+08:00").strftime("%Y-%m-%d %H:%M:%S")
|
|
|
+ order['order_time']= order_item['created_at']
|
|
|
+ # order['order_time'] = datetime.datetime.strptime(order_item['created_at'],"%Y-%m-%dT%H:%M:%S+08:00").strftime("%Y-%m-%d %H:%M:%S")
|
|
|
order['platform'] = '掌中云'
|
|
|
order['stage'] = stage
|
|
|
- order['date'] =int(time.mktime(time.strptime(order['order_time'][:10],"%Y-%m-%d")))
|
|
|
+ order_time=datetime.datetime.strptime(order_item['created_at'],"%Y-%m-%dT%H:%M:%S+08:00").strftime("%Y-%m-%d %H:%M:%S")
|
|
|
+ order['date'] =int(time.mktime(time.strptime(order_time[:10],"%Y-%m-%d")))
|
|
|
if str(order_item['from_novel_id']) != 'None':
|
|
|
order['from_novel'] = order_item['from_novel']['title']
|
|
|
else:
|
