bug 修复

house-biz/src/main/java/com/ljq/house/biz/dao/TmAgencyUserRelationDao.java

@@ -31,6 +31,8 @@ public interface TmAgencyUserRelationDao extends BaseMapper<TmAgencyUserRelation
 
     public TmAgencyUserRelation getAgencyUserDetail2(@Param("id")Long id);
 
+    public TmAgencyUserRelation getAgencyUserDetail3(@Param("id")String id);
+
 
     public int countRelationUser(@Param("agencyUserId")String agencyUserId);
 }

house-biz/src/main/java/com/ljq/house/biz/model/TmHouse.java

@@ -262,4 +262,9 @@ public class TmHouse extends BaseEntity implements Serializable {
     @JsonProperty("IS_SHOW")
     private String isShow;
 
+    @ApiModelProperty(value = "邮编", name = "IS_SHOW", example = "1")
+    @JsonProperty("postcode")
+    private String postcode;
+
+
 }

house-biz/src/main/java/com/ljq/house/biz/vo/request/OpenApiRequestVo.java

@@ -20,4 +20,5 @@ public class OpenApiRequestVo {
     private String sceneNum;
     private String link;
     private LocalDateTime time;
+    private String houseId;
 }

house-biz/src/main/resources/mapper/TmAgencyUserRelationMapper.xml

@@ -135,6 +135,17 @@
         limit 1
     </select>
 
+    <select id="getAgencyUserDetail3" resultType="com.ljq.house.biz.model.TmAgencyUserRelation">
+        select * from tm_agency_user_relation
+        <where>
+            is_valid = 1
+            <if test="id != null and id != '' ">
+                and id = #{id}
+            </if>
+        </where>
+        limit 1
+    </select>
+
     <select id="countRelationUser" resultType="java.lang.Integer">
         select count(*) from tm_agency_user_relation
         <where>

house-common/src/main/java/com/ljq/house/common/service/HouseHelperService.java

@@ -281,6 +281,10 @@ public class HouseHelperService {
             result.put("introduceVideo",tmHouse.getIntroduceVideo());
             result.put("videoCoverImage",tmHouse.getVideoCoverImage());
 
+            //2021.7.15 增加
+            result.put("postcode",tmHouse.getPostcode());
+
+
         }
 
         if(null != tmEstate){

house-web/src/main/java/com/ljq/house/admin/controller/AdminTmHouseController.java

@@ -420,7 +420,7 @@ public class AdminTmHouseController {
             constantQuery.put("house.estate_name", estateName);
         }
 
-        DataUtils.assembleTimeQueryWrapper(constantQuery, queryName, houseQueryWrapper, "", "house.title", "relation.name");
+        DataUtils.assembleTimeQueryWrapper(constantQuery, queryName, houseQueryWrapper, "", "house.title", "house.property_number");
 
         houseQueryWrapper.orderByDesc("house.create_time");
 

house-web/src/main/java/com/ljq/house/app/controller/AppAgencyController.java

@@ -213,13 +213,27 @@ public class AppAgencyController {
     @ApiImplicitParams({
     @ApiImplicitParam(name = "agency_user_id", value = "经纪人唯一标识ID(32位)", paramType = "query", required = true, dataType = "String"),
     @ApiImplicitParam(name = "user_id", value = "客源用户唯一标识ID(32位)", paramType = "query", required = true, dataType = "String")})
-    @RequestMapping(value = "/customer/detail", method = RequestMethod.GET)
+    @RequestMapping(value = "/customer/detailxc", method = RequestMethod.GET)
     @ResponseBody
     public Result getAgencyCustomer(TmAgencyUserRelation tmAgencyUserRelation) {
+        //传客户名片ID
         TmAgencyUserRelation agencyUserRelation = agencyUserRelationDao.getAgencyUserDetail2(tmAgencyUserRelation.getId());
         return Result.success(agencyUserRelation);
     }
 
+    @ApiOperation(value = "根据经纪人ID和客源ID拉取客源详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "agency_user_id", value = "经纪人唯一标识ID(32位)", paramType = "query", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "user_id", value = "客源用户唯一标识ID(32位)", paramType = "query", required = true, dataType = "String")})
+    @RequestMapping(value = "/customer/detail", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getAgencyCustomer(HttpServletRequest req) {
+        String agencyUserId = req.getParameter("agency_user_id");
+        String userId = req.getParameter("user_id");
+        TmAgencyUserRelation agencyUserRelation = agencyUserRelationDao.getAgencyUserDetail(agencyUserId.trim(), userId.trim());
+        return Result.success(agencyUserRelation);
+    }
+
 
     @ApiOperation(value = "经纪人添加客源")
     @RequestMapping(value = "/add/customer", method = RequestMethod.POST)

house-web/src/main/java/com/ljq/house/app/controller/AppTmHouseController.java

@@ -136,9 +136,9 @@ public class AppTmHouseController {
     @RequestMapping(value = "/getByScene", method = RequestMethod.GET)
     @ResponseBody
     public Result getHouseByScene(HttpServletRequest req) {
-        String sceneCode = req.getParameter("scene_code");
+        String houseId = req.getParameter("house_id");
         QueryWrapper<TmHouse> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("scene_num", sceneCode);
+        queryWrapper.eq("house_id", houseId);
         queryWrapper.last("limit 1");
         TmHouse tmHouse = tmHouseDao.selectOne(queryWrapper);
         if(null != tmHouse && 1 != tmHouse.getEnable()){
@@ -357,13 +357,22 @@ public class AppTmHouseController {
     @RequestMapping(value = "/recommend", method = RequestMethod.GET)
     @ResponseBody
     public Result getRecomandHouse(HttpServletRequest req) {
-        //TODO:这里是写死的推荐房源，只拉取10个
-        QueryWrapper<TmHouse> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("enable" , 1);
-        queryWrapper.last("limit 10");
-        queryWrapper.orderByDesc("create_time");
-        List<TmHouse> houseList = tmHouseDao.selectList(queryWrapper);
-        return Result.success(houseList);
+
+        String agency_user_id =  req.getParameter("req");
+        //TODO:这里是写死的推荐房源，只拉取5个
+//        QueryWrapper<TmHouse> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("enable" , 1);
+//        queryWrapper.last("limit 10");
+//        queryWrapper.orderByDesc("create_time");
+//        List<TmHouse> houseList = tmHouseDao.selectList(queryWrapper);
+
+        IPage<TmHouse> page = new Page<>(0, 5);
+        QueryWrapper<TmHouse> recHouseQueryWrapper = new QueryWrapper<>();
+        recHouseQueryWrapper.eq("relation.agency_user_id" , agency_user_id);
+//        recHouseQueryWrapper.ne("relation.house_id" , tmHouse.getHouseId());
+        page = tmHouseDao.selectAgencyHouseList(page, recHouseQueryWrapper);
+
+        return Result.success(page.getRecords());
     }
 
     private void assembleTmHouse(HttpServletRequest request, QueryWrapper<TmHouse> queryWrapper, String city, String district) {

house-web/src/main/java/com/ljq/house/controller/OpenApiNotifyController.java

@@ -82,6 +82,7 @@ public class OpenApiNotifyController {
             }
             QueryWrapper<TmHouse> houseQueryWrapper = new QueryWrapper<>();
             houseQueryWrapper.eq("scene_num" , openApiRequestVo.getSceneNum());
+            houseQueryWrapper.eq("house_id" , openApiRequestVo.getHouseId());
             houseQueryWrapper.last("limit 1");
             TmHouse tmHouse = tmHouseDao.selectOne(houseQueryWrapper);
             if(null == tmHouse){