Merge branch 'dev-xpy' into dev

app/common/repositories/finance/FinanceRepository.php

@@ -1868,6 +1868,8 @@ class FinanceRepository extends BaseRepository
         $query5 = clone $query;
         $query6 = clone $query;
         $query7 = clone $query;
+        $query8 = clone $query;
+        $query9 = clone $query;
 
         //导出数据
         $is_excel = request()->param('is_excel', 0);
@@ -1915,6 +1917,14 @@ class FinanceRepository extends BaseRepository
         $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', '%购买商品消费VR%')->sum('number'));
  
         return $date;
     }