Преглед на файлове

分润统计结果未跟随时间条件变动

sunxbiao преди 1 година
родител
ревизия
bf955395c3
променени са 1 файла, в които са добавени 3 реда и са изтрити 5 реда
  1. 3 5
      app/common/repositories/finance/FinanceRepository.php

+ 3 - 5
app/common/repositories/finance/FinanceRepository.php

@@ -1958,18 +1958,16 @@ class FinanceRepository extends BaseRepository
1958 1958
         ->when(isset($params['phone']) && $params['phone'] != '', function ($query) use ($params) {
1959 1959
             $query->whereLike('u.phone', '%' . $params['phone'] . '%');
1960 1960
         });
1961
+        $query = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2);
1961 1962
         $query1 = clone $query;
1962 1963
         $query2 = clone $query;
1963 1964
         $query3 = clone $query;
1964 1965
         $query4 = clone $query;
1965
-        $query5 = clone $query;
1966
-        $query6 = clone $query;
1967
-        $query7 = clone $query;
1968 1966
 
1969 1967
         //导出数据
1970 1968
         $is_excel = request()->param('is_excel', 0);
1971 1969
         if($is_excel == 1){
1972
-            $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
1970
+            $date['list'] = $query
1973 1971
             ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,o.total_price,uss.status,uss.mark,u.score,m.mer_name')
1974 1972
             ->order('uss.id', 'desc')
1975 1973
             ->select();
@@ -2001,7 +1999,7 @@ class FinanceRepository extends BaseRepository
2001 1999
             ], $arr, '商户分润统计');
2002 2000
         }
2003 2001
 
2004
-        $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
2002
+        $date['list'] = $query
2005 2003
             // ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,o.total_price,uss.status,uss.mark,u.score,m.mer_name')
2006 2004
             ->field([
2007 2005
                 'uss.id',