修改vr查询范围

app/common/repositories/finance/FinanceRepository.php

@@ -1844,42 +1844,34 @@ class FinanceRepository extends BaseRepository
      */
     public function vr_list($mer_id = 0)
     {
-        $page = input('page');
-        $limit = input('limit');
+        $page = input('page', 1);
+        $limit = input('limit', 20);
         $where = request()->params(['date']);
-        $params = request()->params(['type', 'uid', 'pm', 'phone','status']);
+        $params = request()->params(['type', 'uid', 'pm', 'phone', 'status']);
 
-        $date = [];
-        //商户ID
+        // 1. 基础查询构建
         $query = Db::name('user_sign_vr')
-        ->alias('uss')
-        ->leftJoin('user u', 'u.uid=uss.uid')
-        ->where('u.test_user', '<>', 1)
-        ->leftJoin('store_order o', 'o.order_id=uss.order_id')
-        ->where('o.test_order', '<>', 1)
-        ->when(isset($params['uid']) && $params['uid'] != '', function ($query) use ($params) {
-            $query->where('uss.uid', $params['uid']);
-        })
-        // ->when(isset($params['pm']) && $params['pm'] != '', function ($query) use ($params) {
-        //     $query->where('uss.pm', $params['pm']);
-        // })
-        // ->when(isset($params['status']) && $params['status'] != '', function ($query) use ($params) {
-        //     $query->where('uss.status', $params['status']);
-        // })
-        ->when(isset($params['phone']) && $params['phone'] != '', function ($query) use ($params) {
-            $query->whereLike('u.phone', '%' . $params['phone'] . '%');
-        })
-        ->when(isset($params['type']) && $params['type'] != '', function ($query) use ($params) {
-            $query->where('type', $params['type']);
-        });
+            ->alias('uss')
+            ->leftJoin('user u', 'u.uid = uss.uid')
+            ->leftJoin('store_order o', 'o.order_id = uss.order_id')
+            ->where(' AND u.test_user <> 1')
+            ->when(isset($params['uid']) && $params['uid'] != '', function ($query) use ($params) {
+                $query->where('uss.uid', $params['uid']);
+            })
+            ->when(isset($params['phone']) && $params['phone'] != '', function ($query) use ($params) {
+                $query->whereLike('u.phone', '%' . $params['phone'] . '%');
+            })
+            ->when(isset($params['type']) && $params['type'] != '', function ($query) use ($params) {
+                $query->where('uss.type', $params['type']);
+            });
 
         //导出数据
         $is_excel = request()->param('is_excel', 0);
         if($is_excel == 1){
             $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
-            ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,uss.type,uss.mark,u.score')
-            ->order('uss.id', 'desc')
-            ->select();
+                ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,uss.type,uss.mark,u.score')
+                ->order('uss.id', 'desc')
+                ->select();
             $arr = [];
             foreach ($date['list'] as $k=>$item){
                 switch ($item['type']) {
@@ -1905,50 +1897,78 @@ class FinanceRepository extends BaseRepository
             ], $arr, 'VR统计');
         }
 
-        // $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
-        //     ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,uss.type,uss.mark,u.score')
-        //     ->page($page, $limit)
-        //     ->order('uss.id', 'desc')
-        //     ->select()
-        //     ->each(function ($item) {
-        //         $item['mark'] = $item['mark'];
-        //         $item['addtime'] = date('Y-m-d H:i:s', $item['addtime']);
-        //         return $item;
-        //     });
-        // $date['count'] = $query->count();
-        // $date['statistics']['all'] = decimal2($query1->sum('number'));
-        // $date['statistics']['nclear'] = decimal2($query3->where('uss.type', 2)->sum('number'));
-        // $date['statistics']['transfervr'] = decimal2($query4->whereLike('uss.mark', '%消耗VR%')->sum('number'));
-        // $date['statistics']['acquirevr'] = decimal2($query5->whereLike('uss.mark', '%到账VR%')->sum('number'));
-        // $date['statistics']['transitionvr'] = decimal2($query6->whereLike('uss.mark', '%佣金转VR%')->sum('number'));
-        // $date['statistics']['jcshqvr'] = decimal2($query7->whereLike('uss.mark', '%购买精彩%')->sum('number'));
-        // $date['statistics']['hyzqvr'] = decimal2($query8->whereLike('uss.mark', '%购买会员%')->sum('number'));
-        // $date['statistics']['allbuyvr'] = decimal2($query9->whereLike('uss.mark', '%购买%')->sum('number'));
-        //支持时间筛选条件
-        $query = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2);
-        $date['list'] = $query
-            ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,uss.type,uss.mark,u.score')
+        // 4. 分页查询
+        $date['list'] = $query->field([
+            'uss.id',
+            'uss.addtime',
+            'u.nickname',
+            'u.phone',
+            'uss.number',
+            'o.order_sn',
+            'uss.type',
+            'uss.mark',
+            'u.score'
+        ])
             ->page($page, $limit)
             ->order('uss.id', 'desc')
             ->select()
             ->each(function ($item) {
-                $item['mark'] = $item['mark'];
                 $item['addtime'] = date('Y-m-d H:i:s', $item['addtime']);
                 return $item;
             });
