Merge branch 'v3' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3

pom.xml

@@ -10,8 +10,8 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v0.3.2</version>
-	<name>estateagents</name>
+	<version>v2.5.1</version>
+	<name>estateages</name>
 	<description>置业经纪人</description>
 
 	<properties>

src/main/java/com/huiju/estateagents/controller/TaBuildingController.java

@@ -4,6 +4,7 @@ package com.huiju.estateagents.controller;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.service.ITaBuildingService;
@@ -20,6 +21,7 @@ import com.huiju.estateagents.base.BaseController;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -189,12 +191,14 @@ public class TaBuildingController extends BaseController {
             @RequestParam(defaultValue = "false") Boolean mine,
             @RequestParam(required = false) Integer cityId,
             @RequestParam(required = false) String name,
+            @RequestParam(required = false) String buildingType, // 项目类型Id
             @RequestParam(required = false) String houseType, // 户型
-            @RequestParam(required = false) Integer buildingTypeId, // 项目类型Id
-            @RequestParam(required = false) Integer minPrice, // 最低价格
-            @RequestParam(required = false) Integer maxPrice, // 最高价格
-            @RequestParam(required = false) Double minBuildingArea, // 最小面积
-            @RequestParam(required = false) Double maxBuildingArea, // 最大面积
+            @RequestParam(required = false) String price,   // 价格
+            @RequestParam(required = false) String area,    // 面积
+//            @RequestParam(required = false) Integer minPrice, // 最低价格
+//            @RequestParam(required = false) Integer maxPrice, // 最高价格
+//            @RequestParam(required = false) Double minBuildingArea, // 最小面积
+//            @RequestParam(required = false) Double maxBuildingArea, // 最大面积
             HttpServletRequest request
     ){
         List<String> targets = null;
@@ -208,9 +212,36 @@ public class TaBuildingController extends BaseController {
             targets = iTaSaveService.getTargesOfPerson(persons.get(0).getPersonId(), CommConstant.FAVOR_PROJECT);
         }
 
-        return taBuildingService.getWxBuildingList(pageNum, pageSize, name, targets, cityId,mine, houseType, buildingTypeId, minPrice, maxPrice, minBuildingArea, maxBuildingArea);
+        String[] buildingTypeList = !StringUtils.isEmpty(buildingType) ? buildingType.split(",") : null;
+        String[] houseTypeList = !StringUtils.isEmpty(houseType) ? houseType.split(",") : null;
+        List<String[]> priceList = getParamListOf(price);
+        List<String[]> areaList = getParamListOf(area);
+
+        return taBuildingService.getWxBuildingList(pageNum, pageSize, name, targets, cityId,mine, houseTypeList, buildingTypeList, priceList, areaList);
     }
 
+
+    /**
+     * 先按照 逗号 拆分, 再按照 横线 拆分
+     * @param params
+     * @return
+     */
+    private List<String[]> getParamListOf(String params) {
+        List<String[]> paramList = new ArrayList<>();
+
+        if (null == params || "".equals(params.trim())) {
+            return paramList;
+        }
+
+        String[] paramsArray = params.split(",");
+        for(String param : paramsArray) {
+            paramList.add(param.split("-"));
+        }
+
+        return paramList;
+    }
+
+
     /**
      * 微信推荐楼盘列表
      * @return

src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java

@@ -99,7 +99,7 @@ public class TaRecommendCustomerController extends BaseController {
     }
 
     /**
-     * 推荐客户
+     * 报备客户
      * @param paramStr
      * @param request
      * @return

src/main/java/com/huiju/estateagents/controller/TaSaveController.java

@@ -12,7 +12,7 @@ import javax.servlet.http.HttpServletRequest;
 
 /**
  * <p>
- * 收藏表  前端控制器
+ * 表  前端控制器
  * </p>
  *
  * @author jobob

src/main/java/com/huiju/estateagents/entity/TaPerson.java

@@ -228,6 +228,10 @@ public class TaPerson implements Serializable {
 
     private String fromCode;
 
+    private Integer userId;
+
+    private String userPort;
+
     @TableField(exist = false)
     private Integer isSave;
 }

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -23,6 +23,7 @@ public class AccessInterceptor implements HandlerInterceptor {
     private String[] whiteList = {
             "/wx/chat", // 聊天暂时不鉴权
             "/api/wx/login",
+            "/api/wx/tdCity",
             "/api/admin/signin",
             "/api/taCheckin/activity",
             "/api/wx/qrcode/scene",

src/main/java/com/huiju/estateagents/mapper/TaBuildingMapper.java

@@ -62,13 +62,19 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
      * @param name
      * @param cityId
      * @param targets
-     * @param houseType
-     * @param buildingTypeId
+     * @param houseTypeList
+     * @param buildingTypeList
+     * @param priceList
+     * @param areaList
      * @return
      */
