Merge remote-tracking branch 'origin/test' into test

modules/Common/Models/TjCompanyDayNewUser.php

@@ -12,5 +12,5 @@ namespace Modules\Common\Models;
 class TjCompanyDayNewUser extends BaseModel
 {
     protected $table = "tj_company_day_new_users";
-    protected $fillable = ["id","date","user_id","miniprogram_id","new_user_recharge_coin_num","miniprogram_name","miniprogram_play_name","miniprogram_type","new_user_num","new_user_recharge_num","new_user_recharge_vip_num","new_user_recharge_total","recharge_user_total","recharge_amount_total","updated_at","created_at"];
+    protected $fillable = ["id","date","new_user_total","user_id","miniprogram_id","new_user_recharge_coin_num","miniprogram_name","miniprogram_play_name","miniprogram_type","new_user_num","new_user_recharge_num","new_user_recharge_vip_num","new_user_recharge_total","recharge_user_total","recharge_amount_total","updated_at","created_at"];
 }

modules/Common/Models/TjOptimizerDayNewUser.php

@@ -12,5 +12,5 @@ namespace Modules\Common\Models;
 class TjOptimizerDayNewUser extends BaseModel
 {
     protected $table = "tj_optimizer_day_new_users";
-    protected $fillable = ["id","date","user_id","puser_id","new_user_recharge_coin_num","miniprogram_id","miniprogram_name","miniprogram_play_name","miniprogram_type","new_user_num","new_user_recharge_num","new_user_recharge_vip_num","new_user_recharge_total","recharge_user_total","recharge_amount_total","updated_at","created_at"];
+    protected $fillable = ["id","new_user_total","date","user_id","puser_id","new_user_recharge_coin_num","miniprogram_id","miniprogram_name","miniprogram_play_name","miniprogram_type","new_user_num","new_user_recharge_num","new_user_recharge_vip_num","new_user_recharge_total","recharge_user_total","recharge_amount_total","updated_at","created_at"];
 }

modules/Common/Services/Statistic/OptimizerDayUser.php

@@ -91,9 +91,11 @@ class OptimizerDayUser extends BaseService
                 if (!is_empty($last)) {
                     $data['recharge_user_total'] = $last->recharge_user_total + $data['new_user_recharge_num'];
                     $data['recharge_amount_total'] = $last->recharge_amount_total + $data['new_user_recharge_total'];
+                    $data['new_user_total'] = $last->new_user_total + $data['new_user_num'];
                 } else {
                     $data['recharge_user_total'] = $data['new_user_recharge_num'];
-                    $data['recharge_amount_total'] = $data['new_user_recharge_total'];
+                    $data['new_user_total'] = $data['new_user_num'];
+                    $data['recharge_amount_total'] =  $data['new_user_recharge_total'];
                 }
                 TjOptimizerDayNewUser::updateOrCreate(['user_id' => $data['user_id'], 'puser_id' => $data['puser_id'], 'date' => $data['date'],'miniprogram_id' => $data['miniprogram_id']], $data);
             }

modules/Statistic/Http/Controllers/HomeStatisticsController.php

@@ -27,7 +27,9 @@ class HomeStatisticsController  extends CatchController
             $type = 3;
         }
         $uid = $this->getLoginUserId();
-        return UserStatisticsService::getTodayHomeData($uid,$type);
+        $miniProgramId = $request->input('miniprogram_id',0);
+
+        return UserStatisticsService::getTodayHomeData($uid,$type,$miniProgramId);
     }
 
 }

modules/Statistic/Http/Controllers/UserStatisticsController.php

@@ -35,8 +35,9 @@ class UserStatisticsController extends CatchController
         }else if ($userContext['loginUserRoles']->contains('optimizer')){
             $type = 3;
         }
+        $miniProgramId = $request->input('miniprogram_id',0);
         $uid = $this->getLoginUserId();