+
+        // 5. 统计信息提取到单独方法
         $date['count'] = $query->count();
-        $date['statistics']['all'] = decimal2((clone $query)->sum('number'));
-        $date['statistics']['nclear'] = decimal2((clone $query)->where('uss.type', 2)->sum('number'));
-        $date['statistics']['transfervr'] = decimal2((clone $query)->whereLike('uss.mark', '%消耗VR%')->sum('number'));
-        $date['statistics']['acquirevr'] = decimal2((clone $query)->whereLike('uss.mark', '%到账VR%')->sum('number'));
-        $date['statistics']['transitionvr'] = decimal2((clone $query)->whereLike('uss.mark', '%佣金转VR%')->sum('number'));
-        $date['statistics']['jcshqvr'] = decimal2((clone $query)->whereLike('uss.mark', '%购买精彩%')->sum('number'));
-        $date['statistics']['hyzqvr'] = decimal2((clone $query)->whereLike('uss.mark', '%购买会员%')->sum('number'));
-        $date['statistics']['allbuyvr'] = decimal2((clone $query)->whereLike('uss.mark', '%购买%')->sum('number'));
- 
+        $date['statistics'] = $this->getVrStatistics($query);
+
         return $date;
     }
 
+    /**
+     * 获取VR统计信息
+     */
+    private function getVrStatistics($query)
+    {
+        $statistics = [];
+        $conditions = [
+            'all' => [],
+            'nclear' => ['uss.type' => 2],
+            'transfervr' => function ($subQuery) {
+                $subQuery->where('uss.type', '=', 2)
+                    ->where(function ($q) {
+                        $q->where('uss.mark', 'like', '%消耗%')
+                            ->whereOr('uss.mark', 'like', '%管理员调整vr%');
+                    });
+            },
+            'acquirevr' => function ($subQuery) {
+                $subQuery->where('uss.type', '=', 1)
+                    ->where(function ($q) {
+                        $q->where('uss.mark', 'like', '%到账%')
+                            ->whereOr('uss.mark', 'like', '%管理员调整vr%');
+                    });
+            },
+            'transitionvr' => [['uss.mark', 'like', '%佣金转VR%']],
+            'jcshqvr' => [['uss.mark', 'like', '%购买精彩%']],
+            'hyzqvr' => [['uss.mark', 'like', '%购买会员%']],
+            'allbuyvr' => [['uss.mark', 'like', '%购买%']],
+        ];
+
+        foreach ($conditions as $key => $condition) {
+            $subQuery = clone $query;
+            if (is_callable($condition)) {
+                // 如果是闭包函数，直接调用
+                $condition($subQuery);
+            } elseif (!empty($condition)) {
+                // 如果是数组条件，使用where
+                $subQuery->where($condition);
+            }
+            $statistics[$key] = decimal2($subQuery->sum('uss.number'));
+        }
+
+        return $statistics;
+    }
+
+