新增已消耗筛选

app/common/repositories/finance/FinanceRepository.php

@@ -171,7 +171,7 @@ class FinanceRepository extends BaseRepository
             $data[] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[4] ?? 0), 'name' => '创客'];
         }
         $res['left'][] = $data;
-        $res['right'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim(intval($maker['4-2'] ?? 0) + intval($maker['4-1'] ?? 0) + intval($userByCodeCount['temp'] ?? 0)), 'name' => '创客', 'list' => $list1];
+        $res['right'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim(intval($maker['4-2'] ?? 0) + intval($maker['4-1'] ?? 0) + intval($userByCodeCount['temp'] ?? 0)), 'name' => '创客'];
 
         return $res;
     }
@@ -486,7 +486,7 @@ class FinanceRepository extends BaseRepository
         $data['statistics']['commission'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim(array_sum($statistics)), 'name' => '佣金奖励总额'];
         $data['statistics']['commission'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($statistics_tow[1] ?? 0), 'name' => '已结算佣金'];
         $data['statistics']['commission'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($statistics_tow[0] ?? 0), 'name' => '未结算佣金'];
-        $data['statistics']['commission'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim(0), 'name' => '转VR佣金'];
+        $data['statistics']['commission'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim(0), 'name' => '佣金转VR'];
         $user_extra_money = Db::name('user_extract')->where('status', 1)->sum('extract_price');
         $data['statistics']['commission'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($user_extra_money), 'name' => '已提现佣金'];
         $data['statistics'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($user_extra_money), 'name' => '已提现金额'];
@@ -592,6 +592,11 @@ class FinanceRepository extends BaseRepository
         $where = request()->params(['date']);
         $params = request()->params(['type', 'uid', 'pm', 'phone','status']);
 
+        if($params['status'] == 99){
+            unset($params['status']);
+            $params['pm'] = 2;
+        }
+
         $date = [];
         //商户ID
         $query = Db::name('user_sign_score')
@@ -656,6 +661,11 @@ class FinanceRepository extends BaseRepository
         $where = request()->params(['date']);
         $params = request()->params(['type', 'uid', 'pm', 'phone','status']);
 
+        if($params['status'] == 99){
+            unset($params['status']);
+            $params['type'] = 2;
+        }
+
         $date = [];
         //商户ID
         $query = Db::name('user_sign_jingdou')
@@ -782,6 +792,11 @@ class FinanceRepository extends BaseRepository
         $where = request()->params(['date']);
         $params = request()->params(['type', 'uid', 'pm', 'phone','status']);
 
+        if($params['status'] == 99){
+            unset($params['status']);
+            $params['type'] = 2;
+        }
+
         $date = [];
         //商户ID
         $query = Db::name('user_sign_fugou')