bug

application/api_broker/controller/OrderLog.php

@@ -616,7 +616,7 @@ class OrderLog extends Basic
         if (!isset($params["order_id"])) {
             return $this->response("101", "请求参数错误");
         }
-        $field                       = "id,order_id,account_statement";
+        $field                       = "id,order_id,account_statement,house_number,is_open";
         $where_["order_id"]          = $params["order_id"];
         $where_["father_id"]         = 0;
         $where_["account_statement"] = 0;

application/api_broker/service/OrderLogService.php

@@ -811,9 +811,21 @@ class OrderLogService
     {
 
         $bargainModel = new OBargainModel();
-        $filed        = "a.id,a.trade_type,a.price,a.submit_agent_id,a.commission,a.role,
-        a.agent_id,a.scale,a.scale_fee,a.status,b.name,b.phone";
-        return $bargainModel->selectBargainDetail($filed, $params);
+        $bargain_info_filed        = "a.id,a.house_number,a.is_open,a.trade_type,a.price,a.commission,c.id,c.internal_title,
+        c.internal_address,d.user_id,d.user_phone,d.user_name";
+
+        /**
+         *  ->join("o_order b" ,"a.order_id = b.id","left")
+        ->join("g_houses c" ,"b.house_id = b.id","left")
+        ->join("o_report d","a.report_id = d.id","left")
+         */
+        $bargainInfo = $bargainModel->selectBargainDetail($bargain_info_filed, $params);
+        if(count($bargainInfo) > 0){
+
+        }
+
+        //分佣提成
+
 
     }
 

application/model/OBargainModel.php

@@ -213,13 +213,14 @@ class OBargainModel extends Model
         $where_ = $whereOr_ =[];
         if (isset($params["bargain_id"])) {
             $where_["a.id"] = $params["bargain_id"];
-            $whereOr_["a.father_id"] = $params["bargain_id"];
         }
 
         $result = $this->db_
             ->field($filed)
             ->alias("a")
-            ->join("a_agents b" ,"a.agent_id = b.id","left")
+            ->join("o_order b" ,"a.order_id = b.id","left")
+            ->join("g_houses c" ,"b.house_id = b.id","left")
+            ->join("o_report d","a.report_id = d.id","left")
             ->where($where_)
             ->whereOr($whereOr_)
             ->order("a.id asc")

application/model/OPartialCommission.php

@@ -11,6 +11,7 @@ namespace app\model;
 
 class OPartialCommission extends BaseModel
 {
+    protected $table = "o_partial_commission";
     /**
      * 成交报告分佣表
      *