后台-财务-财务统计-修复了vr统计和佣金统计不能根据时间动态变化的问题

app/common/repositories/finance/FinanceRepository.php

@@ -1201,25 +1201,25 @@ class FinanceRepository extends BaseRepository
                 return $item;
             });
         $data['count'] = $query->count();
+        //应用时间筛选条件
         $query1 = $this->date_where($query1, $where['date'], 'ub.create_time');
         $statistics = $query1->field('sum(ub.number) money,ub.commission_type')->group('ub.commission_type')->select()->toArray();
         $statistics = array_column($statistics, 'money', 'commission_type');
-
+        //应用时间筛选条件
         $query3 = $this->date_where($query3, $where['date'], 'ub.create_time');
         $statistics_tow = $query3->field('sum(ub.number) money,ub.status')->group('ub.status')->select()->toArray();
         $statistics_tow = array_column($statistics_tow, 'money', 'status');
-
         //佣金类型 1代理费 2 消费佣金 3直推奖√ 4辖区佣金\r\n5 养老金√ 6 广告费 7 跨店奖励√ 8平台奖励 9渠道商\r\n10 推荐创客收益√ 11分红奖金√ 12区县代区域收益√ 13消费循环佣金  14-推荐代理收益√ 15邀请小区团长升级√ 16大V经理分享奖√ 17创客合伙人√ 18积分奖励√ 19创客补贴√' 20省级代理区域收益√
         $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($statistics_tow[-1] ?? 0), 'name' => '已失效佣金'];
-//        $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', '-', 2);
+        $transition_vr_query = $this->date_where($transition_vr_query, $where['date'], 'create_time', '-', 2);//type为2时，才能根据时间戳来筛选数据。默认是处理Y-m-d H:i:s字符串
         $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_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');
@@ -1930,7 +1930,7 @@ class FinanceRepository extends BaseRepository
         // $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'));
-
+        //支持时间筛选条件
         $query = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2);
         $date['list'] = $query
             ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,uss.type,uss.mark,u.score')