Merge branch 'dev-xpy' into dev

app/common/repositories/finance/FinanceRepository.php

@@ -1214,9 +1214,15 @@ class FinanceRepository extends BaseRepository
         $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($statistics_tow[-1] ?? 0), 'name' => '已失效佣金'];
-        $transition_vr = Db::name('user_transition_vr')->where('type', 1)->sum('number');
+//        $transition_vr = Db::name('user_transition_vr')->where('type', 1)->sum('number');
+//        $user_extra_money = Db::name('user_extract')->where('status', 1)->sum('extract_price');
+        $transition_vr_query = Db::name('user_transition_vr')->where('type', 1);
+        $transition_vr_query = $this->date_where($transition_vr_query, $where['date'], 'create_time');
+        $transition_vr = $transition_vr_query->sum('number');
         $data['statistics']['commission'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($transition_vr), 'name' => '佣金转VR'];
-        $user_extra_money = Db::name('user_extract')->where('status', 1)->sum('extract_price');
+        $user_extra_money_query = Db::name('user_extract')->where('status', 1);
+        $user_extra_money_query = $this->date_where($user_extra_money_query, $where['date'], 'create_time');
+        $user_extra_money = $user_extra_money_query->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' => '已提现金额'];