MOD:修复game,agent_name展示

handlers/OrderHandler.py

@@ -14,13 +14,23 @@ class OrderInfoGame(BaseHandler):
         if not self._au:
             self.write_fail(msg='auth error')
         else:
-            db = MysqlUtils()
             sql = f'''
-            select min(id),name from db_mp.h_game
+            select min(id),name from GameDataSum.h_game_sum hgs 
             group by name
             '''
-            data = db.quchen_text.getData_json(sql)
-            self.write_json(data=data)
+            ck = CkUtils()
+
+            ck.execute(sql)
+
+            data_res = ck.execute(sql)
+            data_res_dict = []
+            for _ in data_res:
+                tmp_dict = {'id': _[0],
+                            'name': _[1]
+                            }
+                data_res_dict.append(tmp_dict)
+
+            self.write_json(data=data_res_dict)
 
 
 class OrderInfoAgent(BaseHandler):
@@ -32,7 +42,6 @@ class OrderInfoAgent(BaseHandler):
             args = self.get_args()
             user_id = args.get('user_id')
 
-            db = MysqlUtils()
             if user_id in super_auth():
                 op = ''
             else:
@@ -45,20 +54,28 @@ class OrderInfoAgent(BaseHandler):
                     op = f" and b.wx_name in {str(UserAuthUtils.get_auth_channel(user_id))}"
 
             sql = f'''
-            select row_number() over() as id,
-                d.user_nicename as agent_name
-                from quchen_text.advertiser_vx a
-                left join db_mp.mp_mp_conf b on a.name =b.wx_name 
-                left join db_mp.mp_conf_agent c on b.id = c.advertiser_conf_id 
-                left join db_mp.h_user d on c.agent_id = d.id
+            select rowNumberInAllBlocks() id,
+            d.user_nicename as agent_name
+                from CostSourceData.advertiser_vx a
+                left join GameDataSum.mp_mp_conf_sum b on a.name =b.wx_name 
+                left join GameDataSum.mp_conf_agent_sum c on b.id = c.advertiser_conf_id 
+                left join GameDataSum.h_user_sum d on c.agent_id = d.id
                 where d.user_nicename is not null
                 {op} 
                 group by d.user_nicename 
             '''
-            data = db.quchen_text.getData_json(sql)
-            data.insert(0, {'id': -1, 'agent_name': '自然流量渠道'})
-            data.insert(0, {'id': -2, 'agent_name': '客服渠道'})
-            self.write_json(data=data)
+            ck = CkUtils()
+
+            data_res = ck.execute(sql)
+            data_res_dict = []
+            for _ in data_res:
+                tmp_dict = {'id': _[0],
+                            'agent_name': _[1]
+                            }
+                data_res_dict.append(tmp_dict)
+            data_res_dict.insert(0, {'id': -1, 'agent_name': '自然流量渠道'})
+            data_res_dict.insert(0, {'id': -2, 'agent_name': '客服渠道'})
+            self.write_json(data=data_res_dict)
 
 
 class OrderInfoNobody(BaseHandler):
@@ -336,7 +353,7 @@ class OrderInfo(BaseHandler):
 
         limit_start = (page - 1) * page_size
         limit_sql = sql + '\n' + f''' limit {limit_start},{page_size} '''
-        print(limit_sql)
+
         sumsql = f""" select '' as id,'' as order_id ,'' as pitcher,'' as agent_name, '' as channel, 
 		            '' as order_time,'' as user_create_time,'' as user_id,
 			        '' as game,sum(amount) as amount ,sum(real_amount) as real_amount ,'' as server_name,
@@ -350,6 +367,7 @@ class OrderInfo(BaseHandler):
         print(sumsql)
         print(totalsql)
         ck = CkUtils()
+        print(limit_sql)
         data_res = ck.execute(limit_sql)
         data_res_dict = []
         data_sum_res = ck.execute(sumsql)