Commit 254cfae4 authored by clone's avatar clone

1

parent 322d3bb5
...@@ -1368,8 +1368,9 @@ class OfficeOrderLogService ...@@ -1368,8 +1368,9 @@ class OfficeOrderLogService
$params["order_id"] = $order_id; $params["order_id"] = $order_id;
$bargainModel = new OfficeOBargainModel(); $bargainModel = new OfficeOBargainModel();
$filed = "a.id,a.father_id,a.price,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.price,a.house_number,a.commission,a.agent_id,a.create_time,b.user_phone,
d.id as house_id,d.internal_title,d.internal_address,c.order_no,a.report_id"; b.user_name,b.user_id,c.id as order_id, d.id as house_id,e.title internal_title,CONCAT(e.address,d.room_number) internal_address,
c.order_no,a.report_id";
$result = $bargainModel->selectBargainList($filed, $params, 1, 15); $result = $bargainModel->selectBargainList($filed, $params, 1, 15);
$list = []; $list = [];
foreach ($result as $k => $v) { foreach ($result as $k => $v) {
......
...@@ -296,7 +296,7 @@ class OfficeOBargainModel extends Model ...@@ -296,7 +296,7 @@ class OfficeOBargainModel extends Model
->limit($pageSize) ->limit($pageSize)
->page($pageNo) ->page($pageNo)
->select(); ->select();
// big_log($this->db_->getLastSql()); //echo $this->db_->getLastSql();
return $result; return $result;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment