大后台日账单月账单

app/controller/admin/finance/Finance.php

@@ -309,7 +309,7 @@ class Finance extends BaseController
     {
         [$page, $limit] = $this->getPage();
         $where['mer_id'] = 0;
-        $query = Db::name('enterprise_month_bill')->field('id,month ,flow,expenditure,accounting')->where($where);
+        $query = Db::name('enterprise_month_bill')->where($where);
         $date['count'] = $query->count();
         $date['list'] = $query->page($page, $limit)->order('month desc')->select();
         return app('json')->success($date);

app/controller/admin/finance/PlatformIncomeDetail.php

@@ -23,7 +23,7 @@ class PlatformIncomeDetail extends BaseController
             $query = Db::name('enterprise_platform_income_detail')
                 ->alias('income_detail')
                 ->leftJoin('user u', 'u.uid=income_detail.uid')
-                ->where('income_detail.mer_id', 0)
+                // ->where('income_detail.mer_id', '!=', 0)
                 ->whereNotIn('deal_type', [3])
                 ->when(isset($params['pm']) && $params['pm'] != '', function ($query) use ($params) {
                     $query->where('pm', $params['pm']);
@@ -63,7 +63,7 @@ class PlatformIncomeDetail extends BaseController
                         $query->where(" (income_detail.deal_order_sn like '%{$params['keyword']}%' or income_detail.order_sn like '%{$params['keyword']}%')");
                     }
                 })
-                ->where('u.test_user', '<', '1')
+                // ->where('u.test_user', '<', '1')
                 ->page($page, $limit)
                 ->field('income_detail.*,u.nickname,u.phone')
                 ->order('income_detail.deal_time', 'desc');

app/controller/merchant/finance/PlatformIncomeDetail.php

@@ -74,7 +74,7 @@ class PlatformIncomeDetail extends BaseController
                         $tema_id = array_diff($tema_id, [$node_uid]);
                     $query->whereIn('income_detail.uid', $tema_id);
                 })
-                ->where('u.test_user', '<', '1')
+                // ->where('u.test_user', '<', '1')
                 ->page($page, $limit)
                 ->field('income_detail.*,u.nickname,u.phone')
                 ->order('income_detail.deal_time', 'desc');