Merge branch 'dev-xpy' into dev

app/common/repositories/finance/FinanceRepository.php

@@ -1911,7 +1911,28 @@ class FinanceRepository extends BaseRepository
             ], $arr, 'VR统计');
         }
 
-        $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
+        // $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')
             ->page($page, $limit)
             ->order('uss.id', 'desc')
@@ -1922,17 +1943,14 @@ class FinanceRepository extends BaseRepository
                 return $item;
             });
         $date['count'] = $query->count();
-        $date['statistics']['all'] = decimal2($query1->sum('number'));
-        // $date['statistics']['clear'] = decimal2($query2->where('uss.type', 1)->sum('number'));
-        $date['statistics']['nclear'] = decimal2($query3->where('uss.type', 2)->sum('number'));
-
-        //按照备注内容分类统计vr
-        $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'));
+        $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'));
  
         return $date;
     }