Merge branch 'dev-xpy' into dev

app/common/repositories/finance/FinanceRepository.php

@@ -1201,9 +1201,11 @@ 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');