c端已看

application/api/controller/AppointmentTime.php

@@ -104,8 +104,8 @@ class AppointmentTime extends Basic
     {
         /*          $params = array(
                   "status" => 2, //看铺状态 0待经纪人确认（确认后存agents_id） 1:待看 2：已看' 如果是待看 0,1 已看是2
-               "user_id" => "1",//对应u_users表
-               "phone" => "18112347151",//phone
+                  "user_id" => "122",//对应u_users表
+                  "phone" => "17717536290",//phone
                   "pageNo" => "1",
                   "pageSize" => 15
               );*/
@@ -128,7 +128,7 @@ class AppointmentTime extends Basic
         if ($params["status"] == 1) {
             $result = $this->getWaitList($pageNo, $pageSize, $params);
         } elseif ($params["status"] == 2) {
-            $result = $this->getYetList($pageNo, $pageSize, $params);
+            $result = $this->getYetListV2($pageNo, $pageSize, $params);
         }
 
         if (count($result) > 0) {
@@ -199,5 +199,33 @@ class AppointmentTime extends Basic
         return $result;
     }
 
+    /**
+     * 已看列表
+     * @param $pageNo
+     * @param $pageSize
+     * @param $params
+     * @return false|\PDOStatement|string|\think\Collection
+     */
+    public function getYetListV2($pageNo, $pageSize, $params)
+    {
+        $field = "a.id,a.phone,c.reception_id as agents_id,c.create_time as expect_time,a.house_id,
+        d.external_title as house_title,d.residue_num as room_num_left";
+
+        $where_["a.user_id"] = $params["user_id"];
+        $result              = $this->appointmentTimeModel->getHaveToSeeList($pageNo, $pageSize, "id desc", $field, $where_);
+
+        //获取图片信息
+        foreach ($result as $key => $val) {
+            $result[$key]["api_path"] = IMG_PATH;
+            $param["house_id"]        = $val["house_id"];
+            $param["img_type"]        = 1; //默认主图
+            $result[$key]["images"]   = $this->dbImg->getHouseImages($param, 1);
+            //todo 是否评价
+            $evaluateResult              = $this->evaluateMode->getIsEvaluate(10, $val["id"], $params["user_id"]);
+            $result[$key]["is_evaluate"] = count($evaluateResult) > 0 ? 1 : 0;
+        }
+        return $result;
+    }
+
 
 }
\ No newline at end of file

application/model/AppointWatchShop.php

@@ -62,6 +62,34 @@ class AppointWatchShop extends BaseModel
             ->select();
     }
 
+    /**
+     * 预约看铺列表 已看列表
+     *
+     * @param int $pageNo
+     * @param int $pageSize
+     * @param string $order_
+     * @param $field
+     * @param $params
+     * @return false|\PDOStatement|string|\think\Collection
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function getHaveToSeeList($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field, $params)
+    {
+        return $this
+            ->field($field)
+            ->alias("a")
+            ->join("o_report b","a.applies_id = b.id","left")
+            ->join("o_march_in c","c.report_id = b.id","right")
+            ->join("g_houses d","d.id = a.house_id","left")
+            ->where($params)
+            ->order($order_)
+            ->limit($pageSize)
+            ->page($pageNo)
+            ->select();
+    }
+
     /**
      * 预约看铺总数
      *
@@ -81,7 +109,8 @@ class AppointWatchShop extends BaseModel
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public function getAppointInfo($field, $params) {
+    public function getAppointInfo($field, $params)
+    {
         return $this->field($field)
             ->where($params)
             ->find();