订单拉取优化

dgp/tests/util/platform_order_api_util.py

@@ -259,14 +259,14 @@ 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'] = 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'] = order_item['regtime']
-                order['from_novel'] = ''
+                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(order_item['ctime']) + 8 * 3600) // 86400) * 86400 - 8 * 3600
+                order['date']=int(time.mktime(time.strptime(order['order_time'][:10],'%Y-%m-%d')))
 
                 x = sorted(order.items(), key=lambda item: item[0])
                 x = dict(x)
@@ -375,21 +375,17 @@ def get_huasheng_order_task(st, et, account, merchant):
             for order_item in order_item_list:
                 if order_item['order_status'] == 1:  # 1为已支付
                     order = {}
-                    ##dtime = datetime.datetime.strptime(order_item['pay_at'],"%Y-%m-%d")
-                    ##order['date']= ((int(time.mktime(dtime.timetuple()))+8*3600)//86400)*86400-8*3600
                     order['user_id'] = order_item['openid']
                     order['order_id'] = order_item['trans_id']
                     order['order_time'] = order_item['pay_at']
                     order['reg_time'] = order_item['join_at']
-                    # TODO 花生的时间需要统一
-                    order['date'] = (start_time + 8 * 3600) // 86400 * 86400 - 8 * 3600
                     order['channel'] = merchant_name
                     order['channel_id'] = merchant_id
                     order['platform'] = '花生'
                     order['stage'] = stage
                     order['from_novel'] = order_item['book_name']
                     order['amount'] = order_item['amount']
-
+                    order["date"]=int(time.mktime(time.strptime(order_item['pay_at'][:10],"%Y-%m-%d")))
                     order = sorted(order.items(), key=lambda item: item[0])
                     order = dict(order)
                     order = tuple(order.values())
@@ -398,8 +394,6 @@ def get_huasheng_order_task(st, et, account, merchant):
             if int(page) >= math.ceil(total_count / int(limit)):
                 break
 
-            # print('花生账号【{key}】, 渠道【{merchant_id}:{merchant_name}】当前页【{page}】，本次查询订单数【{total_count}】，即将查询下一页'
-            #       .format(key=apiKey, merchant_id=merchant_id, merchant_name=merchant_name, page=page, total_count=total_count))
 
             page = page + 1
 
@@ -494,16 +488,14 @@ 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'] = 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'] = 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
-            dtime = datetime.datetime.strptime(order_item['created_at'][0:10], "%Y-%m-%d")
-            order['date'] = ((int(time.mktime(dtime.timetuple())) + 8 * 3600) // 86400) * 86400 - 8 * 3600
-
+            order['date'] =int(time.mktime(time.strptime(order['order_time'][:10],"%Y-%m-%d")))
             if str(order_item['from_novel_id']) != 'None':
                 order['from_novel'] = order_item['from_novel']['title']
             else:
@@ -526,7 +518,7 @@ def get_zhangzhongyun_order_task(st, et, account, channel):
 def get_youshuge_order(st, et, account_list):
     start_exec_seconds = date_util.getCurrentSecondTime()
     total_order_list = ()
-    #account_list = platform_config_util.get_youshuge_account_list()
+
 
     executor = ProcessPoolExecutor(max_workers=5)
 
@@ -591,9 +583,6 @@ def get_youshuge_order_task(st, et, account):
 
         for order_item in order_item_list:
             order = {}
-            dtime = datetime.datetime.strptime(order_item['create_time'][0:10], "%Y-%m-%d")
-            order['date'] = ((int(
-                time.mktime(dtime.timetuple())) + 8 * 3600) // 86400) * 86400 - 8 * 3600
             order['order_id'] = order_item['order_num']
             order['amount'] = round(int(order_item['price']) / 100, 2)
             order['order_time'] = order_item['create_time']
@@ -604,7 +593,7 @@ def get_youshuge_order_task(st, et, account):
             order['channel_id'] = channel_id
             order['platform'] = '悠书阁'
             order['reg_time'] = order_item['reg_time']
-
+            order['date']=int(time.mktime(time.strptime(order['order_time'][:10],'%Y-%m-%d')))
             order = sorted(order.items(), key=lambda item: item[0])
             order = dict(order)
             order = tuple(order.values())