bug

application/api_broker/service/OrderLogService.php

@@ -1119,10 +1119,13 @@ class OrderLogService
         $params["ids"] = $ids;
 
         $bargainModel = new OBargainModel();
-        $filed        = "a.id,a.house_number,a.commission,a.agent_id,a.create_time,b.user_phone,b.user_name,b.user_id,c.id as order_id,
+        $filed        = "a.id,a.father_id,a.house_number,a.commission,a.agent_id,a.create_time,b.user_phone,b.user_name,b.user_id,c.id as order_id,
         d.id as house_id,d.internal_title,d.internal_address";
         $result       = $bargainModel->selectBargainList($filed, $params, $pageNo, $pageSize);
         foreach ($result as $k => $v) {
+            if($v["father_id"] > 0){
+                $result[$k]["id"] = $v["father_id"];
+            }
             $result[$k]["create_time"] = date("Y-m-d", strtotime($v["create_time"]));
         }
         return $result;

application/model/OBargainModel.php

@@ -221,11 +221,12 @@ class OBargainModel extends Model
             ->join("o_order c", "a.order_id = c.id", "left")
             ->join("g_houses d", "c.house_id = d.id", "left")
             ->where($where_)
+            ->group("a.father_id")
             ->order("a.create_time desc")
             ->limit($pageSize)
             ->page($pageNo)
             ->select();
-        //echo $this->db_->getLastSql();
+        echo $this->db_->getLastSql();
         return $result;
     }