renyupeng 6 mēneši atpakaļ
vecāks
revīzija
5cc7a077c5

+ 2 - 2
Email/AttractInvestmentEmail.py

@@ -63,7 +63,7 @@ from (select
       from {database}.kuaishou_item_bind_user t1
                left join {database}.kuaishou_supply_chain t2
                          on t1.item_id = t2.item_id
-               left join (select id,reg_name from {database}.kuaishou_supply_chain_cookie union all
+               left join (select id,reg_name from ruixuan.kuaishou_supply_chain_cookie union all
             select id,reg_name from miaogousi.kuaishou_supply_chain_cookie union all
                      select id,reg_name from yufu.kuaishou_supply_chain_cookie union all
                      select id,reg_name from rocket.kuaishou_supply_chain_cookie union all
@@ -76,7 +76,7 @@ on t2.regimental_id=t5.id
         and t2.stat_date >= DATE_FORMAT(NOW() - INTERVAL 1 MONTH, '%%Y%%m01')
         and t2.stat_date <= DATE_FORMAT(LAST_DAY(NOW() - INTERVAL 1 MONTH), '%%Y%%m%%d')
 
-      group by t1.user_id) t
+      group by t2.regimental_id,t1.user_id) t
          left join (select item_create_id, count(1) as 'sendSampleCount'
                     from {database}.kuaishou_item_collect_samples
                     where courier_number_time >=  str_to_date(concat(date_format( DATE_FORMAT(NOW() - INTERVAL 1 MONTH, '%%Y-%%m-01'), '%%Y-%%m-%%d'), '00:00:01'), '%%Y-%%m-%%d %%H:%%i:%%s')

+ 2 - 2
Email/CanalEmail.py

@@ -51,7 +51,7 @@ from (select
       from {database}.promoter_bind_channel_date t1
                left join {database}.kuaishou_supply_chain t2
                          on t1.promoter_id = t2.promoter_id and t1.stat_date = t2.stat_date
-      left join  (select id,reg_name from {database}.kuaishou_supply_chain_cookie union all
+      left join  (select id,reg_name from ruixuan.kuaishou_supply_chain_cookie union all
             select id,reg_name from miaogousi.kuaishou_supply_chain_cookie union all
                      select id,reg_name from yufu.kuaishou_supply_chain_cookie union all
                      select id,reg_name from rocket.kuaishou_supply_chain_cookie union all
@@ -63,7 +63,7 @@ from (select
         and t1.media_id = 2
         and t1.stat_date >= DATE_FORMAT(NOW() - INTERVAL 1 MONTH, '%%Y%%m01')
         and t1.stat_date <= DATE_FORMAT(LAST_DAY(NOW() - INTERVAL 1 MONTH), '%%Y%%m%%d')
-      group by t1.user_id) t
+      group by t2.regimental_id,t1.user_id) t
          left join (select user_id,
                            count(distinct promoter_id) as 'promoterCount'
                     from {database}.kuaishou_promoter

+ 2 - 2
Email/IncentiveSettlementEmail.py

@@ -73,10 +73,10 @@ from (select
                         from {database}.kuaishou_item_list
                         where create_time >= date_format(date_sub(NOW(), INTERVAL 1 MONTH), '%%Y-%%m-01')
                           and create_time < date_format(now(), '%%Y-%%m-01'))
-      group by item_id) t1
+      group by regimental_id,item_id) t1
          left join {database}.kuaishou_item_list t2
                    on t1.item_id = t2.item_id
-left join (select id,reg_name from {database}.kuaishou_supply_chain_cookie union all
+left join (select id,reg_name from ruixuan.kuaishou_supply_chain_cookie union all
             select id,reg_name from miaogousi.kuaishou_supply_chain_cookie union all
                      select id,reg_name from yufu.kuaishou_supply_chain_cookie union all
                      select id,reg_name from rocket.kuaishou_supply_chain_cookie union all