商铺列表详情显示对外地址 报备时间轴显示对内地址

application/api_broker/controller/OrderLog.php

@@ -375,11 +375,6 @@ class OrderLog extends Basic
 
     /**
      * 报备时间轴
-     *
-     * @return \think\Response
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
      */
     public function selectReportAll()
     {
@@ -390,17 +385,12 @@ class OrderLog extends Basic
         if (!isset($params["order_id"])) {
             return $this->response("101", "请求参数错误");
         }
-        $data = $this->service_->selectListByOrderNo($params["order_id"]);
+        $data = [];
         return $this->response("200", "request success", $data);
     }
 
     /**
      * 报备时间轴
-     *
-     * @return \think\Response
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
      */
     public function selectReportAllV2()
     {
@@ -411,7 +401,7 @@ class OrderLog extends Basic
         if (!isset($params["order_id"])) {
             return $this->response("101", "请求参数错误");
         }
-        $data = $this->service_->selectListByOrderNoV2($params["order_id"]);
+        $data = [];
         return $this->response("200", "request success", $data);
     }
 

application/api_broker/controller/Shop.php

@@ -98,7 +98,8 @@ class Shop extends Basic
             ,shop_area_start,shop_area_end,shop_type,residue_num,shop_sign,is_carefully_chosen,rent_type,rent_price,is_exclusive_type";
 
         } else {
-            $field = "id,internal_title as title,internal_address as address,city,disc,business_district_id,status,industry_type
+           // $field = "id,internal_title as title,internal_address as address,city,disc,business_district_id,status,industry_type
+            $field = "id,external_title as title,internal_address as address,city,disc,business_district_id,status,industry_type
             ,shop_area_start,shop_area_end,shop_type,residue_num,shop_sign,is_carefully_chosen,rent_type,rent_price,is_lock
             ,is_exclusive_type";
 
@@ -374,7 +375,8 @@ class Shop extends Basic
 
 
         if ($params['site_area'] == 3) {
-            $field = "a.id,a.internal_title as title,a.internal_address as address,a.city,a.disc,a.business_district_id,a.status,
+           // $field = "a.id,a.internal_title as title,a.internal_address as address,a.city,a.disc,a.business_district_id,a.status,
+            $field = "a.id,a.external_title as title,a.internal_address as address,a.city,a.disc,a.business_district_id,a.status,
             a.industry_type,a.shop_area_start,a.shop_area_end,a.shop_type,a.residue_num,a.shop_sign,a.is_carefully_chosen,a.rent_type,
             a.rent_price,a.management_fee,a.slotting_fee,a.total,a.market_area,a.is_has_gas,a.file_path,a.longitude,a.latitude,
             b.enter_num,b.internal_item_advantage as item_advantage,b.sign_rule,b.do_business_date, b.opening_date,b.traffic,
@@ -382,7 +384,8 @@ class Shop extends Basic
             a.is_show,a.is_exclusive_type,a.update_time,a.external_title,a.external_address,b.external_item_advantage,b.agent_start_time,b.agent_end_time";
             $conditions['a.status'] = array("neq", 3);
         } else {
-            $field = "a.id,a.internal_title,a.internal_address,a.external_title,a.external_address,
+            //$field = "a.id,a.internal_title,a.internal_address,a.external_title,a.external_address,
+            $field = "a.id,a.external_title as internal_title,a.internal_address,a.external_title,a.external_address,
             a.city,a.disc,a.business_district_id,a.status,a.industry_type,a.shop_area_start,a.shop_area_end,a.shop_type,
             a.residue_num,a.shop_sign,a.is_carefully_chosen,a.rent_type, a.rent_price,a.management_fee,a.slotting_fee,
             a.total,a.market_area,a.is_has_gas,a.file_path,a.longitude,a.latitude,a.is_show,a.is_exclusive_type,

application/model/OrderModel.php

@@ -37,20 +37,30 @@ class OrderModel extends Model
 
     }
 
+    /**
+     * @param $filed
+     * @param $params
+     * @return false|\PDOStatement|string|\think\Collection
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
     public function selectOrderByOrderId($filed, $params)
     {
         $where_ = [];
         if (isset($params["order_id"])) {
-            $where_["id"] = $params["order_id"];
+            $where_["a.id"] = $params["order_id"];
         }
         if (isset($params["f_id"])) {
-            $where_["f_id"] = $params["f_id"];
+            $where_["a.f_id"] = $params["f_id"];
         }
         if (isset($params["house_id"])) {
-            $where_["house_id"] = $params["house_id"];
+            $where_["a.house_id"] = $params["house_id"];
         }
         $result = $this->db_
             ->field($filed)
+            ->alias("a")
+            ->join("g_houses b", "a.house_id = b.id", "left")
             ->where($where_)
             ->select();
         //echo $this->db_->getLastSql();