ck před 4 roky
rodič
revize
829152240a

+ 22 - 22
dgp/tests/conf/account/wending_account_config.csv

@@ -1,22 +1,22 @@
-03724438,z8HY8agnR6sf4EVb,1037032,廖1期,liao1qi@163.com
-11790115,VjVIGRX5YgJCGQjC,1023015,趣程15期,qucheng15qi@163.com
-62140324,KUUxPIokqtIrtvHQ,1025010,趣程19期,qucheng19qi@163.com
-68442881,RFygHhX16LEYYe8i,1014108,趣程20期,qucheng20qi@163.com
-77257999,86nPtJdYLe1k81gE,1021116,趣程21期,qucheng21qi@163.com
-34655048,FepowoPTVhcAlkA7,1026011,趣程22期,qucheng22qi@163.com
-85233764,KSSwSjlGbuYzp6vn,1023010,趣程23期,qucheng23qi@163.com
-50465587,E5D1qzGtmhbx5EAS,1025020,趣程24期,qucheng24qi@163.com
-20853509,M6hPmkEoJcLLbcFL,1025011,趣程25期,qucheng25qi@163.com
-98062560,cYIgM7MOTws39Kyh,1037015,趣程27期,qucheng27qi@163.com
-99173805,TZgNQu8j7SWLdPP6,1043022,趣程28期,qucheng28qi@163.com
-27390746,4uorQvE8T7ujqCkH,1029008,阳光1期,yangguang1qi@163.com
-69905340,FAUnrQD9ivpvBLVb,1040005,阳光2期,yangguang2qi@163.com
-56356720,f6BT6W5lD99k1GAQ,1026016,陈冲1期,chen01qi@163.com
-10563708,AVsNS2TEDveCL1lN,1040014,视频号1期,shipinhao001@163.com
-75859518,4vJ9WRzcxTeP8N9D,1044009,广州10期,guangzhou10qi@163.com
-53224146,6lVRAh7dgNjSciSs,1043012,趣程17期,chybo4boy4hou4hou@163.com
-24322246,RYh2Ao6LajUFKOXF,1044012,趣程7期,fobu7hr4ahx4ae@163.com
-63663864,51blohkHryMTUkOI,1037007,趣程13期,qucheng13qi@163.com
-12655840,mu1G69KMUkGiBua5,1029021,清勇,244541090@qq.com
-32228088,b8LpIjqo2BAoHATN,1040021,宋1期,heyuan@qingpingyue.cn
-00976354,xielj3RY6Nx9GHIo,1039017,趣程27期,qucheng26qi@163.com
+t03724438,z8HY8agnR6sf4EVb,1037032,廖1期,liao1qi@163.com
+t11790115,VjVIGRX5YgJCGQjC,1023015,趣程15期,qucheng15qi@163.com
+t62140324,KUUxPIokqtIrtvHQ,1025010,趣程19期,qucheng19qi@163.com
+t68442881,RFygHhX16LEYYe8i,1014108,趣程20期,qucheng20qi@163.com
+t77257999,86nPtJdYLe1k81gE,1021116,趣程21期,qucheng21qi@163.com
+t34655048,FepowoPTVhcAlkA7,1026011,趣程22期,qucheng22qi@163.com
+t85233764,KSSwSjlGbuYzp6vn,1023010,趣程23期,qucheng23qi@163.com
+t50465587,E5D1qzGtmhbx5EAS,1025020,趣程24期,qucheng24qi@163.com
+t20853509,M6hPmkEoJcLLbcFL,1025011,趣程25期,qucheng25qi@163.com
+t98062560,cYIgM7MOTws39Kyh,1037015,趣程27期,qucheng27qi@163.com
+t99173805,TZgNQu8j7SWLdPP6,1043022,趣程28期,qucheng28qi@163.com
+t27390746,4uorQvE8T7ujqCkH,1029008,阳光1期,yangguang1qi@163.com
+t69905340,FAUnrQD9ivpvBLVb,1040005,阳光2期,yangguang2qi@163.com
+t56356720,f6BT6W5lD99k1GAQ,1026016,陈冲1期,chen01qi@163.com
+t10563708,AVsNS2TEDveCL1lN,1040014,视频号1期,shipinhao001@163.com
+t75859518,4vJ9WRzcxTeP8N9D,1044009,广州10期,guangzhou10qi@163.com
+t53224146,6lVRAh7dgNjSciSs,1043012,趣程17期,chybo4boy4hou4hou@163.com
+t24322246,RYh2Ao6LajUFKOXF,1044012,趣程7期,fobu7hr4ahx4ae@163.com
+t63663864,51blohkHryMTUkOI,1037007,趣程13期,qucheng13qi@163.com
+t12655840,mu1G69KMUkGiBua5,1029021,清勇,244541090@qq.com
+t32228088,b8LpIjqo2BAoHATN,1040021,宋1期,heyuan@qingpingyue.cn
+t00976354,xielj3RY6Nx9GHIo,1039017,趣程27期,qucheng26qi@163.com

