Merge branch 'develop' of http://git.ycjcjy.com/marketing/services into develop

src/main/java/com/yunzhi/marketing/controller/TaBuildingController.java

@@ -298,6 +298,7 @@ public class TaBuildingController extends BaseController {
             @RequestParam(required = false) String buildingArea,    // 区域
             @RequestParam(required = false) String brandId,    // 品牌开发商
             @RequestParam(required = false) Boolean isRecentOpening,    // 是否近期开盘
+            @RequestParam(required = false) String marketStatus,    // 是否近期开盘
             @RequestParam(required = false) String orderBy,    // 排序字段
 //            @RequestParam(required = false) Integer minPrice, // 最低价格
 //            @RequestParam(required = false) Integer maxPrice, // 最高价格
@@ -337,6 +338,7 @@ public class TaBuildingController extends BaseController {
                 buildingArea,
                 brandId,
                 isRecentOpening,
+                marketStatus,
                 orderBy);
     }
 

src/main/java/com/yunzhi/marketing/mapper/TaBuildingMapper.java

@@ -84,6 +84,7 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
                                          @Param("buildingArea") String buildingArea,
                                          @Param("brandId") String brandId,
                                          @Param("isRecentOpening") Boolean isRecentOpening,
+                                         @Param("marketStatus") String marketStatus,
                                          @Param("orderBy") String orderBy);
 
     /**

src/main/java/com/yunzhi/marketing/service/ITaBuildingService.java

@@ -134,6 +134,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
             String buildingArea,
             String brandId,
             Boolean isRecentOpening,
+            String marketStatus,
             String orderBy);
 
     /**

src/main/java/com/yunzhi/marketing/service/impl/TaBuildingServiceImpl.java

@@ -863,6 +863,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             String buildingArea,
             String brandId,
             Boolean isRecentOpening,
+            String marketStatus,
             String orderBy) {
         IPage<TaBuilding> page = new Page<>(pageNum, pageSize);
 
@@ -915,6 +916,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
                 buildingArea,
                 brandId,
                 isRecentOpening,
+                marketStatus,
                 orderBy);
 
         List<TaBuilding> buildingList = result.getRecords();

src/main/java/com/yunzhi/marketing/service/impl/TaRecommendCustomerServiceImpl.java

@@ -712,7 +712,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
         TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
         taRecommendCustomer.setOrgId(orgId);
-        taRecommendCustomer.setName(taPerson.getNickname());
+        taRecommendCustomer.setName(StringUtils.ifNull(params.getString("name"), taPerson.getNickname()));
         taRecommendCustomer.setPicture(taPerson.getAvatarurl());
         taRecommendCustomer.setPhone(params.getString("phone"));
         taRecommendCustomer.setSex(null == taPerson.getGender() ? null : ("1".equals(taPerson.getGender()) ? 1 : 2));

src/main/resources/mapper/TaBuildingMapper.xml

@@ -120,6 +120,9 @@
                 <if test="isRecentOpening != null and isRecentOpening">
                     AND is_recent_opening = 1
                 </if>
+                <if test="marketStatus != null and marketStatus != ''">
+                    AND market_status = #{marketStatus}
+                </if>
                 <if test="targets != null and targets.size > 0">
                     AND building_id IN
                     <foreach collection="targets" item="buildingId" open="(" close=")" separator=",">