Browse Source

Merge branch 'dev-xpy' into dev

Xpy 7 months ago
parent
commit
634b804926
1 changed files with 1 additions and 1 deletions
  1. 1 1
      app/common/repositories/finance/FinanceRepository.php

+ 1 - 1
app/common/repositories/finance/FinanceRepository.php

@@ -1217,7 +1217,7 @@ class FinanceRepository extends BaseRepository
1217
 //        $transition_vr = Db::name('user_transition_vr')->where('type', 1)->sum('number');
1217
 //        $transition_vr = Db::name('user_transition_vr')->where('type', 1)->sum('number');
1218
 //        $user_extra_money = Db::name('user_extract')->where('status', 1)->sum('extract_price');
1218
 //        $user_extra_money = Db::name('user_extract')->where('status', 1)->sum('extract_price');
1219
         $transition_vr_query = Db::name('user_transition_vr')->where('type', 1);
1219
         $transition_vr_query = Db::name('user_transition_vr')->where('type', 1);
1220
-        $transition_vr_query = $this->date_where($transition_vr_query, $where['date'], 'create_time');
1220
+        $transition_vr_query = $this->date_where($transition_vr_query, $where['date'], 'create_time', '-', 2);
1221
         $transition_vr = $transition_vr_query->sum('number');
1221
         $transition_vr = $transition_vr_query->sum('number');
1222
         $data['statistics']['commission'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($transition_vr), 'name' => '佣金转VR'];
1222
         $data['statistics']['commission'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($transition_vr), 'name' => '佣金转VR'];
1223
         $user_extra_money_query = Db::name('user_extract')->where('status', 1);
1223
         $user_extra_money_query = Db::name('user_extract')->where('status', 1);