统计

modules/Statistic/Http/Controllers/UserStatisticsController.php

@@ -67,6 +67,18 @@ class UserStatisticsController extends CatchController
      */
     public function list(Request $request){
         $param = $request->all();
+        $param = $this->getlistParams($param);
+       return UserStatisticsService::list($param);
+    }
+
+    public function listStatistics(Request $request){
+        $param = $request->all();
+        $param = $this->getlistParams($param);
+        return UserStatisticsService::listStatistics($param);
+    }
+
+    private function getlistParams($param)
+    {
         $userContext = $this->getUserContext(null);
         if (getProp($param, 'puser_id')) {
             $param['puser_id'] = $param['puser_id'];
@@ -91,10 +103,12 @@ class UserStatisticsController extends CatchController
         }
         if (!getProp($param,'start_at')){
             // 默认最近7天
-           $param['start_at'] = date('Y-m-d',strtotime($param['end_at'])-86400*7);
+            $param['start_at'] = date('Y-m-d',strtotime($param['end_at'])-86400*7);
         }else{
             $param['start_at'] = date('Y-m-d',strtotime($param['start_at']));
         }
-       return UserStatisticsService::list($param);
+        return $param;
     }
+
+
 }

modules/Statistic/Services/UserStatisticsService.php

@@ -80,6 +80,7 @@ class UserStatisticsService extends BaseService
     }
 
 
+
     /**
      * 保存redis的值
      * name: setValue
@@ -198,7 +199,20 @@ class UserStatisticsService extends BaseService
         if ($minId){
             $sql->where('miniprogram_id',$minId);
         }
-        $info = $sql->select(
+        return self::handleStaticData($sql);
+
+    }
+
+    /**
+     *   统计数据处理
+     * name: handelStaticData
+     * @param $sql
+     * @return array
+     * date 2023/06/27 14:51
+     */
+    protected  static function handleStaticData($sql): array
+    {
+        $info =  $sql->select(
             DB::raw("sum(new_user_recharge_total) as new_user_recharge_total"), // 充值人数
             DB::raw("sum(new_user_num) as new_user_num"), // 新增用户人数
             DB::raw("sum(new_user_recharge_num) as new_user_recharge_num"), // 充值人数
@@ -212,17 +226,15 @@ class UserStatisticsService extends BaseService
             'new_user_recharge_vip_num' => $info->new_user_recharge_vip_num?: 0,
             'new_user_recharge_coin_num' => $info->new_user_recharge_coin_num ?:0,
         ];
-
     }
 
 
-
     /**
      * 统计列表
      */
-    public static function list(array $param)
+    public static function list($param)
     {
-        $sql = self::getQuerySql($param)->select("tj_day_new_users.*", 'users.username')->orderBy('date', 'desc')->orderBy('id', 'desc');
+        $sql = self::getQuerySql($param)->select("tj_optimizer_day_new_users.*", 'users.username')->orderBy('date', 'desc')->orderBy('id', 'desc');
         $isAll = getProp($param, 'is_all');
         if ($isAll) {
             $list = $sql->get();
@@ -246,24 +258,30 @@ class UserStatisticsService extends BaseService
         return $list;
     }
 
+    // 列表数据统计
+    public static function listStatistics($param): array
+    {
+        $sql = self::getQuerySql($param);
+        return self::handleStaticData($sql);
+    }
 
     private static function getQuerySql(array $param)
     {
-        $sql = TjOptimizerDayNewUser::query()->leftJoin('users', 'users.id', "=", 'tj_day_new_users.user_id');
+        $sql = TjOptimizerDayNewUser::query()->leftJoin('users', 'users.id', "=", 'tj_optimizer_day_new_users.user_id');
         if (getProp($param, 'start_at')) {
-            $sql->where('tj_day_new_users.date', ">=", $param['start_at']);
+            $sql->where('tj_optimizer_day_new_users.date', ">=", $param['start_at']);
         }
         if (getProp($param, 'end_at')) {
-            $sql->where('tj_day_new_users.date', "<=", $param['end_at']);
+            $sql->where('tj_optimizer_day_new_users.date', "<=", $param['end_at']);
         }
         if (getProp($param, 'user_id')) {
-            $sql->where('tj_day_new_users.user_id', $param['user_id']);
+            $sql->where('tj_optimizer_day_new_users.user_id', $param['user_id']);
         }
         if (getProp($param, 'puser_id')) {
-            $sql->where('tj_day_new_users.puser_id', $param['puser_id']);
+            $sql->where('tj_optimizer_day_new_users.puser_id', $param['puser_id']);
         }
         if (getProp($param, 'miniprogram_id')) {
-            $sql->where('tj_day_new_users.miniprogram_id', $param['miniprogram_id']);
+            $sql->where('tj_optimizer_day_new_users.miniprogram_id', $param['miniprogram_id']);
         }
         return $sql;
     }

modules/Statistic/routes/route.php

@@ -13,5 +13,7 @@ Route::prefix('statistic')->group(function(){
         Route::any('stats',[UserStatisticsController::class,'stats']);
         // 投手日充值列表
         Route::any('list',[UserStatisticsController::class,'list']);
+        // 投手日充值列表汇总
+        Route::any('list_statistics',[UserStatisticsController::class,'listStatistics']);
     });
 });