Commit cc35a0f8 authored by zw's avatar zw

带看列表显示商铺地址

parent 3a767e49
...@@ -125,7 +125,8 @@ class Report extends Basic ...@@ -125,7 +125,8 @@ class Report extends Basic
$pageNo = empty($params['page_no']) ? 1 : $params['page_no']; $pageNo = empty($params['page_no']) ? 1 : $params['page_no'];
$pageSize = empty($params['page_size']) ? 15 : $params['page_size']; $pageSize = empty($params['page_size']) ? 15 : $params['page_size'];
$field = "a.id,a.user_id,a.user_phone,a.user_name,a.predict_see_time,a.create_time,b.id as order_id,b.order_no,b.house_id,b.house_title"; $field = "a.id,a.user_id,a.user_phone,a.user_name,a.predict_see_time,a.create_time,b.id as order_id,b.order_no,
b.house_id,b.house_title";
$params["report_agent_id"] = $params["agent_id"]; $params["report_agent_id"] = $params["agent_id"];
$result = []; $result = [];
......
...@@ -128,15 +128,20 @@ class ReportService ...@@ -128,15 +128,20 @@ class ReportService
$result = $this->oReportModel->selectReportList($field, $params, $pageNo, $pageSize); $result = $this->oReportModel->selectReportList($field, $params, $pageNo, $pageSize);
$ids_str = ""; $ids_str = "";
$house_id_str = "";
if (count($result) > 0) { if (count($result) > 0) {
foreach ($result as $k => $v) { foreach ($result as $k => $v) {
//$result[$k]["user_phone"] = preg_replace('/(\d{3})\d{4}(\d{4})/', '$1****$2', $v["user_phone"]); //$result[$k]["user_phone"] = preg_replace('/(\d{3})\d{4}(\d{4})/', '$1****$2', $v["user_phone"]);
$ids_str .= $v["order_id"] . ","; $ids_str .= $v["order_id"] . ",";
$house_id_str .= $v["house_id"] . ",";
} }
$ids_str = rtrim($ids_str, ","); $ids_str = rtrim($ids_str, ",");
$house_id_str = rtrim($house_id_str, ",");
$sign_arr = $this->orderSign($ids_str); $sign_arr = $this->orderSign($ids_str);
$house_arr = $this->houseInfo($house_id_str);
foreach ($result as $k => $v) { foreach ($result as $k => $v) {
$result[$k]["sign"] = ""; $result[$k]["sign"] = "";
...@@ -145,6 +150,11 @@ class ReportService ...@@ -145,6 +150,11 @@ class ReportService
$result[$k]["sign"] .= $this->signTitle($value["type"]) . ","; $result[$k]["sign"] .= $this->signTitle($value["type"]) . ",";
} }
} }
foreach ($house_arr as $item) {
if ($v["house_id"] == $item["id"]) {
$result[$k]["house_address"] .= $item["internal_title"];
}
}
} }
return $result; return $result;
...@@ -166,16 +176,20 @@ class ReportService ...@@ -166,16 +176,20 @@ class ReportService
{ {
$params = []; $params = [];
$result = $this->oReportModel->selectReportList($field, $params, $pageNo, $pageSize); $result = $this->oReportModel->selectReportList($field, $params, $pageNo, $pageSize);
$ids_str = "";
$ids_str = "";
$house_id_str = "";
if (count($result) > 0) { if (count($result) > 0) {
foreach ($result as $k => $v) { foreach ($result as $k => $v) {
//$result[$k]["user_phone"] = preg_replace('/(\d{3})\d{4}(\d{4})/', '$1****$2', $v["user_phone"]);
$ids_str .= $v["order_id"] . ","; $ids_str .= $v["order_id"] . ",";
$house_id_str .= $v["house_id"] . ",";
} }
$ids_str = rtrim($ids_str, ","); $ids_str = rtrim($ids_str, ",");
$house_id_str = rtrim($house_id_str, ",");
$sign_arr = $this->orderSign($ids_str); $sign_arr = $this->orderSign($ids_str);
$house_arr = $this->houseInfo($house_id_str);
foreach ($result as $k => $v) { foreach ($result as $k => $v) {
$result[$k]["sign"] = ""; $result[$k]["sign"] = "";
...@@ -183,6 +197,11 @@ class ReportService ...@@ -183,6 +197,11 @@ class ReportService
if ($v["order_id"] == $value["order_id"]) { if ($v["order_id"] == $value["order_id"]) {
$result[$k]["sign"] .= $this->signTitle($value["type"]) . ","; $result[$k]["sign"] .= $this->signTitle($value["type"]) . ",";
} }
foreach ($house_arr as $item) {
if ($v["house_id"] == $item["id"]) {
$result[$k]["house_address"] .= $item["internal_title"];
}
}
} }
} }
...@@ -258,6 +277,13 @@ class ReportService ...@@ -258,6 +277,13 @@ class ReportService
return $this->orderModel->selectSign($ids_str); return $this->orderModel->selectSign($ids_str);
} }
public function houseInfo($house_id_str)
{
$houseModel = new GHouses();
$params["id"] = array("in",($house_id_str));
return $houseModel->getHouseInfo("id,internal_title",$params);
}
public function signTitle($type) public function signTitle($type)
{ {
switch ($type) { switch ($type) {
......
...@@ -1643,4 +1643,5 @@ class GHouses extends BaseModel ...@@ -1643,4 +1643,5 @@ class GHouses extends BaseModel
->where($where_) ->where($where_)
->find(); ->find();
} }
} }
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