累计消费累计充值接口增加返回值

addons/shopro/controller/user/WalletLog.php

@@ -5,6 +5,7 @@ namespace addons\shopro\controller\user;
 use addons\shopro\controller\Common;
 use app\admin\model\shopro\user\WalletLog as UserWalletLogModel;
 use think\Cache;
+use app\admin\model\shopro\user\User as UserModel;
 
 class WalletLog extends Common
 {
@@ -45,13 +46,19 @@ class WalletLog extends Common
 
     /**
      * 钱包统计（ 累计充值 和 累计消费 ）
-     * @param string $type 钱包类型：money-余额, score-积分, commission-佣金（默认money）
+     * @param string $type 钱包类型：money-余额, score-积分, commission-佣金（score）
      * @return array
      */
     public function walletStats()
     {
         $user = auth_user();
         $type = $this->request->param('type', 'score');
+        $date = $this->request->param('date/a');
+
+        // 验证并设置默认时间范围
+        if (!is_array($date) || count($date) < 2 || empty($date[0]) || empty($date[1])) {
+            $date = [date('0000-00-00 00:00:00'), date('Y-m-d 23:59:59')];
+        }
 
         // 验证钱包类型
         if (!in_array($type, ['money', 'score', 'commission'])) {
@@ -75,23 +82,37 @@ class WalletLog extends Common
                 ->where('type', $type)
                 ->where('amount', '>', 0)
                 ->whereIn('event', $rechargeEvents[$type])
+                ->whereTime('createtime', 'between', $date)
                 ->sum('amount') ?: 0;
             // 累计消费（支出）
             $consume = UserWalletLogModel::where('user_id', $user->id)
                 ->where('type', $type)
                 ->where('amount', '<', 0)
+                ->whereTime('createtime', 'between', $date)
                 ->sum('amount') ?: 0;
+
+            //用户当前积分/余额/佣金
+            $user_info = UserModel::where('id', $user->id)->find();
+
             $result = [
                 'recharge' => round($recharge, 2),
                 'consume' => round(abs($consume), 2),
-                'type' => $type
+                'type' => $type,
+                'score' => $user_info->score,
+                'commission' => $user_info->commission,
+                'money' => $user_info->money,
             ];
 
+
+
         } catch (\Exception $e) {
             $result = [
                 'recharge' => 0,
                 'consume' => 0,
-                'type' => $type
+                'type' => $type,
+                'score' => 0,
+                'commission' => 0,
+                'money' => 0,
             ];
         }