Merge branch 'dev-xpy' into dev

app/common/repositories/finance/FinanceRepository.php

@@ -1922,9 +1922,9 @@ class FinanceRepository extends BaseRepository
         $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'));
+        $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'));
  
         return $date;
     }