Merge branch 'stats' into stabble

app/Http/Middleware/ReadOauth.php

@@ -731,8 +731,8 @@ class ReadOauth
 
     //内外部模板客服统计埋点  custom_379989  template_75113
     private function InnerOuterWeixinStats(Request $request,$uid,$distribution_channel_id){
-        if($request->has('jump_from') || !$request->has('from_type')) return ;
-        $from = $request->get('from_type');
+        if($request->has('jump_from') || !$request->has('fromtype')) return ;
+        $from = $request->get('fromtype');
         if(!str_contains($from,['custom','template'])){
             return ;
         }
@@ -744,7 +744,7 @@ class ReadOauth
         $pv_key = sprintf('InnerOuterWeixinStats:pv:%s:%s',$from,$distribution_channel_id);
         $uv_key = sprintf('InnerOuterWeixinStats:uv:%s:%s:%s',$from,$distribution_channel_id,$day);
         Redis::hincrby($pv_key,$day,1);
-        Redis::sadd($uv_key,$this->uid);
+        Redis::sadd($uv_key,$uid);
         Redis::sadd('InnerOuterWeixinStats:'.$day,$from.':'.$distribution_channel_id);
     }
 }