-        return UserStatisticsService::getTodayData($uid,$type);
+        return UserStatisticsService::getTodayData($uid,$type,$miniProgramId);
     }
 
     /**
@@ -56,7 +57,7 @@ class UserStatisticsController extends CatchController
             $type = 3;
         }
         $uid = $this->getLoginUserId();
-        return UserStatisticsService::historyStats($uid,$type);
+        return UserStatisticsService::historyStats($uid,$type,$miniProgramId);
     }
 
     /**

modules/Statistic/Services/UserStatisticsService.php

@@ -13,8 +13,6 @@ use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Redis;
 use Modules\Common\Models\TjOptimizerDayNewUser;
 use Modules\Common\Services\BaseService;
-use Modules\Common\Services\Statistic\CompanyDayUser;
-use Modules\Common\Services\Statistic\OptimizerDayUser;
 
 class UserStatisticsService extends BaseService
 {
@@ -31,23 +29,68 @@ class UserStatisticsService extends BaseService
      * name: getTodayData
      * @param int $accountId 账号id
      * @param int $type 账号类型 1 其他 2 投放公司 3 优化师
+     * @param int $minId 小程序id
      * date 2023/06/20 10:20
      * @return array
      */
-    public static function getTodayData($accountId, $type = 1)
+    public static function getTodayData($accountId, $type = 1, $minId = 0)
     {
         $date = date("Y-m-d");
-        $key = sprintf(self::PROMOTION_STATISTIC_RECORD_REDIS_KEY, $date);
-        $new_user_recharge_total = self::getValue($key, sprintf(self::NEW_USER_RECHARGE_TOTAL, $accountId)); // 当日新增用户充值总额
-        $new_user_recharge_num = self::getValue($key, sprintf(self::NEW_USER_RECHARGE_NUM, $accountId)); // 当日新增用户充值人数
-        $new_user_num = self::getValue($key, sprintf(self::NEW_USER_NUM, $accountId)); // 当日新增用户人数
-        [$recharge_coin_num, $recharge_vip_num] = self::getRechargeUserNum($accountId, $type);
+        $start = $date . " 00:00:00";
+        $end = $date . " 23:59:59";
+
+        $where = [];
+        if ($minId > 0) {
+            $where['miniprogram_id'] = $minId;
+        }
+
+        if ($type == 2) {
+            $where['puser_id'] = $accountId;
+        } else if ($type == 3) {
+            $where['user_id'] = $accountId;
+        }
+        $new_user_num = DB::table('user_ranse_record_all')->where($where)->where('date', $date)->count(); // 新增用户人数
+        $info = DB::table('orders')->where('status', "<>", 'UNPAID')
+            ->where($where)
+            ->whereBetween("created_at", [$start, $end])
+            ->whereBetween('ranse_created_at', [$start, $end])
+            ->select(
+                DB::raw("sum(if(status = 'unpaid', 0, price)) as recharge_total"), // 单日新增用户充值金额
+                DB::raw("count(DISTINCT ranse_created_at,uid) as recharge_num")  // 当日新增用户充值人数
+            )->first();
+        $new_user_recharge_total = $info->recharge_total ?: 0; // 新增用户充值总额
+        $new_user_recharge_num = $info->recharge_num ?: 0; // 新增用户充值人数
+        $info = DB::table('orders')->where('status', "<>", 'UNPAID')
+            ->where($where)
+            ->whereBetween("created_at", [$start, $end])
+            ->whereBetween('ranse_created_at', [$start, $end])
+            ->whereIn('order_type', ["COIN", "FIRST_COIN"])
+            ->select(
+                DB::raw("sum(if(status = 'unpaid', 0, price)) as recharge_total"), // 单日新增用户充值金额
+                DB::raw("count(DISTINCT ranse_created_at,uid) as recharge_num")  // 当日新增用户充值人数
+            )->first(); // 普通充值金额
+        $recharge_coin_total = $info->recharge_total ?: 0; // 新增用户普通充值总额
+        $recharge_coin_num = $info->recharge_num ?: 0; // 新增用户普通充值总额
+        $info = DB::table('orders')->where('status', "<>", 'UNPAID')
+            ->where($where)
+            ->whereBetween("created_at", [$start, $end])
+            ->whereBetween('ranse_created_at', [$start, $end])
+            ->whereNotIn('order_type', ["COIN", "FIRST_COIN"])
+            ->select(
+                DB::raw("sum(if(status = 'unpaid', 0, price)) as recharge_total"), // 单日新增用户充值金额
+                DB::raw("count(DISTINCT ranse_created_at,uid) as recharge_num")  // 当日新增用户充值人数
+            )->first(); // 会员充值金额
+        $recharge_vip_total = $info->recharge_total ?: 0; // 新增用户会员充值总额
+        $recharge_vip_num = $info->recharge_num ?: 0; // 新增用户会员充值总额
+
         $data = [
             'date' => $date,
             'new_user_recharge_total' => $new_user_recharge_total ?: 0,
             'new_user_recharge_num' => $new_user_recharge_num ?: 0,
             'new_user_num' => $new_user_num ?: 0,
+            'recharge_coin_total' => $recharge_coin_total ?: 0,
             'recharge_coin_num' => $recharge_coin_num ?: 0,
+            'recharge_vip_total' => $recharge_vip_total ?: 0,
             'recharge_vip_num' => $recharge_vip_num ?: 0,
         ];
 
@@ -84,122 +127,88 @@ class UserStatisticsService extends BaseService
      * name: getTodayData
      * @param int $accountId 账号id
      * @param int $type 账号类型 1 其他 2 投放公司 3 优化师
+     * @param int $minId 小程序id
      * date 2023/06/20 10:20
      * @return array
      */
-    public static function getTodayHomeData(mixed $accountId, int $type)
-     {
+    public static function getTodayHomeData(mixed $accountId, int $type, $minId = 0)
+    {
         $date = date("Y-m-d");
-        $start = date("Y-m-d") . " 00:00:00";
-        $end = date("Y-m-d") . " 23:59:59";
-        if ($type == 1) {
-            $new_user_num = DB::table('user_ranse_record_all')->where('date', $date)->count(); // 新增用户人数
-            $info = DB::table('orders')->where('status', "<>", 'UNPAID')
-                ->whereBetween("created_at", [$start, $end])
-                ->whereBetween('ranse_created_at', [$start, $end])
-                ->select(
-                    DB::raw("sum(if(status = 'unpaid', 0, price)) as recharge_total"), // 单日新增用户充值金额
-                    DB::raw("count(DISTINCT ranse_created_at,uid) as recharge_num")  // 当日新增用户充值人数
-                )->first();
-            $new_user_recharge_total = $info->recharge_total ?: 0; // 新增用户充值总额
-            $new_user_recharge_num = $info->recharge_num ?: 0; // 新增用户充值人数
-            $info = DB::table('orders')->where('status', "<>", 'UNPAID')
-                ->whereBetween("created_at", [$start, $end])
-                ->whereBetween('ranse_created_at', [$start, $end])
-                ->whereIn('order_type', ["COIN", "FIRST_COIN"])
-                ->select(
-                    DB::raw("sum(if(status = 'unpaid', 0, price)) as recharge_total"), // 单日新增用户充值金额
-                    DB::raw("count(DISTINCT ranse_created_at,uid) as recharge_num")  // 当日新增用户充值人数
-                )->first(); // 普通充值金额
-            $new_user_recharge_coin_total = $info->recharge_total ?: 0; // 新增用户普通充值总额
-            $new_user_recharge_coin_num = $info->recharge_num ?: 0; // 新增用户普通充值总额
-            $info = DB::table('orders')->where('status', "<>", 'UNPAID')
-                ->whereBetween("created_at", [$start, $end])
-                ->whereBetween('ranse_created_at', [$start, $end])
-                ->whereNotIn('order_type', ["COIN", "FIRST_COIN"])
-                ->select(
-                    DB::raw("sum(if(status = 'unpaid', 0, price)) as recharge_total"), // 单日新增用户充值金额
-                    DB::raw("count(DISTINCT ranse_created_at,uid) as recharge_num")  // 当日新增用户充值人数
-                )->first(); // 会员充值金额
-            $new_user_recharge_vip_total = $info->recharge_total ?: 0; // 新增用户会员充值总额
-            $new_user_recharge_vip_num = $info->recharge_num ?: 0; // 新增用户会员充值总额
-            $info = DB::table('orders')->where('status', "<>", 'UNPAID')
-                ->whereBetween("created_at", [$start, $end])
-                ->select(
-                    DB::raw("sum(if(status = 'unpaid', 0, price)) as  recharge_total"), // 单日新增用户充值金额
-                    DB::raw("count(DISTINCT ranse_created_at,uid) as  recharge_num")  // 当日新增用户充值人数
-                )->first();
-            $recharge_total = $info->recharge_total ?: 0; // 充值金额
-            // 充值笔数
-           $recharge_num =  DB::table('orders')->where('status', "<>", 'UNPAID')
-                ->whereBetween("created_at", [$start, $end])->count();
-            $recharge_coin_total = DB::table('orders')->where('status', "<>", 'UNPAID')
-                ->whereBetween("created_at", [$start, $end])
-                ->whereIn('order_type', ["COIN", "FIRST_COIN"])->sum('price'); // 普通充值金额
-            $recharge_vip_total = DB::table('orders')->where('status', "<>", 'UNPAID')
-                ->whereBetween("created_at", [$start, $end])
-                ->whereNotIn('order_type', ["COIN", "FIRST_COIN"])->sum('price'); // 会员充值金额
-
+        $start = $date . " 00:00:00";
+        $end = $date . " 23:59:59";
 
+        $where = [];
+        if ($minId > 0) {
+            $where['miniprogram_id'] = $minId;
+        }
+        if ($type == 2) {
+            $where['puser_id'] = $accountId;
+        } else if ($type == 3) {
+            $where['user_id'] = $accountId;
+        }
+        $new_user_num = DB::table('user_ranse_record_all')->where($where)->where('date', $date)->count(); // 新增用户人数
+        $info = DB::table('orders')->where('status', "<>", 'UNPAID')
+            ->where($where)
+            ->whereBetween("created_at", [$start, $end])
+            ->whereBetween('ranse_created_at', [$start, $end])
+            ->select(
+                DB::raw("sum(if(status = 'unpaid', 0, price)) as recharge_total"), // 单日新增用户充值金额
+                DB::raw("count(DISTINCT ranse_created_at,uid) as recharge_num")  // 当日新增用户充值人数
+            )->first();
+        $new_user_recharge_total = $info->recharge_total ?: 0; // 新增用户充值总额
+        $new_user_recharge_num = $info->recharge_num ?: 0; // 新增用户充值人数
+        if ($type == 2) {
+            $where = ['puser_id' => $accountId];
         } else {
-            $key = sprintf(self::PROMOTION_STATISTIC_RECORD_REDIS_KEY, $date);
-            $new_user_recharge_total = self::getValue($key, sprintf(self::NEW_USER_RECHARGE_TOTAL, $accountId)); // 当日新增用户充值总额
-            $new_user_recharge_num = self::getValue($key, sprintf(self::NEW_USER_RECHARGE_NUM, $accountId)); // 当日新增用户充值人数
-            $new_user_num = self::getValue($key, sprintf(self::NEW_USER_NUM, $accountId)); // 当日新增用户人数
-            if ($type == 2) {
-                $where = ['puser_id' => $accountId];
-            } else {
-                $where = ['user_id' => $accountId];
-            }
-            $info = DB::table('orders')->where('status', "<>", 'UNPAID')
-                ->where($where)
-                ->whereBetween("created_at", [$start, $end])
-                ->whereBetween('ranse_created_at', [$start, $end])
-                ->whereIn('order_type', ["COIN", "FIRST_COIN"])->select(
+            $where = ['user_id' => $accountId];
+        }
+        $info = DB::table('orders')->where('status', "<>", 'UNPAID')
+            ->where($where)
+            ->whereBetween("created_at", [$start, $end])
+            ->whereBetween('ranse_created_at', [$start, $end])
+            ->whereIn('order_type', ["COIN", "FIRST_COIN"])->select(
                 DB::raw("sum(if(status = 'unpaid', 0, price)) as recharge_total"), // 单日新增用户充值金额
                 DB::raw("count(DISTINCT ranse_created_at,uid) as recharge_num")  // 当日新增用户充值人数
             )->first(); // 普通充值金额
-            $new_user_recharge_coin_total = $info->recharge_total ?: 0; // 新增用户普通充值总额
-            $new_user_recharge_coin_num = $info->recharge_num ?: 0; // 新增用户普通充值总额
-            $info = DB::table('orders')->where('status', "<>", 'UNPAID')
-                ->where($where)
-                ->whereBetween("created_at", [$start, $end])
-                ->whereBetween('ranse_created_at', [$start, $end])
-                ->whereNotIn('order_type', ["COIN", "FIRST_COIN"])
-                ->select(
-                    DB::raw("sum(if(status = 'unpaid', 0, price)) as recharge_total"), // 单日新增用户充值金额
-                    DB::raw("count(DISTINCT ranse_created_at,uid) as recharge_num")  // 当日新增用户充值人数
-                )->first(); // 会员充值金额
-            $new_user_recharge_vip_total = $info->recharge_total ?: 0; // 新增用户会员充值总额
-            $new_user_recharge_vip_num = $info->recharge_num ?: 0; // 新增用户会员充值总额
-            $info = DB::table('orders')->where('status', "<>", 'UNPAID')
-                ->whereBetween("created_at", [$start, $end])
-                ->where($where)
-                ->select(
-                    DB::raw("sum(if(status = 'unpaid', 0, price)) as  recharge_total"), // 单日新增用户充值金额
-                    DB::raw("count(DISTINCT ranse_created_at,uid) as  recharge_num")  // 当日新增用户充值人数
-                )->first();
-            $recharge_total = $info->recharge_total ?: 0; // 充值人数
-            $recharge_num =  DB::table('orders')->where('status', "<>", 'UNPAID')
-                ->whereBetween("created_at", [$start, $end])
-                ->where($where)->count();
-            $recharge_coin_total = DB::table('orders')->where('status', "<>", 'UNPAID')
-                ->where($where)
-                ->whereBetween("created_at", [$start, $end])
-                ->whereIn('order_type', ["COIN", "FIRST_COIN"])->sum('price'); // 普通充值金额
-            $recharge_vip_total = DB::table('orders')->where('status', "<>", 'UNPAID')
-                ->where($where)
-                ->whereBetween("created_at", [$start, $end])
-                ->whereNotIn('order_type', ["COIN", "FIRST_COIN"])->sum('price'); // 会员充值金额
-
-        }
+        $new_user_recharge_coin_total = $info->recharge_total ?: 0; // 新增用户普通充值总额
+        $new_user_recharge_coin_num = $info->recharge_num ?: 0; // 新增用户普通充值总额
+        $info = DB::table('orders')->where('status', "<>", 'UNPAID')
+            ->where($where)
+            ->whereBetween("created_at", [$start, $end])
+            ->whereBetween('ranse_created_at', [$start, $end])
+            ->whereNotIn('order_type', ["COIN", "FIRST_COIN"])
+            ->select(
+                DB::raw("sum(if(status = 'unpaid', 0, price)) as recharge_total"), // 单日新增用户充值金额
+                DB::raw("count(DISTINCT ranse_created_at,uid) as recharge_num")  // 当日新增用户充值人数
+            )->first(); // 会员充值金额
+        $new_user_recharge_vip_total = $info->recharge_total ?: 0; // 新增用户会员充值总额
+        $new_user_recharge_vip_num = $info->recharge_num ?: 0; // 新增用户会员充值总额
+        $info = DB::table('orders')->where('status', "<>", 'UNPAID')
+            ->whereBetween("created_at", [$start, $end])
+            ->where($where)
+            ->select(
+                DB::raw("sum(if(status = 'unpaid', 0, price)) as  recharge_total"), // 单日新增用户充值金额
+                DB::raw("count(DISTINCT ranse_created_at,uid) as  recharge_num")  // 当日新增用户充值人数
+            )->first();
+        $recharge_total = $info->recharge_total ?: 0; // 充值人数
+        $recharge_num = DB::table('orders')->where('status', "<>", 'UNPAID')
+            ->whereBetween("created_at", [$start, $end])
+            ->where($where)->count();
+        $recharge_coin_total = DB::table('orders')->where('status', "<>", 'UNPAID')
+            ->where($where)
+            ->whereBetween("created_at", [$start, $end])
+            ->whereIn('order_type', ["COIN", "FIRST_COIN"])->sum('price'); // 普通充值金额
+        $recharge_vip_total = DB::table('orders')->where('status', "<>", 'UNPAID')
+            ->where($where)
+            ->whereBetween("created_at", [$start, $end])
+            ->whereNotIn('order_type', ["COIN", "FIRST_COIN"])->sum('price'); // 会员充值金额
 
-        $data =  [
+        $data = [
             'new_user_num' => $new_user_num, // 新增用户数
-            'new_user_recharge_num' =>  $new_user_recharge_num, // 新增用户充值人数
+            'new_user_recharge_num' => $new_user_recharge_num, // 新增用户充值人数
             'new_user_recharge_coin_num' => $new_user_recharge_coin_num, // 新增用户普通充值人数
             'new_user_recharge_vip_num' => $new_user_recharge_vip_num, // 新增用户vip充值人数
-            'new_user_recharge_total' =>  $new_user_recharge_total, // 新增用户充值金额
+            'new_user_recharge_total' => $new_user_recharge_total, // 新增用户充值金额
             'new_user_recharge_vip_total' => $new_user_recharge_vip_total, // 新增用户普通充值金额
             'new_user_recharge_coin_total' => $new_user_recharge_coin_total, // 新增用户vip充值金额
             'recharge_total' => $recharge_total, // 充值金额
@@ -210,10 +219,10 @@ class UserStatisticsService extends BaseService
         ];
 
         // 新增用户充值率
-        $data['new_user_recharge_rate'] = $data['new_user_num'] >  0 && $data['new_user_recharge_num'] >  0 ? sprintf("%.2f%s",$data['new_user_recharge_num']/$data['new_user_num'],"%") : 0;
-       // 新增用户人均充值
-        $data['new_user_mean'] = $data['new_user_num'] >  0 && $data['new_user_recharge_total'] >  0 ? sprintf("%.2f",$data['new_user_recharge_total']/$data['new_user_num']) : 0;
-        $data['recharge_mean'] = $data['recharge_total'] >  0 && $data['recharge_num'] >  0 ? sprintf("%.2f",$data['recharge_total']/$data['recharge_num'],"%") : 0; // 新增用户人均充值
+        $data['new_user_recharge_rate'] = $data['new_user_num'] > 0 && $data['new_user_recharge_num'] > 0 ? sprintf("%.2f%s", $data['new_user_recharge_num'] / $data['new_user_num'], "%") : 0;
+        // 新增用户人均充值
+        $data['new_user_mean'] = $data['new_user_num'] > 0 && $data['new_user_recharge_total'] > 0 ? sprintf("%.2f", $data['new_user_recharge_total'] / $data['new_user_num']) : 0;
+        $data['recharge_mean'] = $data['recharge_total'] > 0 && $data['recharge_num'] > 0 ? sprintf("%.2f", $data['recharge_total'] / $data['recharge_num'], "%") : 0; // 新增用户人均充值
         return $data;
 
     }
@@ -233,63 +242,17 @@ class UserStatisticsService extends BaseService
     }
 
     /**
-     *  充值人数查询
-     * name: getRechargeUserNum
-     * @param $accountId 账号id
-     * @param  $miniProgramId 小程序id
-     * @param mixed $type 账号类型 2 投放公司 3 优化师
-     * date 2023/06/20 10:18
-     */
-    private static function getRechargeUserNum($accountId, mixed $type): array
-    {
-        $start = date("Y-m-d") . " 00:00:00";
-        $end = date("Y-m-d") . " 23:59:59";
-        if ($type == 2) {
-            // 投放公司
-            $recharge_coin_num = DB::table('orders')->where('status', "<>", 'UNPAID')
-                ->where('puser_id', $accountId)->whereBetween("created_at", [$start, $end])
-                ->whereBetween('ranse_created_at', [$start, $end])
-                ->whereIn("order_type", ["COIN", "FIRST_COIN"])->groupBy('uid', 'ranse_created_at')->count();
-            $recharge_vip_num = DB::table('orders')->where('status', "<>", 'UNPAID')
-                ->where('puser_id', $accountId)->whereBetween("created_at", [$start, $end])
-                ->whereBetween('ranse_created_at', [$start, $end])
-                ->whereNotIn("order_type", ["COIN", "FIRST_COIN"])->groupBy('uid', 'ranse_created_at')->count();
-        } elseif ($type == 3) {
-            // 优化师
-            $recharge_coin_num = DB::table('orders')->where('status', "<>", 'UNPAID')
-                ->where('user_id', $accountId)->whereBetween("created_at", [$start, $end])
-                ->whereBetween('ranse_created_at', [$start, $end])
-                ->whereIn("order_type", ["COIN", "FIRST_COIN"])->groupBy('uid', 'ranse_created_at')->count();
-            $recharge_vip_num = DB::table('orders')->where('status', "<>", 'UNPAID')
-                ->where('user_id', $accountId)->whereBetween("created_at", [$start, $end])
-                ->whereBetween('ranse_created_at', [$start, $end])
-                ->whereNotIn("order_type", ["COIN", "FIRST_COIN"])->groupBy('uid', 'ranse_created_at')->count();
-        } else {
-            // 其他暂不统计
-            $recharge_coin_num = DB::table('orders')->where('status', "<>", 'UNPAID')
-                ->whereBetween("created_at", [$start, $end])
-                ->whereBetween('ranse_created_at', [$start, $end])
-                ->whereIn("order_type", ["COIN", "FIRST_COIN"])->groupBy('uid', 'ranse_created_at')->count();
-            $recharge_vip_num = DB::table('orders')->where('status', "<>", 'UNPAID')
-                ->whereBetween("created_at", [$start, $end])
-                ->whereBetween('ranse_created_at', [$start, $end])
-                ->whereNotIn("order_type", ["COIN", "FIRST_COIN"])->groupBy('uid', 'ranse_created_at')->count();
-        }
-        return [$recharge_coin_num, $recharge_vip_num];
-    }
-
-    /**
      *
      * name: getTodayData
      * @param int $accountId 账号id
      * @param mixed $type 账号类型 1 其他 2 投放公司 3 优化师
+     * @param mixed $miniProgramId 小程序id
      */
-    public static function historyStats(int $accountId, $type)
+    public static function historyStats(int $accountId, $type, $miniProgramId)
     {
-        print_sql();
-        $month = self::getStaticsData($accountId, date('Y-m-01'), date('Y-m-d', strtotime('yesterday')), $type);
-        $lastMonth = self::getStaticsData($accountId, date('Y-m-01', strtotime(date('Y-m-01')) - 10), date('Y-m-d', strtotime(date('Y-m-01')) - 10), $type);
-        $history = self::getHistoryData($accountId, $type);
+        $month = self::getStaticsData($accountId, date('Y-m-01'), date('Y-m-d', strtotime('yesterday')), $type, $miniProgramId);
+        $lastMonth = self::getStaticsData($accountId, date('Y-m-01', strtotime(date('Y-m-01')) - 10), date('Y-m-d', strtotime(date('Y-m-01')) - 10), $type, $miniProgramId);
+        $history = self::getHistoryData($accountId, $type, $miniProgramId);
         return ['month' => $month, 'lastMonth' => $lastMonth, 'history' => $history];
     }
 
@@ -308,18 +271,20 @@ class UserStatisticsService extends BaseService
         if ($type == 2) {
             $sql->where('puser_id', $accountId);
         } elseif ($type == 3) {
-            $sql->where('puser_id', $accountId);
+            $sql->where('user_id', $accountId);
         }
-        if ($minId) {
+        if ($minId > 0) {
             $sql->where('miniprogram_id', $minId);
         }
         $info = $sql->select(
             DB::raw("sum(recharge_amount_total) as recharge_amount_total"), // 总充金额
+            DB::raw("sum(new_user_total) as new_user_total"), // 总充金额
             DB::raw("sum(recharge_user_total) as recharge_user_total"), // 累计充值人数
         )->first();
 
         return [
             'recharge_amount_total' => $info->recharge_amount_total ?: 0,
+            'new_user_total' => $info->new_user_total ?: 0,
             'recharge_user_total' => $info->recharge_user_total ?: 0,
         ];
     }
@@ -338,9 +303,9 @@ class UserStatisticsService extends BaseService
         if ($type == 2) {
             $sql->where('puser_id', $accountId);
         } elseif ($type == 3) {
-            $sql->where('puser_id', $accountId);
+            $sql->where('user_id', $accountId);
         }
-        if ($minId) {
+        if ($minId > 0) {
             $sql->where('miniprogram_id', $minId);
         }
         return self::handleStaticData($sql);