check_status

application/index/controller/Finance.php

@@ -4014,14 +4014,6 @@ class Finance extends Basic
         if (empty($this->params['pay_id'])) {
             return $this->response(101, '参数错误');
         }
-
-        $m_paylog = new OPayLogModel();
-        $field = 'a.id,a.create_time,a.order_id,a.father_id,a.money,a.real_money,a.pay_type,a.type,a.source,a.transaction_fee,a.source,b.f_id,a.transfer_name,a.receipt_number,';
-        $field .= 'e.name,a.income_time,e.store_id,b.house_id,b.order_no,a.report_id,a.house_number,a.is_dividend,a.last_transfer_time,a.industry_type,a.agent_id,d.internal_address as address,e.name as agent_name';
-        $where['a.is_del'] = $where_2['a.is_del'] = $where_3['a.is_del'] = 0;
-        $where_2['a.paylog_id'] =  $where_3['a.pay_log_id'] = $this->params['pay_id'];
-        $where[] = ['EXP','a.father_id='.$this->params['pay_id']. ' OR a.order_id='.$this->params['order_id']];
-        $list = $m_paylog->getAddPayLogOrderListLimit(1, 1000, '', $field, $where);
         $m_store = new AStore();
         $m_pay_adjustment = new OPayLogAdjustment();
         $m_report = new OReportModel();
@@ -4029,6 +4021,21 @@ class Finance extends Basic
         $m_house = new GHouses();
         $m_refund = new ORefundModel();
         $m_agent = new AAgents();
+        $m_paylog = new OPayLogModel();
+
+        $field = 'a.id,a.create_time,a.order_id,a.father_id,a.money,a.real_money,a.pay_type,a.type,a.source,a.transaction_fee,a.source,b.f_id,a.transfer_name,a.receipt_number,';
+        $field .= 'e.name,a.income_time,e.store_id,b.house_id,b.order_no,a.report_id,a.house_number,a.is_dividend,a.last_transfer_time,a.industry_type,a.agent_id,d.internal_address as address,e.name as agent_name';
+        $where['a.is_del'] = $where_2['a.is_del'] = $where_3['a.is_del'] = 0;
+        $where_2['a.paylog_id'] =  $where_3['a.pay_log_id'] = $this->params['pay_id'];
+
+        $adjustment_id = $m_pay_adjustment->getFieldColumn('new_paylog_id',['paylog_id'=>$this->params['pay_id']]);
+        if ($adjustment_id) {
+            $sql_where = ' or a.id in ('.implode(',',$adjustment_id).')';
+        }
+
+        $where[] = ['EXP','a.father_id='.$this->params['pay_id']. $sql_where];
+        $list = $m_paylog->getAddPayLogOrderListLimit(1, 1000, '', $field, $where);
+
         foreach ($list as $k=>$v) {
             $list[$k]['source_id'] = $list[$k]['is_adjustment'] = '';
             if ($v['source'] == 2) {

application/index/controller/Report.php

@@ -30,7 +30,7 @@ class Report extends Basic
         $pageSize = empty($this->params['pageSize']) ? 15 : $this->params['pageSize'];
         $m_report = new OReportModel();
         $m_agent  = new AAgents();
-        switch ($this->params['type']) {
+        switch ($this->params['check_status']) {
             case 1 :
                 $store_id = $m_agent->getAgentFieldById($this->userId, 'store_id');
                 $where['d.store_id'] = $store_id;

application/route.php

@@ -381,9 +381,9 @@ Route::group('index', [
     'addSite'                     => ['index/Site/addSite', ['method' => 'POST|GET']], //获取站点列表 朱伟 2018-10-18
     'getSiteList'                 => ['index/Site/getSiteList', ['method' => 'POST|GET']], //获取站点列表 朱伟 2018-10-18
     'delImageDepot_Site'          => ['index/Site/delImageDepot', ['method' => 'POST|GET']], //关闭或开启站点 朱伟 2018-10-18
-    'inspectionRecordStore/:type'  => ['index/Report/inspectionRecordAll', ['method' => 'GET'], ['type'=>1]], //全部约带看
-    'inspectionRecordDistrict/:type' => ['index/Report/inspectionRecordAll', ['method' => 'GET'],['type'=>2]], //全部约带看
-    'inspectionRecordAll/:type'      => ['index/Report/inspectionRecordAll', ['method' => 'GET'],['type'=>3]], //全部约带看
+    'inspectionRecordStore/:check_status'  => ['index/Report/inspectionRecordAll', ['method' => 'GET'], ['check_status'=>1]], //全部约带看
+    'inspectionRecordDistrict/:check_status' => ['index/Report/inspectionRecordAll', ['method' => 'GET'],['check_status'=>2]], //全部约带看
+    'inspectionRecordAll/:check_status'      => ['index/Report/inspectionRecordAll', ['method' => 'GET'],['check_status'=>3]], //全部约带看
     'setSite'                     => ['index/auth/setSite', ['method' => 'GET|POST']], //设置角色站点