sunxbiao месяцев назад: 6
Родитель
Сommit
3fa87475ae
1 измененных файлов с 3 добавлено и 9 удалено
  1. 3 9
      app/common/repositories/finance/FinanceRepository.php

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

@@ -1041,6 +1041,7 @@ class FinanceRepository extends BaseRepository
1041 1041
         $query = Db::name('user_bill')
1042 1042
             ->alias('ub')
1043 1043
             ->leftJoin('user u', 'u.uid=ub.uid')
1044
+            ->where('u.test_user', '!=', 1)
1044 1045
             ->when($mer_id, function ($query) use ($mer_id) {
1045 1046
                 $query->where('ub.mer_id', $mer_id);
1046 1047
             })
@@ -1853,7 +1854,9 @@ class FinanceRepository extends BaseRepository
1853 1854
         $query = Db::name('user_sign_vr')
1854 1855
         ->alias('uss')
1855 1856
         ->leftJoin('user u', 'u.uid=uss.uid')
1857
+        ->where('u.test_user', '<>', 1)
1856 1858
         ->leftJoin('store_order o', 'o.order_id=uss.order_id')
1859
+        ->where('o.test_order', '<>', 1)
1857 1860
         ->when(isset($params['uid']) && $params['uid'] != '', function ($query) use ($params) {
1858 1861
             $query->where('uss.uid', $params['uid']);
1859 1862
         })
@@ -1869,15 +1872,6 @@ class FinanceRepository extends BaseRepository
1869 1872
         ->when(isset($params['type']) && $params['type'] != '', function ($query) use ($params) {
1870 1873
             $query->where('type', $params['type']);
1871 1874
         });
1872
-        $query1 = clone $query;
1873
-        $query2 = clone $query;
1874
-        $query3 = clone $query;
1875
-        $query4 = clone $query;
1876
-        $query5 = clone $query;
1877
-        $query6 = clone $query;
1878
-        $query7 = clone $query;
1879
-        $query8 = clone $query;
1880
-        $query9 = clone $query;
1881 1875
 
1882 1876
         //导出数据
1883 1877
         $is_excel = request()->param('is_excel', 0);