Merge branch 'test' of https://gitee.com/zwyjjc/tl_estate into test

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,b.scale as new_scale,b.scale_fee as new_scale_fee';
+            $field = 'a.id,a.scale,a.agent_id,a.role,a.scale_fee,b.scale as new_scale,b.should_commission';
             $data = $m_bargain->getBargainPartialDetail($field, ['id'=>$this->params['bargain_id']]);
             return $this->response(200, '', $data);
         } 
@@ -1481,6 +1481,10 @@ class Finance extends Basic
 
         $data = $m_bargain->updateBargainById($this->params['bargain_id'], $update);   //更改分佣方
 
+        $comm = new OPartialCommission();
+        $partial_data['scale'] = $this->params['scale'];
+        $partial_data['should_commission'] = $this->params['scale_fee'];
+        $comm->editData($partial_data, $this->params['bargain_id'], 'bargain_id');
         $this->updatePerformance(0, $this->params['agent_id']);
         $this->updatePerformance(0, $data_arr['agent_id']);
 

application/model/OBargainModel.php

@@ -1232,7 +1232,7 @@ class OBargainModel extends Model
                 ->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'];
+            $result['scale_fee'] = empty($result['should_commission']) ? $result['scale_fee'] : $result['should_commission'];
             $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'] ]);
@@ -1244,7 +1244,7 @@ class OBargainModel extends Model
             $result['district_id']   = $agent_info[0]['district_id'];
 
         } catch (\Exception $ex) {
-            $result = false;
+            $result = $ex->getMessage();
         }
 
         return $result;