Bladeren bron

时间筛选

xialei 1 jaar geleden
bovenliggende
commit
875b7d9102
1 gewijzigde bestanden met toevoegingen van 7 en 6 verwijderingen
  1. 7 6
      app/common/repositories/finance/FinanceRepository.php

+ 7 - 6
app/common/repositories/finance/FinanceRepository.php

@@ -550,7 +550,7 @@ class FinanceRepository extends BaseRepository
550
         $query5 = clone $query;
550
         $query5 = clone $query;
551
         $query6 = clone $query;
551
         $query6 = clone $query;
552
         $query7 = clone $query;
552
         $query7 = clone $query;
553
-        $date['list'] = $this->date_where($query, $where['date'], 'uss,addtime', '-', 2)
553
+        $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
554
             ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.pm,uss.reward_socre,o.order_sn,uss.status,uss.mark,u.score')
554
             ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.pm,uss.reward_socre,o.order_sn,uss.status,uss.mark,u.score')
555
             ->page($page, $limit)
555
             ->page($page, $limit)
556
             ->order('uss.id', 'desc')
556
             ->order('uss.id', 'desc')
@@ -592,6 +592,7 @@ class FinanceRepository extends BaseRepository
592
         ->alias('uss')
592
         ->alias('uss')
593
         ->leftJoin('user u', 'u.uid=uss.uid')
593
         ->leftJoin('user u', 'u.uid=uss.uid')
594
         ->leftJoin('store_order o', 'o.order_id=uss.order_id')
594
         ->leftJoin('store_order o', 'o.order_id=uss.order_id')
595
+        // ->date_where($query, $where['date'], 'uss,addtime', '-', 2)
595
         ->when(isset($params['uid']) && $params['uid'] != '', function ($query) use ($params) {
596
         ->when(isset($params['uid']) && $params['uid'] != '', function ($query) use ($params) {
596
             $query->where('uss.uid', $params['uid']);
597
             $query->where('uss.uid', $params['uid']);
597
         })
598
         })
@@ -614,7 +615,7 @@ class FinanceRepository extends BaseRepository
614
         $query5 = clone $query;
615
         $query5 = clone $query;
615
         $query6 = clone $query;
616
         $query6 = clone $query;
616
         $query7 = clone $query;
617
         $query7 = clone $query;
617
-        $date['list'] = $this->date_where($query, $where['date'], 'uss,addtime', '-', 2)
618
+        $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
618
             ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,uss.status,uss.mark,u.score')
619
             ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,uss.status,uss.mark,u.score')
619
             ->page($page, $limit)
620
             ->page($page, $limit)
620
             ->order('uss.id', 'desc')
621
             ->order('uss.id', 'desc')
@@ -676,7 +677,7 @@ class FinanceRepository extends BaseRepository
676
         $query5 = clone $query;
677
         $query5 = clone $query;
677
         $query6 = clone $query;
678
         $query6 = clone $query;
678
         $query7 = clone $query;
679
         $query7 = clone $query;
679
-        $date['list'] = $this->date_where($query, $where['date'], 'uss,addtime', '-', 2)
680
+        $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
680
             ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,uss.status,uss.mark,u.score')
681
             ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,uss.status,uss.mark,u.score')
681
             ->page($page, $limit)
682
             ->page($page, $limit)
682
             ->order('uss.id', 'desc')
683
             ->order('uss.id', 'desc')
@@ -739,7 +740,7 @@ class FinanceRepository extends BaseRepository
739
         $query5 = clone $query;
740
         $query5 = clone $query;
740
         $query6 = clone $query;
741
         $query6 = clone $query;
741
         $query7 = clone $query;
742
         $query7 = clone $query;
742
-        $date['list'] = $this->date_where($query, $where['date'], 'uss,addtime', '-', 2)
743
+        $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
743
             ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,uss.status,uss.mark,u.score')
744
             ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,uss.status,uss.mark,u.score')
744
             ->page($page, $limit)
745
             ->page($page, $limit)
745
             ->order('uss.id', 'desc')
746
             ->order('uss.id', 'desc')
@@ -801,7 +802,7 @@ class FinanceRepository extends BaseRepository
801
         $query5 = clone $query;
802
         $query5 = clone $query;
802
         $query6 = clone $query;
803
         $query6 = clone $query;
803
         $query7 = clone $query;
804
         $query7 = clone $query;
804
-        $date['list'] = $this->date_where($query, $where['date'], 'uss,addtime', '-', 2)
805
+        $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
805
             ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,uss.status,uss.mark,u.score')
806
             ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,uss.status,uss.mark,u.score')
806
             ->page($page, $limit)
807
             ->page($page, $limit)
807
             ->order('uss.id', 'desc')
808
             ->order('uss.id', 'desc')
@@ -864,7 +865,7 @@ class FinanceRepository extends BaseRepository
864
         $query5 = clone $query;
865
         $query5 = clone $query;
865
         $query6 = clone $query;
866
         $query6 = clone $query;
866
         $query7 = clone $query;
867
         $query7 = clone $query;
867
-        $date['list'] = $this->date_where($query, $where['date'], 'uss,addtime', '-', 2)
868
+        $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
868
             ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,uss.type,uss.mark,u.score')
869
             ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,uss.type,uss.mark,u.score')
869
             ->page($page, $limit)
870
             ->page($page, $limit)
870
             ->order('uss.id', 'desc')
871
             ->order('uss.id', 'desc')