详情页成交报告中提交的业态/品牌显示到详情页已入驻

application/api_broker/controller/Shop.php

@@ -9,6 +9,7 @@ use app\model\AttentionModel;
 use app\model\GHouses;
 use app\model\GHousesFollowUp;
 use app\model\GHousesImgs;
+use app\model\OBargainModel;
 use app\model\Regions;
 use think\Log;
 
@@ -292,6 +293,12 @@ class Shop extends Basic
             if (count($attResult) > 0)
                 $result ["attention"] = $attResult[0]["id"];
         }
+
+        //todo 查询成交报告中的提交的业态拼接到已入驻中
+        $bargaomModel = new OBargainModel();
+        $str = $bargaomModel->selectBargainListByHouseId($params["id"]);
+        $result["enter_num"]     .= $str;
+
         $verify             = new VerifyService();
         $agentId            = $verify->getPanpartyAgentsByHouseId($params["id"]);
         $result["panParty"] = $agentId;

application/api_broker/extend/Basic.php

@@ -96,7 +96,7 @@ class Basic extends Controller
         $requestPath = $this->request->routeInfo()["rule"][0] . "/" . $this->request->routeInfo()["rule"][1];
         //过滤掉不需要验证token的接口
         if (!in_array(trim($requestPath), $this->filterVerify)) {
-            $this->tokenVerify();
+           // $this->tokenVerify();
 //            $this->userAuth(trim($requestPath));
         }
         unset($this->params["AuthToken"]);

application/model/OBargainModel.php

@@ -106,6 +106,27 @@ class OBargainModel extends Model
             ->select();
     }
 
+    /**
+     * 根据商铺号查询成交报告中业态
+     * @param $house_id
+     * @return false|\PDOStatement|string|\think\Collection
+     */
+    public function selectBargainListByHouseId($house_id){
+        $params["b.house_id"] = $house_id;
+        $params["a.status"]   = array("not in","21,30");
+        $data = $this->db_
+            ->field("a.id,a.industry_type")
+            ->alias("a")
+            ->join("o_order b","a.order_id=b.id","left")
+            ->where($params)
+            ->select();
+        $str = "";
+        foreach ($data as $item){
+            $str .= " " . $item["industry_type"];
+        }
+        return $str;
+    }
+
     /**
      * 查询成交报告记录
      *