Merge branch 'master' of http://gitlab.test.2vm.co/qhz/scan-optimization

扫码二次统计方案( 第三版).md

@@ -225,23 +225,23 @@ select count(*) as k,day, dealer_id,store_id, product_id from ydd_fw_scans group
 
 ```
 select count(*) from (
-
 select 
 
-	count(distinct(a.member_id)) as user_num,
-	SUM(if(a.is_point=1,a.point_num,0)) as grant_point_num,
-	SUM(if(a.is_bonus=1,a.bonus_num,0)) as grant_bonus_num,
-	SUM(if(a.is_gift=1,1,0)) as grant_gift_number,
-	SUM(if(a.is_many_awards=1 and a.is_award=1,1,0)) as is_many_awards_num,
-	SUM(if(s.is_first=1 and a.is_award=1,1,0)) as no_many_awards_num,
-	count(if(s.is_first=1,1,0)) as first_scan_num,
-	s.day,
-	s.dealer_id,
-	s.store_id,
-	s.product_id,
-	s.province_id,
-	s.city_id,
-	s.district_id
+    count(distinct(a.member_id)) as user_num,
+    SUM(if(a.is_point=1,a.point_num,0)) as grant_point_num,
+    SUM(if(a.is_bonus=1,a.bonus_num,0)) as grant_bonus_num,
+    SUM(if(a.is_gift=1,1,0)) as grant_gift_number,
+    SUM(if(a.is_many_awards=1 and a.is_award=1,1,0)) as is_many_awards_num,
+    SUM(if(s.is_first=1 and a.is_award=1,1,0)) as no_many_awards_num,
+    count(if(s.is_first=1,1,0)) as first_scan_num,
+    s.day,
+    s.dealer_id,
+    s.store_id,
+    s.product_id,
+    s.province_id,
+    s.city_id,
+    s.district_id,
+    s.street_id
 from 
     ydd_fw_scan_awards as a 
 left join 
@@ -250,15 +250,15 @@ left join
 where 
     a.day = 20240212 
 
-group by s.day,s.dealer_id, s.store_id, s.product_id, s.province_id, s.city_id, s.district_id
+group by s.day,s.dealer_id, s.store_id, s.product_id, s.province_id, s.city_id, s.district_id, s.street_id
 ) as a;
 
 +----------+
 | count(*) |
 +----------+
-|    10001 |
+|    15625 |
 +----------+
-1 row in set (0.83 sec)
+1 row in set (1.17 sec)
 
 ```