数据统计增加小程序维度

modules/Common/Services/Statistic/OptimizerDayUser.php

@@ -94,8 +94,8 @@ class OptimizerDayUser extends BaseService
                     $data['new_user_total'] = $last->new_user_total + $data['new_user_num'];
                 } else {
                     $data['recharge_user_total'] = $data['new_user_recharge_num'];
-                    $data['new_user_total'] = $data['new_user_recharge_num'];
-                    $data['recharge_amount_total'] =  $data['new_user_num'];
+                    $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/Services/UserStatisticsService.php

@@ -284,7 +284,7 @@ class UserStatisticsService extends BaseService
      * @param mixed $miniProgramId 小程序id
      */
     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,$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);
@@ -306,9 +306,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);
         }
         $info = $sql->select(
@@ -338,9 +338,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);