成交报告取最新修改数据

application/index/controller/Finance.php

@@ -1454,7 +1454,7 @@ class Finance extends Basic
         $m_bargain = new OBargainModel();
         
         if ($this->request->isGet()) {
-            $field = 'a.id,a.scale,a.agent_id,a.role,a.scale_fee';
+            $field = 'a.id,a.scale,a.agent_id,a.role,a.scale_fee,b.scale as new_scale,b.scale_fee as new_scale_fee';
             $data = $m_bargain->getBargainPartialDetail($field, ['id'=>$this->params['bargain_id']]);
             return $this->response(200, '', $data);
         } 

application/model/OBargainModel.php

@@ -1231,6 +1231,8 @@ class OBargainModel extends Model
                 ->order("a.id asc")
                 ->find();
 
+            $result['scale']     = empty($result['new_scale']) ? $result['scale'] : $result['new_scale'];
+            $result['scale_fee'] = empty($result['new_scale_fee']) ? $result['scale_fee'] : $result['new_scale_fee'];
             $m_agent                 = new AAgents();
             $filed_agent             = 'a.id,a.name,a.phone,b.store_name,c.district_name,a.store_id,a.district_id';
             $agent_info              = $m_agent->getAgentsInfoByAgentId($filed_agent, [ 'agent_id' => $result['agent_id'] ]);