修改成交报告

application/api_broker/controller/OrderLog.php

@@ -538,7 +538,7 @@ class OrderLog extends Basic
         }
         $source       = empty($this->params['source']) ? 0 : $this->params['source'];
         $bargain      = new OBargainModel();
-        $data['data'] = $bargain->addBargainCommission($this->params['id'], $this->userId, $this->params['agent_id'],
+        $data['data'] = $bargain->addBargainCommission($this->params['id'], $this->agentId, $this->params['agent_id'],
             $this->params['role'], $this->params['scale_fee'], $this->params['scale'], $source);
 
         if ($data['data'] == 0) {

application/index/controller/Finance.php

@@ -942,7 +942,7 @@ class Finance extends Basic
         $pageNo   = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
         $pageSize = empty($this->params['pageSize']) ? 15 : $this->params['pageSize'];
 
-        $fields = 'a.id,a.create_time,e.name,e.phone,a.fee,b.house_number,d.internal_address,b.agent_id,b.father_id,b.order_id';
+        $fields = 'a.id,a.create_time,e.name,e.phone,a.fee,b.house_number,d.internal_address,a.agent_id,b.father_id,b.order_id';
 
         $where['c.is_del'] = 0;
         $where['b.status'] = [ 'in', 10, 11 ];   //10已提交 11审核成功

application/model/OBargainModel.php

@@ -709,6 +709,7 @@ class OBargainModel extends Model
             $insert_data['account_statement'] = $bargain_data['account_statement'];
             $insert_data['is_commission']     = $bargain_data['is_commission'];
             $insert_data['content']           = $bargain_data['content'];
+            $insert_data['industry_type']     = $bargain_data['industry_type'];
             $result                           = $this->insert($insert_data);
             if ($result == 1) {
                 $this->commit();