+ 16 - 0
dgp/tests/get_order_dairly_qiyue.py

@@ -170,6 +170,21 @@ def batch_save_order(data):
         finally:
             connect.close()
 
+def batch_save_order_new(data):
+    if data is None or len(data) == 0:
+        print('数据为空,不执行数据库操作!')
+    else:
+        sql = 'INSERT IGNORE INTO quchen_text.ods_order(amount,channel,channel_id,date,from_novel,order_id,order_time,platform,reg_time,stage,user_id) VALUES (%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s);'
+        connect = MySQLConnection()
+        try:
+            num = connect.batch(sql, data)
+            # 提交
+            connect.commit()
+            print('订单数据最终入库【{num}】条'.format(num=num))
+        except Exception as e:
+            print('订单数据入库失败:', e)
+        finally:
+            connect.close()
 
 def start_order_job():
     start_exec_seconds = date_util.getCurrentSecondTime()
@@ -185,6 +200,7 @@ def start_order_job():
     ]
     '''
     batch_save_order(get_qiyue_order(st_unix,et_unix,account_list))
+    batch_save_order_new(get_qiyue_order(st_unix,et_unix,account_list))
     print('订单同步执行时间(秒):', date_util.getCurrentSecondTime() - start_exec_seconds)
 
 

+ 21 - 4
dgp/tests/get_order_dairly_wending.py

@@ -41,7 +41,7 @@ def get_wending_order(st,et,account_list):
 
     futures = []
     for account in account_list:
-    
+
 
 
         futures.append(get_wending_order_task(st, et, account))
@@ -53,7 +53,7 @@ def get_wending_order(st,et,account_list):
             total_order_list = future + total_order_list
 
     print('文鼎订单数量:', len(total_order_list), '执行时长(秒):', date_util.getCurrentSecondTime() - start_exec_seconds)
-
+    print(total_order_list)
     return total_order_list
 
 
@@ -145,7 +145,7 @@ def get_wending_json_object(url,params):
 def get_wending_order_task(st,et,account):
     order_list = ()
     url = 'https://bi.reading.163.com/dist-api/rechargeList'
-    consumerkey = account[0]
+    consumerkey = account[0][1:]
     secretkey = account[1]
     siteid=account[2]
     stage = account[3]
@@ -223,14 +223,31 @@ def batch_save_order(data):
         finally:
             connect.close()
 
+def batch_save_order_new(data):
+    if data is None or len(data) == 0:
+        print('数据为空,不执行数据库操作!')
+    else:
+        sql = 'INSERT IGNORE INTO quchen_text.ods_order(amount,channel,channel_id,date,from_novel,order_id,order_time,platform,reg_time,stage,user_id) VALUES (%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s);'
+        connect = MySQLConnection()
+        try:
+            num = connect.batch(sql, data)
+            # 提交
+            connect.commit()
+            print('订单数据最终入库【{num}】条'.format(num=num))
+        except Exception as e:
+            print('订单数据入库失败:', e)
+        finally:
+            connect.close()
+
 
 def start_order_job():
     st_unix = date_util.get_n_day(n=-1, is_timestamp=1)
     et_unix = date_util.get_n_day(is_timestamp=1)
     account_list = get_wending_account_list()
-    print(account_list)
+
 
     batch_save_order(get_wending_order(st_unix, et_unix,account_list))
+    batch_save_order_new(get_wending_order(st_unix, et_unix,account_list))
 
 
 if __name__ == '__main__':

+ 17 - 0
dgp/tests/get_order_dairly_yangguang.py

@@ -220,6 +220,22 @@ def batch_save_order(data):
         finally:
             connect.close()
 
+def batch_save_order_new(data):
+    if data is None or len(data) == 0:
+        print('数据为空,不执行数据库操作!')
+    else:
+        sql = 'INSERT IGNORE INTO quchen_text.ods_order(amount,channel,channel_id,date,from_novel,order_id,order_time,platform,reg_time,stage,user_id) VALUES (%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s);'
+        connect = MySQLConnection()
+        try:
+            num = connect.batch(sql, data)
+            # 提交
+            connect.commit()
+            print('订单数据最终入库【{num}】条'.format(num=num))
+        except Exception as e:
+            print('订单数据入库失败:', e)
+        finally:
+            connect.close()
+
 
 def start_order_job():
     start_exec_seconds = date_util.getCurrentSecondTime()
@@ -231,6 +247,7 @@ def start_order_job():
     #print('查询结束时间:', et_unix, date_util.getSecondsToDatetime(et_unix))
     ## 20201028添加阳光平台
     batch_save_order(get_yangguang_order(st_unix, et_unix, account_list))
+    batch_save_order_new(get_yangguang_order(st_unix, et_unix, account_list))
     print('订单同步执行时间(秒):', date_util.getCurrentSecondTime() - start_exec_seconds)