-    IPage<TaBuilding> selectBuildingPage(IPage<TaBuilding> page, @Param("name") String name, @Param("cityId") Integer cityId,
-                                         @Param("targets") List<String> targets, @Param("houseType") String houseType, @Param("buildingTypeId") Integer buildingTypeId,
-                                         @Param("minPrice") Integer minPrice, @Param("maxPrice") Integer maxPrice,
-                                         @Param("minBuildingArea") Double minBuildingArea, @Param("maxBuildingArea") Double maxBuildingArea);
+    IPage<TaBuilding> selectBuildingPage(IPage<TaBuilding> page,
+                                         @Param("name") String name,
+                                         @Param("cityId") Integer cityId,
+                                         @Param("targets") List<String> targets,
+                                         @Param("houseTypeList") String[] houseTypeList,
+                                         @Param("buildingTypeList") String[] buildingTypeList,
+                                         @Param("priceList") List<String[]> priceList,
+                                         @Param("areaList") List<String[]> areaList);
 
 }

src/main/java/com/huiju/estateagents/service/ITaBuildingService.java

@@ -117,7 +117,16 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @param pageSize
      * @param name
      */
-    ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name, List<String> targets,Integer cityId,boolean mine, String houseType, Integer buildingTypeId, Integer minPrice, Integer maxPrice, Double minBuildingArea, Double maxBuildingArea);
+    ResponseBean getWxBuildingList(
+            Integer pageNum,
+            Integer pageSize,
+            String name,
+            List<String> targets,
+            Integer cityId,boolean mine,
+            String[] houseTypeList,
+            String[] buildingTypeList,
+            List<String[]> priceList,
+            List<String[]> areaList);
 
     /**
      * 微信小程序 楼盘列表

src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

@@ -381,9 +381,23 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name, List<String> targets,Integer cityId,boolean mine, String houseType, Integer buildingTypeId, Integer minPrice, Integer maxPrice, Double minBuildingArea, Double maxBuildingArea) {
+    public ResponseBean getWxBuildingList(
+            Integer pageNum,
+            Integer pageSize,
+            String name,
+            List<String> targets,
+            Integer cityId,
+            boolean mine,
+            String[] houseTypeList,
+            String[] buildingTypeList,
+            List<String[]> priceList,
+            List<String[]> areaList) {
         IPage<TaBuilding> page = new Page<>(pageNum, pageSize);
 
+        if(CollectionUtils.isEmpty(targets) && mine){
+            return ResponseBean.success(page);
+        }
+
 //        QueryWrapper<TaBuilding> buildingQueryWrapper = new QueryWrapper<>();
 //        buildingQueryWrapper.nested(null != name && !"".equals(name.trim()), i -> i.like("name", name).or().like("building_name", name));
 //        buildingQueryWrapper.eq("status", 1);
@@ -395,7 +409,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 //
 //        IPage<TaBuilding> result = taBuildingMapper.selectPage(page, buildingQueryWrapper);
 
-        IPage<TaBuilding> result = taBuildingMapper.selectBuildingPage(page, name, cityId, targets, houseType,buildingTypeId, minPrice, maxPrice, minBuildingArea, maxBuildingArea);
+        IPage<TaBuilding> result = taBuildingMapper.selectBuildingPage(page, name, cityId, targets, houseTypeList, buildingTypeList, priceList, areaList);
 
         List<TaBuilding> buildingList = result.getRecords();
         if (CollectionUtils.isNotEmpty(buildingList)) {
@@ -403,14 +417,8 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
                 getBuildingAttaches(build);
             }
         }
-        if(CollectionUtils.isEmpty(targets) && mine){
-            return ResponseBean.success(null);
-        }else {
-            return ResponseBean.success(result);
-        }
-
-
 
+        return ResponseBean.success(result);
     }
 
     private void getBuildingAttaches(TaBuilding build) {

src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java

@@ -229,44 +229,46 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         }
         TaPerson taPerson = taPersons.get(0);
 
-        String checkResult = checkCustomerParams(params);
-        if (null != checkResult) {
-            return ResponseBean.error(checkResult, ResponseBean.ERROR_MISSING_PARAMS);
-        }
+//        String checkResult = checkCustomerParams(params);
+//        if (null != checkResult) {
+//            return ResponseBean.error(checkResult, ResponseBean.ERROR_MISSING_PARAMS);
+//        }
 
         TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
 
-        taRecommendCustomer.setName(params.getString("name"));
-        taRecommendCustomer.setPicture(params.getString("picture"));
+        taRecommendCustomer.setName(taPerson.getNickname());
+        taRecommendCustomer.setPicture(taPerson.getAvatarurl());
         taRecommendCustomer.setPhone(params.getString("phone"));
-        taRecommendCustomer.setSex(params.getInteger("sex"));
-        taRecommendCustomer.setDescribe(params.getString("describe"));
-        taRecommendCustomer.setRealtyConsultant(params.getString("RealtyConsultant"));
+        taRecommendCustomer.setSex(null == taPerson.getGender() ? null : ("1".equals(taPerson.getGender()) ? 1 : 2));
+//        taRecommendCustomer.setDescribe(params.getString("describe"));
+        taRecommendCustomer.setRealtyConsultant(params.getString("realtyConsultant"));
         taRecommendCustomer.setBuildingId(params.getString("buildingId"));
         taRecommendCustomer.setReportRecommendStatus(CommConstant.REPORTED);
         taRecommendCustomer.setCreateDate(LocalDateTime.now());
         taRecommendCustomer.setReportDate(LocalDateTime.now());
 
         // 时间格式 yyyy-MM-dd
-        String at = params.getString("appointmentTime");
-        if (!StringUtils.isEmpty(at)) {
-            taRecommendCustomer.setAppointmentTime(DateUtils.day2LocalDateime(at));
-        }
+//        String at = params.getString("appointmentTime");
+//        if (!StringUtils.isEmpty(at)) {
+//            taRecommendCustomer.setAppointmentTime(DateUtils.day2LocalDateime(at));
+//        }ni
 
 //        taRecommendCustomer.setAppointmentTime((String) params.get("appointmentTime"));
-        taRecommendCustomer.setVisiteNum(params.getInteger("visiteNum"));
-        taRecommendCustomer.setIntention(params.getString("intention"));
-        taRecommendCustomer.setRealtyManageType(params.getString("realtyManageType"));
-        taRecommendCustomer.setDemandType(params.getString("demandType"));
-        taRecommendCustomer.setPriceRange(params.getString("priceRange"));
-        taRecommendCustomer.setEntryType(CommConstant.ENTRY_INPUT);
+//        taRecommendCustomer.setVisiteNum(params.getInteger("visiteNum"));
+//        taRecommendCustomer.setIntention(params.getString("intention"));
+//        taRecommendCustomer.setRealtyManageType(params.getString("realtyManageType"));
+//        taRecommendCustomer.setDemandType(params.getString("demandType"));
+//        taRecommendCustomer.setPriceRange(params.getString("priceRange"));
+        taRecommendCustomer.setEntryType(CommConstant.ENTRY_VERIFY);
         taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+        taRecommendCustomer.setStatus(CommConstant.STATUS_NORMAL + "");
 
 
-        String status = params.getString("status");
-        if (null == status) status = "1";
-        taRecommendCustomer.setStatus(status);
-        taRecommendCustomer.setRecommendPerson(taPerson.getPersonId());
+//        String status = params.getString("status");
+//        if (null == status) status = "1";
+//        taRecommendCustomer.setStatus(status);
+//        taRecommendCustomer.setRecommendPerson(taPerson.getPersonId());
+        taRecommendCustomer.setRecommendPerson(params.getString("realtyConsultant"));
 
         // 报备有 10 天有效期
         QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();

src/main/resources/mapper/TaBuildingMapper.xml

@@ -89,11 +89,11 @@
                 <if test="cityId != null">
                     AND city_id = #{cityId}
                 </if>
-                <if test="buildingTypeId != null">
-                    AND building_type = #{buildingTypeId}
-                </if>
-                <if test="targets != null">
-                    AND building_id IN (#{targets})
+                <if test="targets != null and targets.size > 0">
+                    AND building_id IN
+                    <foreach collection="targets" item="buildingId" open="(" close=")" separator=",">
+                        #{buildingId}
+                    </foreach>
                 </if>
                 <if test="name != null and name !=''">
                     AND `name` LIKE CONCAT('%',#{name},'%')
@@ -101,22 +101,33 @@
                 </if>
             ) as tb
 
-            <if test="minPrice != null or maxPrice != null or buildingTypeId != null">
+            <if test="(priceList != null and priceList.size > 0) or (buildingTypeList != null and buildingTypeList.length > 0)">
                 INNER JOIN
                 (
                 SELECT * FROM ta_building_project_type
                 <trim prefix="where" prefixOverrides="and | or">
-                    <if test="minPrice != null and maxPrice != null">
-                        and price BETWEEN #{minPrice} AND #{maxPrice}
-                    </if>
-                    <if test="minPrice != null and maxPrice == null">
-                        <![CDATA[  and price >= #{minPrice}  ]]>
-                    </if>
-                    <if test="minPrice == null and maxPrice != null">
-                        <![CDATA[  and price <= #{maxPrice}  ]]>
+
+                    <if test="priceList != null">
+                        <foreach collection="priceList" item="priceArr" open="(" close=")" separator=" OR ">
+                            (
+                                <if test='priceArr[0] != null and priceArr[0] != ""'>
+                                    <![CDATA[ price >= ${priceArr[0]}  ]]>
+                                </if>
+                                <if test='priceArr.length > 1 and priceArr[0] != null and priceArr[0] != ""'>
+                                    AND
+                                </if>
+                                <if test='priceArr.length > 1 and priceArr[1] != null and priceArr[1] != ""'>
+                                    <![CDATA[ price <= ${priceArr[1]}  ]]>
+                                </if>
+                            )
+                        </foreach>
                     </if>
-                    <if test="buildingTypeId != null">
-                        AND building_type_id = #{buildingTypeId}
+
+                    <if test="buildingTypeList != null and buildingTypeList.length > 0">
+                        AND building_type_id in
+                        <foreach collection="buildingTypeList" item="buildingType" open="(" close=")" separator=",">
+                            #{buildingType}
+                        </foreach>
                     </if>
                 </trim>
                 GROUP BY building_id
@@ -124,16 +135,32 @@
                 AS tbpt ON tb.building_id = tbpt.building_id
             </if>
 
-            <if test="minBuildingArea != null or maxBuildingArea != null or (houseType != null and houseType != '')">
+            <if test="(areaList != null and areaList.size > 0) or (houseTypeList != null and houseTypeList.length > 0)">
                 INNER JOIN
                 (
                 SELECT * FROM ta_building_apartment
                 <trim prefix="where" prefixOverrides="and | or">
-                    <if test="minBuildingArea != null and maxBuildingArea != null">
-                        and building_area BETWEEN #{minBuildingArea} AND #{maxBuildingArea}
+                    <if test="areaList != null">
+                        <foreach collection="areaList" item="areaArr" open="(" close=")" separator=" OR ">
+                            (
+                                <if test='areaArr[0] != null and areaArr[0] != ""'>
+                                    <![CDATA[ building_area >= ${areaArr[0]}  ]]>
+                                </if>
+                                <if test='areaArr.length > 1 and areaArr[0] != null and areaArr[0] != ""'>
+                                    AND
+                                </if>
+                                <if test='areaArr.length > 1 and areaArr[1] != null and areaArr[1] != ""'>
+                                    <![CDATA[ building_area <= ${areaArr[1]}  ]]>
+                                </if>
+                            )
+                        </foreach>
                     </if>
-                    <if test="houseType != null and houseType != ''">
-                        AND house_type = #{houseType}
+
+                    <if test="houseTypeList != null and houseTypeList.length > 0">
+                        AND house_type in
+                        <foreach collection="houseTypeList" item="houseType" open="(" close=")" separator=",">
+                            #{houseType}
+                        </foreach>
                     </if>
                 </trim>
                 GROUP BY building_id