掌读

app/api_data/get_order.py

@@ -112,7 +112,7 @@ def zhangdu(start=None, end=None, new=None):
     if start is None:
         start = end = du.getNow()
 
-    accounts = get_account("掌读") if new is None else get_new_account('掌读')
+    accounts = get_account("掌读")
     if len(accounts) == 0:
         return
     else:
@@ -236,4 +236,5 @@ if __name__ == '__main__':
     # huasheng()
     # qiyue()
     # qiyueyousheng()
-    wending()
+    # wending()
+    zhangdu()

app/api_data/order_util.py

@@ -461,6 +461,7 @@ def get_zd_order_task(start,end,account):
                 'page': page
             }
             response_result_json = requests.get(url=url, params=params).json()
+            # print(response_result_json)
             if 'data' not in response_result_json.keys():
                 print(f'掌读账号【{uid}】, 查询时间【{i[0]} - {i[1]}】，本次请求数据异常，响应报文【{response_result_json}】')
                 break
@@ -471,25 +472,25 @@ def get_zd_order_task(start,end,account):
                 break
 
             order_item_list = result_data['list']
-            for order_item in order_item_list:
-                if order_item['status'] != '1':  # 1为已支付
-                    continue
-                order_time = order_item['ctime']
-                order = (
-                    str(DateUtils.stamp_to_date_stamp(int(order_time))),
+            for i in order_item_list:
+
+                order_time = DateUtils.stamp_to_str(i['ctime'])
+                reg_time = DateUtils.stamp_to_str(i['regtime'])
+                order_list.append((
+                    order_time[:10],
                     stage,
                     '掌读',
                     channel,
                     uid,
-                    order_item['openid'],
+                    i['openid'],
                     order_time,
-                    order_item['regtime'],
-                    order_item['amount'],
-                    order_item.get('book_entry', ''),
-                    str(order_item['orderno'])
-                )
+                    reg_time,
+                    i['amount'],
+                    i['book_entry'],
+                    i['orderno'],
+                    2 if i['status'] == '1' else 1
 
-                order_list.append(order)
+                ))
 
             if page == page_count:  # 是最后一页
                 break
@@ -497,6 +498,7 @@ def get_zd_order_task(start,end,account):
 
     print(f"{channel} [{start}]~[{end}] 有订单 {order_list.__len__()}")
     if len(order_list) > 0:
+        # print(order_list)
         save_order(order_list)