1

application/api_broker/controller/LookShop.php

@@ -161,36 +161,12 @@ class LookShop extends Basic
     }
 
 
-    /**
-     * 客户浏览记录
-     * @return \think\Response
-     */
-    // public function getLookShopList()
-    // {
-    //     $params = $this->params;
-    //     $checkResult = $this->validate($params, "UserLookShopValidate.getLookShopList");
-    //     if (true !== $checkResult) {
-    //         return $this->response("101", $checkResult);
-    //     }
-    //     $pageNo        = empty($params['pageNo']) ? 1 : $params['pageNo'];
-    //     $pageSize      = empty($params['pageSize']) ? 15 : $params['pageSize'];
-    //     $s_look_Shop = new LookShopService();
-    //     $field = 'a.type,a.create_time,b.buyer_nick,b.buyer_img,c.id as user_id';
-    //     $conditions['a.source'] = 1;
-    //     $conditions['a.house_id'] = $params['house_id'];
-    //     $result = $s_look_Shop->getLookShopList($conditions,$field,$pageNo, $pageSize);
-    //     if($result){
-    //         return $this->response("200", "success", $result);
-    //     }else{
-    //         return $this->response("101", "暂无数据", []);
-    //     }
-    // }
 
     /**
      * 客户浏览记录
      * @return \think\Response
      */
-    public function getLookShopListV2()
+    public function getShopUserVisitLog()
     {
         $params = $this->params;
         $checkResult = $this->validate($params, "UserLookShopValidate.getLookShopList");
@@ -200,7 +176,7 @@ class LookShop extends Basic
         $pageNo        = empty($params['pageNo']) ? 1 : $params['pageNo'];
         $pageSize      = empty($params['pageSize']) ? 15 : $params['pageSize'];
         $s_look_Shop = new LookShopService();
-        $result = $s_look_Shop->getLookShopListV2($params,$pageNo, $pageSize);
+        $result = $s_look_Shop->getShopUserVisitLog($params,$pageNo, $pageSize);
         if($result){
             return $this->response("200", "success", $result);
         }else{

application/api_broker/controller/Shop.php

@@ -1356,14 +1356,11 @@ class Shop extends Basic
         if (!isset($params["house_id"])) {
             return $this->response("101", "请求参数错误");
         }
-        //t_look_shop_user
         $lookShopUserModel  = new TLookShopUser();
         $where_["house_id"] = $params["house_id"];
-        // $where_["source"] = 0;
 
         $logArr = $lookShopUserModel->getLogList($where_, "id,user_id,type,house_id,create_time as look_day", $pageNo, $pageSize);
         return $this->response("200", "success", $logArr);
-
     }
 
     /**

application/api_broker/service/LookShopService.php

@@ -237,26 +237,6 @@ class LookShopService
     }
 
 
-    /**
-     * 客户浏览记录
-     * @param $conditions
-     * @param $field
-     * @param $pageNo
-     * @param $pageSize
-     * @return bool
-     */
-    // public function getLookShopList($conditions,$field,$pageNo, $pageSize)
-    // {
-    //     $m_look_shop = new TLookShopUser();
-    //     $list = $m_look_shop->getLookShopList($conditions, $field, $pageNo, $pageSize);
-    //     if (!$list) {
-    //         return false;
-    //     }
-    //     // $count = $m_look_shop->getLookShopListCount($conditions,$field);
-    //     // $result["list"] = $list;
-    //     // $result["total"] = $count;
-    //     return $list;
-    // }
 
     /**
      * 客户浏览记录
@@ -265,7 +245,7 @@ class LookShopService
      * @param $pageSize
      * @return bool|false|\PDOStatement|string|\think\Collection
      */
-    public function getLookShopListV2($conditions,$pageNo, $pageSize)
+    public function getShopUserVisitLog($conditions,$pageNo, $pageSize)
     {
         $m_look_shop = new TLookShopUser();
         $field = 'a.type,a.user_id,a.create_time,a.source,b.buyer_nick,b.buyer_img,c.id';
@@ -284,6 +264,7 @@ class LookShopService
             }else{
                 $list[$k]['user_id'] = $v['id'];
             }
+            unset($list[$k]['id']);
         }
         return $list;
     }

application/index/service/AmercementService.php

@@ -327,7 +327,7 @@ class AmercementService
                 //2转已支付
                 $this->consummationAmercement($id,$operation_id);
         }
-        return ['code'=>101,'msg'=>'成功'];
+        return ['code'=>200,'msg'=>'成功'];
     }
 
     /**

application/route.php

@@ -942,7 +942,7 @@ Route::group('broker', [
     'getAgentsResidueNumList'   => ['api_broker/LookShop/getAgentsResidueNumList', ['method' => 'get']], //经纪人列表
     'getAgentsResidueNumListV2' => ['api_broker/LookShop/getAgentsResidueNumListV2', ['method' => 'get']], //经纪人列表
     'setAgentLookNum'           => ['api_broker/LookShop/setAgentLookNum', ['method' => 'post']], //设置经纪人的看铺数量
-    'getLookShopList'           => ['api_broker/LookShop/getLookShopListV2', ['method' => 'POST|GET']], //设置经纪人的看铺数量
+    'getShopUserVisitLog'       => ['api_broker/LookShop/getShopUserVisitLog', ['method' => 'POST|GET']], //设置经纪人的看铺数量
     'getShopLookList'           => ['api_broker/LookShop/getShopLookList', ['method' => 'POST|GET']], //设置经纪人的看铺数量
 
     //首页跟进记录