feats

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.yunzhi</groupId>
 	<artifactId>marketing</artifactId>
-	<version>v1.0.16</version>
+	<version>v1.0.19</version>
 	<name>marketing-cloud</name>
 	<description>新联康营销云</description>
 

src/main/java/com/yunzhi/marketing/Application.java

@@ -5,9 +5,18 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 
+import javax.annotation.PostConstruct;
+import java.util.TimeZone;
+
 @SpringBootApplication
 public class Application {
 
+	@PostConstruct
+	void started() {
+		TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai"));
+
+	}
+
 	public static void main(String[] args) {
 		SpringApplication springApplication = new SpringApplication(Application.class);
 		ConfigurableApplicationContext configurableApplicationContext = springApplication.run(args);

src/main/java/com/yunzhi/marketing/center/taUser/entity/TaUserVO.java

@@ -289,4 +289,10 @@ public class TaUserVO implements Serializable {
      */
     @TableField(exist = false)
     private String bossDisplay;
+
+    /**
+     * ta_user 的 userId
+     */
+    @TableField(exist = false)
+    private Integer realUserId;
 }

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

@@ -97,9 +97,15 @@ public class TaChannelController extends BaseController {
         Integer orgId = getOrgId(request);
 
         try {
+            String institutionCode = null;
+            if (!StringUtils.isEmpty(institutionId)){
+                Institution institution = iInstitutionService.getById(institutionId);
+                institutionCode = institution.getInstitutionCode();
+            }
+
             //使用分页插件
 		    IPage<TaChannel> pg = new Page<>(pageNum, pageSize);
-            IPage<TaChannel> result = taChannelMapper.pageTaChannel(pg,orgId,channelId,getInstitutionIds(request),institutionId);
+            IPage<TaChannel> result = taChannelMapper.pageTaChannel(pg,orgId,channelId,getInstitutionIds(request),institutionCode);
             List<TaChannel> recommendCount = taChannelMapper.recommendCount(orgId, channelId, getInstitutionIds(request));
 
             result.getRecords().stream().forEach(e -> {

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

@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -180,6 +181,8 @@ public class TaLiveActivityController extends BaseController {
                 taLiveActivity.setLiveAppPath(taLiveActivity.getLiveRoomParam().replace(".html", ""));
             }
 
+            taLiveActivity.setUpdateDate(LocalDateTime.now());
+            taLiveActivity.setUpdateUser(getUserId(request).toString());
             if (iTaLiveActivityService.updateById(taLiveActivity)) {
                 responseBean.addSuccess(taLiveActivity);
             } else {
@@ -209,6 +212,8 @@ public class TaLiveActivityController extends BaseController {
             }else if (CommConstant.IS_PUBLISH.equals(taLiveActivity.getStatus())) {
                 taLiveActivity.setStatus(CommConstant.NOT_PUBLISH);
             }
+            taLiveActivity.setUpdateDate(LocalDateTime.now());
+            taLiveActivity.setUpdateUser(getUserId(request).toString());
             iTaLiveActivityService.updateById(taLiveActivity);
             responseBean.addSuccess(taLiveActivity);
         } catch (Exception e) {

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

@@ -44,7 +44,7 @@ public interface TaChannelMapper extends BaseMapper<TaChannel> {
      * @param pg
      * @return
      */
-    IPage<TaChannel> pageTaChannel(IPage<TaChannel> pg,@Param("orgId")Integer orgId,@Param("channelId")Integer channelId,@Param("institutionIds") List<String> institutionIds,@Param("institutionId") String institutionId);
+    IPage<TaChannel> pageTaChannel(IPage<TaChannel> pg,@Param("orgId")Integer orgId,@Param("channelId")Integer channelId,@Param("institutionIds") List<String> institutionIds,@Param("institutionCode") String institutionCode);
 
     List<TaChannel> recommendCount(@Param("orgId")Integer orgId,@Param("channelId")Integer channelId,@Param("institutionIds") List<String> institutionIds);
 

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

@@ -146,21 +146,18 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
         buildingDynamicQueryWrapper.eq("dynamic_id", dynamicId);
         buildingDynamicQueryWrapper.eq("status",1);
-        TaBuildingDynamic tabuildingDynamic = buildingDynamicMapper.selectOne(buildingDynamicQueryWrapper);
-        if (null == tabuildingDynamic){
+        TaBuildingDynamic buildingDynamic = buildingDynamicMapper.selectOne(buildingDynamicQueryWrapper);
+        if (null == buildingDynamic){
             return ResponseBean.error("当前活动已失效", ResponseBean.ERROR_UNAVAILABLE);
         }
         // 当前阅读量加1
-        Integer saveNum = tabuildingDynamic.getPvNum() == null ? 1:tabuildingDynamic.getPvNum()+1;
-        tabuildingDynamic.setPvNum(saveNum);
-        buildingDynamicMapper.updateById(tabuildingDynamic);
-        TaBuildingDynamic buildingDynamic = buildingDynamicMapper.selectOne(buildingDynamicQueryWrapper);
+        buildingDynamicMapper.setFieldNum(dynamicId, "pv_num", 1);
+
         TaPerson taPerson = taPersonMapper.selectByIdPerson(openid);
         if (null == taPerson){
             return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
 
-
         setExtendInfo(buildingDynamic, taPerson);
 
         // 活动已报名人数

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

@@ -440,7 +440,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(building, orgId, null, "update");
         if (!isMainMoreThanTenFlag) {
-            responseBean.addError("当前城市最多只能推荐10个项目至首页哦。");
+            responseBean.addError("当前城市最多只能推荐20个项目至首页哦。");
             return responseBean;
         }
 
@@ -604,7 +604,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(building, orgId, null, "add");
         if (!isMainMoreThanTenFlag) {
-            responseBean.addError("当前城市最多只能推荐10个项目至首页哦。");
+            responseBean.addError("当前城市最多只能推荐20个项目至首页哦。");
             return responseBean;
         }
 
@@ -715,7 +715,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(building, orgId, status, "updateStatus");
         if (!isMainMoreThanTenFlag) {
-            responseBean.addError("当前城市最多只能推荐10个项目至首页哦");
+            responseBean.addError("当前城市最多只能推荐20个项目至首页哦");
             return responseBean;
         }
         building.setStatus(status);
@@ -884,10 +884,10 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         }
         switch (orderBy) {
             case "price-asc":
-                orderBy = "tb.price ASC";
+                orderBy = "IFNULL(tbpt.price_type,\"z\") , ifnull(CONVERT(tbpt.start_price, UNSIGNED INTEGER), 9999999999999)";
                 break;
             case "price-desc":
-                orderBy = "tb.price DESC";
+                orderBy = "tbpt.price_type desc, CONVERT(tbpt.end_price, UNSIGNED INTEGER) DESC";
                 break;
             case "openingDate-asc":
                 orderBy = "tb.opening_date ASC";
@@ -1212,7 +1212,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             taBuildingQueryWrapper.ne("building_id", taBuilding.getBuildingId());
         }
         List<TaBuilding> taBuildings = taBuildingMapper.selectList(taBuildingQueryWrapper);
-        if (taBuildings != null && taBuildings.size() >= 10) {
+        if (taBuildings != null && taBuildings.size() >= 20) {
             return false;
         }
         return true;

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

@@ -130,6 +130,9 @@ public class TaFavorServiceImpl extends ServiceImpl<TaFavorMapper, TaFavor> impl
         if (typeOf.equals("card")) {
             taPersonMapper.setFieldIncrement(taPerson.getPersonId(),"like_num", -1);
         }
+        if (typeOf.equals(CommConstant.FAVOR_CONSULTANT)) {
+            taPersonMapper.setFieldIncrement(like,"like_num", -1);
+        }
 
         // 如果是收藏资讯, 则 - 1
         if (typeOf.equals(CommConstant.FAVOR_NEWS)) {

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

@@ -774,22 +774,6 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             lambdaQueryWrapper.eq(CustomerVisit::getCustomerId,taRecommendCustomer.getCustomerId());
             CustomerVisit customerVisit = customerVisitMapper.selectOne(lambdaQueryWrapper);
             taRecommendCustomerVO.setCustomerVisit(customerVisit);
-        }else if (CommConstant.CUSTOMER_PREPARATORY.equals(taRecommendCustomer.getStatus())) {
-            // 认筹状态
-            LambdaQueryWrapper<CustomerPreparatory> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-            lambdaQueryWrapper.eq(CustomerPreparatory::getCustomerId,taRecommendCustomer.getCustomerId());
-            CustomerPreparatory customerPreparatory = customerPreparatoryMapper.selectOne(lambdaQueryWrapper);
-            taRecommendCustomerVO.setCustomerPreparatory(customerPreparatory);
-        }else if (CommConstant.CUSTOMER_SIGNED.equals(taRecommendCustomer.getStatus())) {
-            // 签约状态
-            LambdaQueryWrapper<CustomerSignatory> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-            lambdaQueryWrapper.eq(CustomerSignatory::getCustomerId,taRecommendCustomer.getCustomerId());
-            List<CustomerSignatory> customerSignatories = customerSignatoryMapper.selectList(lambdaQueryWrapper);
-            customerSignatories.forEach(e -> {
-                TaBuildingApartment taBuildingApartment = taBuildingApartmentMapper.selectById(e.getHouseType());
-                e.setBuildingApartment(taBuildingApartment);
-            });
-            taRecommendCustomerVO.setCustomerSignatory(customerSignatories);
         }
 
         LambdaQueryWrapper<ChannelCustomer> channelCustomerLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -798,6 +782,22 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         if (null != customer) {
             taRecommendCustomerVO.setChannelCustomer(customer);
         }
+        // 认筹状态
+        LambdaQueryWrapper<CustomerPreparatory> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(CustomerPreparatory::getCustomerId,taRecommendCustomer.getCustomerId());
+        CustomerPreparatory customerPreparatory = customerPreparatoryMapper.selectOne(lambdaQueryWrapper);
+        taRecommendCustomerVO.setCustomerPreparatory(customerPreparatory);
+
+        // 签约状态
+        LambdaQueryWrapper<CustomerSignatory> qylambdaQueryWrapper = new LambdaQueryWrapper<>();
+        qylambdaQueryWrapper.eq(CustomerSignatory::getCustomerId,taRecommendCustomer.getCustomerId());
+        List<CustomerSignatory> customerSignatories = customerSignatoryMapper.selectList(qylambdaQueryWrapper);
+        customerSignatories.forEach(e -> {
+            TaBuildingApartment taBuildingApartment = taBuildingApartmentMapper.selectById(e.getHouseType());
+            e.setBuildingApartment(taBuildingApartment);
+        });
+        taRecommendCustomerVO.setCustomerSignatory(customerSignatories);
+
         return ResponseBean.success(taRecommendCustomerVO);
     }
 

src/main/java/com/yunzhi/marketing/xlk/controller/CustomerInfoController.java

@@ -236,7 +236,7 @@ public class CustomerInfoController extends BaseController {
                 customerInfo = new CustomerInfo();
             }
             customerInfo.setName(customer.getName());
-            customerInfo.setSex(customer.getSex());
+//            customerInfo.setSex(customer.getSex());
             customerInfo.setPhone(customer.getPhone());
             customerInfo.setPicture(customer.getPicture());
 
@@ -274,7 +274,7 @@ public class CustomerInfoController extends BaseController {
                 customerInfoVO.setRealtyConsultantPerson(realtyPerson);
                 // 所属楼盘和 用户信息
                 LambdaQueryWrapper<TaPersonBuilding> taPersonBuildingLambdaQueryWrapper = new LambdaQueryWrapper<>();
-                taPersonBuildingLambdaQueryWrapper.eq(TaPersonBuilding::getPersonId,customer.getRealtyConsultant());
+                taPersonBuildingLambdaQueryWrapper.eq(TaPersonBuilding::getPersonId,customer.getRealtyConsultant()).or().eq(TaPersonBuilding::getUserId,realtyPerson.getUserId());
                 List<TaPersonBuilding> list = taPersonBuildingService.list(taPersonBuildingLambdaQueryWrapper);
                 if (list.size() > 0) {
                     TaUser taUser = taUserService.getById(list.get(0).getUserId());

src/main/java/com/yunzhi/marketing/xlk/controller/SearchHouseController.java

@@ -106,7 +106,9 @@ public class SearchHouseController extends BaseController {
      */
     @ApiOperation(value = "wx-保存帮我找房需求", notes = "wx-保存帮我找房需求")
     @RequestMapping(value="/wx/searchHouse",method= RequestMethod.POST)
-    public ResponseBean searchHouseAdd(@RequestBody SearchHouseDTO searchHouseDTO, @RequestHeader("authorization") String token, HttpServletRequest request){
+    public ResponseBean searchHouseAdd(@RequestBody SearchHouseDTO searchHouseDTO,
+                                       @RequestHeader("authorization") String token,
+                                       HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         String openid = getOpenId(request);
         Integer orgId = getOrgId(request);
@@ -114,6 +116,11 @@ public class SearchHouseController extends BaseController {
         if (null == persons || persons.size() == 0) {
             return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);
         }
+
+        if (StringUtils.isEmpty(searchHouseDTO.getMinPrice())) {
+            return ResponseBean.error("请选择预算价格", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
         TaPerson person = persons.get(0);
         try {
             SearchHouse searchHouse = new SearchHouse();
@@ -123,24 +130,16 @@ public class SearchHouseController extends BaseController {
             searchHouse.setStatus("0");
             searchHouse.setCreatedTime(LocalDateTime.now());
             if (iSearchHouseService.save(searchHouse)){
-                SearchHouseVO searchHouseVO = new SearchHouseVO();
-                BeanUtils.copyProperties(searchHouse,searchHouseVO);
-                // 获取价格相近的楼盘
-                LambdaQueryWrapper<TaBuilding> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-                lambdaQueryWrapper.eq(!StringUtils.isEmpty(searchHouseDTO.getIntentArea()),TaBuilding::getBuildingArea,searchHouseDTO.getIntentArea());
-                lambdaQueryWrapper.between(TaBuilding::getPrice,searchHouseDTO.getMinPrice(),searchHouseDTO.getMaxPrice());
-                lambdaQueryWrapper.ne(TaBuilding::getStatus,-1);
-                lambdaQueryWrapper.last(" limit 2");
-                List<TaBuilding> list = taBuildingService.list(lambdaQueryWrapper);
-                if (list.size() < 1){
-                    lambdaQueryWrapper = new LambdaQueryWrapper<>();
-                    lambdaQueryWrapper.eq(!StringUtils.isEmpty(searchHouseDTO.getIntentArea()),TaBuilding::getBuildingArea,searchHouseDTO.getIntentArea());
-                    lambdaQueryWrapper.ne(TaBuilding::getStatus,-1);
-                    lambdaQueryWrapper.last(" limit 2");
-                    list = taBuildingService.list(lambdaQueryWrapper);
+                if (null != searchHouseDTO.getNeedRecommend() && searchHouseDTO.getNeedRecommend()) {
+                    List<TaBuilding> buildingList = iSearchHouseService.getRecommendBuildings(getOrgId(request), searchHouseDTO);
+
+                    SearchHouseVO searchHouseVO = new SearchHouseVO();
+                    BeanUtils.copyProperties(searchHouse,searchHouseVO);
+                    searchHouseVO.setTaBuildingList(buildingList);
+                    responseBean.addSuccess(searchHouseVO);
+                } else {
+                    responseBean.addSuccess(null);
                 }
-                searchHouseVO.setTaBuildingList(list);
-                responseBean.addSuccess(searchHouseVO);
             }else {
                 responseBean.addError("fail");
             }

src/main/java/com/yunzhi/marketing/xlk/dto/SearchHouseDTO.java

@@ -66,4 +66,21 @@ public class SearchHouseDTO implements Serializable {
      */
     private String questionnaire;
 
+    /**
+     * 是否需要智能推荐
+     */
+    @TableField(exist = false)
+    private Boolean needRecommend;
+
+    /**
+     * 当前人员所在城市
+     */
+    @TableField(exist = false)
+    private Integer cityId;
+
+    /**
+     * 当前人员所选的面积
+     */
+    @TableField(exist = false)
+    private Integer areaResultId;
 }

src/main/java/com/yunzhi/marketing/xlk/mapper/SearchHouseMapper.java

@@ -2,11 +2,14 @@ package com.yunzhi.marketing.xlk.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.marketing.entity.TaBuilding;
 import com.yunzhi.marketing.xlk.entity.SearchHouse;
 import com.yunzhi.marketing.xlk.vo.SearchHouseVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 帮我找房  Mapper 接口
@@ -21,4 +24,12 @@ public interface SearchHouseMapper extends BaseMapper<SearchHouse> {
     IPage<SearchHouseVO> selectSearchHouseList(IPage<SearchHouseVO> pg,@Param("params") SearchHouseVO searchHouse);
 
     SearchHouseVO selectSearchHouseDetail(String id);
+
+    List<TaBuilding> getRecommendBuildings(@Param("orgId") Integer orgId,
+                                           @Param("cityId") Integer cityId,
+                                           @Param("areaId") Integer areaId,
+                                           @Param("minPriceW") Integer minPriceW,
+                                           @Param("maxPriceW") Integer maxPriceW,
+                                           @Param("minPrice") Integer minPrice,
+                                           @Param("maxPrice") Integer maxPrice);
 }

src/main/java/com/yunzhi/marketing/xlk/service/ISearchHouseService.java

@@ -3,9 +3,13 @@ package com.yunzhi.marketing.xlk.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.entity.TaBuilding;
+import com.yunzhi.marketing.xlk.dto.SearchHouseDTO;
 import com.yunzhi.marketing.xlk.entity.SearchHouse;
 import com.yunzhi.marketing.xlk.vo.SearchHouseVO;
 
+import java.util.List;
+
 /**
  * <p>
  * 帮我找房  服务类
@@ -26,4 +30,11 @@ public interface ISearchHouseService extends IService<SearchHouse> {
     ResponseBean selectSearchHouseList(IPage<SearchHouseVO> pg, SearchHouseVO searchHouse);
 
     SearchHouseVO selectSearchHouseDetail(String id);
+
+    /**
+     * 推荐楼盘
+     * @param searchHouseDTO
+     * @return
+     */
+    List<TaBuilding> getRecommendBuildings(Integer orgId, SearchHouseDTO searchHouseDTO);
 }

src/main/java/com/yunzhi/marketing/xlk/service/impl/ChannelCustomerServiceImpl.java

@@ -367,7 +367,12 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         }
         customerPreparatory.setOrgId(taRecommendCustomer.getOrgId());
         customerPreparatory.setCustomerId(taRecommendCustomer.getCustomerId());
-        customerPreparatoryMapper.insert(customerPreparatory);
+        if (StringUtils.isEmpty(customerPreparatory.getCustomerPreparatoryId())) {
+            customerPreparatoryMapper.insert(customerPreparatory);
+        }else {
+            customerPreparatoryMapper.updateById(customerPreparatory);
+        }
+
         return ResponseBean.success("审核成功");
     }
 
@@ -406,7 +411,13 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         customerSignatory.setOrgId(taRecommendCustomer.getOrgId());
         customerSignatory.setCreateDate(LocalDateTime.now());
         customerSignatory.setType("commission");
-        customerSignatoryMapper.insert(customerSignatory);
+        customerSignatory.setCustomerId(params.getCustomerId());
+        if (StringUtils.isEmpty(customerSignatory.getCustomerSignatoryId())){
+            customerSignatoryMapper.insert(customerSignatory);
+        }else {
+            customerSignatoryMapper.updateById(customerSignatory);
+        }
+
         return ResponseBean.success("审核成功");
     }
 
@@ -447,7 +458,13 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         }
         customerSignatory.setOrgId(taRecommendCustomer.getOrgId());
         customerSignatory.setType("signatory");
-        customerSignatoryMapper.insert(customerSignatory);
+        customerSignatory.setCustomerId(params.getCustomerId());
+        if (StringUtils.isEmpty(customerSignatory.getCustomerSignatoryId())) {
+            customerSignatoryMapper.insert(customerSignatory);
+        }else {
+            customerSignatoryMapper.updateById(customerSignatory);
+        }
+
         return ResponseBean.success("审核成功");
     }
 

src/main/java/com/yunzhi/marketing/xlk/service/impl/SearchHouseServiceImpl.java

@@ -3,14 +3,22 @@ package com.yunzhi.marketing.xlk.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.entity.TaBuilding;
 import com.yunzhi.marketing.entity.TaCheckin;
+import com.yunzhi.marketing.entity.TdCity;
+import com.yunzhi.marketing.mapper.TdCityMapper;
+import com.yunzhi.marketing.xlk.dto.SearchHouseDTO;
 import com.yunzhi.marketing.xlk.entity.SearchHouse;
 import com.yunzhi.marketing.xlk.mapper.SearchHouseMapper;
 import com.yunzhi.marketing.xlk.service.ISearchHouseService;
 import com.yunzhi.marketing.xlk.vo.SearchHouseVO;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 帮我找房  服务实现类
@@ -25,6 +33,9 @@ public class SearchHouseServiceImpl extends ServiceImpl<SearchHouseMapper, Searc
     @Autowired
     private SearchHouseMapper searchHouseMapper;
 
+    @Autowired
+    private TdCityMapper tdCityMapper;
+
     /**
      * 查询我的找房需求列表
      *
@@ -43,4 +54,103 @@ public class SearchHouseServiceImpl extends ServiceImpl<SearchHouseMapper, Searc
     public SearchHouseVO selectSearchHouseDetail(String id) {
         return searchHouseMapper.selectSearchHouseDetail(id);
     }
+
+    /**
+     * 推荐逻辑如下
+     * 1、先判断区域+价格，如果有符合楼盘，则推荐，如无看2；
+     * 2、判断城市+价格，如过有符合楼盘，则推荐，如无看3；
+     * 3、如选择了“不限城市”，则判断价格，在当前城市内推荐一个符合的。
+     * @param searchHouseDTO
+     * @return
+     */
+    @Override
+    public List<TaBuilding> getRecommendBuildings(Integer orgId, SearchHouseDTO searchHouseDTO) {
+        // 区域
+        String area = searchHouseDTO.getIntentArea();
+        Integer areaId = StringUtils.isEmpty(area) ? null : Integer.valueOf(area);
+        // 区域所属城市
+        Integer areaCity = null;
+        if (null != areaId) {
+            TdCity city = tdCityMapper.selectById(areaId);
+            areaCity = city.getParentid();
+        }
+
+        // 当前城市
+        Integer cityId = searchHouseDTO.getCityId();
+        // 最小总价
+        Integer minPriceW = Integer.parseInt(searchHouseDTO.getMinPrice());
+        // 最大总价
+        Integer maxPriceW = Integer.parseInt(searchHouseDTO.getMaxPrice());
+        // 面积字典
+        Integer areaResultId = searchHouseDTO.getAreaResultId();
+        //
+        Integer[] unitPrice = getUnitPriceRange(minPriceW, maxPriceW, areaResultId);
+        // 最小单价
+        Integer minPrice = unitPrice[0];
+        // 最大单价
+        Integer maxPrice = unitPrice[1];
+
+        if (null != areaId) {
+            // 1、先判断区域+价格
+            List<TaBuilding> lst1 = searchHouseMapper.getRecommendBuildings(orgId, null, areaId, minPriceW, maxPriceW, minPrice, maxPrice);
+            if (null != lst1 && lst1.size() > 0) {
+                return lst1;
+            }
+
+            // 2、判断城市+价格
+            List<TaBuilding> lst2 = searchHouseMapper.getRecommendBuildings(orgId, areaCity, null, minPriceW, maxPriceW, minPrice, maxPrice);
+            if (null != lst2 && lst2.size() > 0) {
+                return lst2;
+            }
+        }
+
+        // 3、当前城市
+        return searchHouseMapper.getRecommendBuildings(orgId, cityId, null, minPriceW, maxPriceW, minPrice, maxPrice);
+    }
+
+    private Integer[] getUnitPriceRange(Integer minPriceW, Integer maxPriceW, Integer areaResultId) {
+        Integer minPrice = minPriceW;
+        Integer maxPrice = maxPriceW;
+
+        // 字典过滤 - 必须与小程序端保持一致
+        switch (areaResultId) {
+            case 1:
+                // 60㎡ 以下, 则按照 30 - 60 处理
+                minPrice = minPrice / 60;
+                maxPrice = maxPrice / 30;
+                break;
+            case 2:
+                // 60 - 90
+                minPrice = minPrice / 90;
+                maxPrice = maxPrice / 60;
+                break;
+            case 3:
+                // 90 - 110
+                minPrice = minPrice / 110;
+                maxPrice = maxPrice / 90;
+                break;
+            case 4:
+                // 110 - 130
+                minPrice = minPrice / 130;
+                maxPrice = maxPrice / 110;
+                break;
+            case 5:
+                // 130 - 150
+                minPrice = minPrice / 150;
+                maxPrice = maxPrice / 130;
+                break;
+            case 6:
+                // 150 - 200
+                minPrice = minPrice / 200;
+                maxPrice = maxPrice / 150;
+                break;
+            default:
+                // 200 以上
+                minPrice = minPrice / 200;
+                maxPrice = maxPrice / 200;
+                break;
+        }
+
+        return new Integer[] {minPrice * 10000, maxPrice * 10000};
+    }
 }

src/main/resources/mapper/TaBuildingMapper.xml

@@ -49,7 +49,7 @@
         SELECT * FROM ta_building
         <where>
             1 =1
-            and status = 1
+            and status != -1
             <if test="Name != null and Name != ''">
                 and  (ta_building.name like concat('%',#{Name,jdbcType=VARCHAR},'%') or ta_building.building_name like concat('%',#{Name,jdbcType=VARCHAR},'%'))
             </if>
@@ -119,7 +119,7 @@
                 </if>
                 <if test="buildingArea != null">
                     AND building_area in
-                    <foreach collection="buildingAreaLisr" item="buildingList" open="(" close=")" separator=" OR ">
+                    <foreach collection="buildingAreaLisr" item="buildingList" open="(" close=")" separator=" , ">
                      #{buildingList}
                     </foreach>
                 </if>
@@ -147,24 +147,22 @@
                 </if>
             ) as tb
 
-            <if test="(priceList != null and priceList.size > 0) or (buildingTypeList != null and buildingTypeList.length > 0)">
-                INNER JOIN
+                left JOIN
                 (
                 SELECT * FROM ta_building_project_type
                 <trim prefix="where" prefixOverrides="and | or">
-
-                    <if test="priceList != null">
+                    <if test="priceList != null and priceList.size > 0">
                         <foreach collection="priceList" item="priceArr" open="(" close=")" separator=" OR ">
                             (
-                                <if test='priceArr[0] != null and priceArr[0] != ""'>
-                                    <![CDATA[ start_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[ start_price <= ${priceArr[1]}  ]]>
-                                </if>
+                            <if test='priceArr[0] != null and priceArr[0] != ""'>
+                                <![CDATA[ start_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[ start_price <= ${priceArr[1]}  ]]>
+                            </if>
                             )  or
                             (
                             <if test='priceArr[0] != null and priceArr[0] != ""'>
@@ -178,10 +176,9 @@
                             </if>
                             )
                         </foreach>
-                    </if>
-
-                    <if test="priceType != null and priceType != ''">
-                        and price_type = #{priceType}
+                        <if test="priceType != null and priceType != ''">
+                            and price_type = #{priceType}
+                        </if>
                     </if>
 
                     <if test="buildingTypeList != null and buildingTypeList.length > 0">
@@ -194,14 +191,13 @@
                 GROUP BY building_id
                 )
                 AS tbpt ON tb.building_id = tbpt.building_id
-            </if>
 
             <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="areaList != null">
+                    <if test="areaList != null and areaList.size > 0">
                         <foreach collection="areaList" item="areaArr" open="(" close=")" separator=" OR ">
                             (
                                 <if test='areaArr[0] != null and areaArr[0] != ""'>
@@ -227,7 +223,45 @@
                 GROUP BY building_id
                 ) as tba ON tb.building_id = tba.building_id
             </if>
-            WHERE tb.org_id = #{orgId}
+        <trim prefix="where" prefixOverrides="and | or">
+            <if test="priceList != null and priceList.size > 0">
+                <foreach collection="priceList" item="priceArr" open="(" close=")" separator=" OR ">
+                    (
+                    <if test='priceArr[0] != null and priceArr[0] != ""'>
+                        <![CDATA[ tbpt.start_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[ tbpt.start_price <= ${priceArr[1]}  ]]>
+                    </if>
+                    )  or
+                    (
+                    <if test='priceArr[0] != null and priceArr[0] != ""'>
+                        <![CDATA[ tbpt.end_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[ tbpt.end_price <= ${priceArr[1]}  ]]>
+                    </if>
+                    )
+                </foreach>
+                <if test="priceType != null and priceType != ''">
+                    and tbpt.price_type = #{priceType}
+                </if>
+            </if>
+
+            and tb.org_id = #{orgId}
+            <if test="buildingTypeList != null and buildingTypeList.length > 0">
+                AND tbpt.building_type_id in
+                <foreach collection="buildingTypeList" item="buildingType" open="(" close=")" separator=",">
+                    #{buildingType}
+                </foreach>
+            </if>
+        </trim>
             ORDER BY ${orderBy}
     </select>
 

src/main/resources/mapper/TaChannelMapper.xml

@@ -32,8 +32,8 @@
             and c.org_id = #{orgId}
             and c.status = 1
 
-            <if test="institutionId != null and institutionId != ''">
-                AND c.institution_id = #{institutionId}
+            <if test="institutionCode != null and institutionCode != ''">
+                AND i.institution_code like CONCAT(#{institutionCode}, '%')
             </if>
             <if test="institutionIds != null and institutionIds.size > 0">
                 AND c.institution_id in

src/main/resources/mapper/TaRaiseRecordMapper.xml

@@ -42,7 +42,7 @@
             AND t.house_locking_status = #{bo.lockingStatus}
         </if>
         <if test="bo.lockingStatus == 'unlocked'">
-            AND (t.house_locking_status = #{bo.lockingStatus} || t.house_locking_status is null)
+            AND (t.house_locking_status = #{bo.lockingStatus} OR t.house_locking_status is null)
         </if>
         <if test="bo.apartmentId != null and bo.apartmentId != ''">
             AND t.apartment_id = #{bo.apartmentId}

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -1020,7 +1020,7 @@ FROM
             null as channel_id,
             p.name as channelName,
             t.create_date,
-            if(v.customer_visit_id is not null || t.`status` = 2 || t.realty_consultant is not null,true,false) as visitStatus
+            if(v.customer_visit_id is not null OR t.`status` = 2 OR t.realty_consultant is not null,true,false) as visitStatus
         FROM
             ta_recommend_customer t
          left JOIN ta_person p ON t.realty_consultant = p.person_id

src/main/resources/mapper/TaShareCountMapper.xml

@@ -18,14 +18,14 @@
         select
 
         case
-        when a.title != null || a.title != '' then a.title
-        when b.title != null || b.title != '' then b.title
-        when c.activity_name != null || c.activity_name != '' then c.activity_name
-        when d.`name` != null || d.name != '' then d.`name`
-        when e.building_name != null || e.building_name != '' then e.building_name
-        when f.news_name != null || f.news_name != '' then f.news_name
-        when g.`name` != null || g.`name` != '' then g.`name`
-        when h.sales_batch_name != null || h.sales_batch_name != '' then h.sales_batch_name
+        when a.title != null or a.title != '' then a.title
+        when b.title != null or b.title != '' then b.title
+        when c.activity_name != null or c.activity_name != '' then c.activity_name
+        when d.`name` != null or d.name != '' then d.`name`
+        when e.building_name != null or e.building_name != '' then e.building_name
+        when f.news_name != null or f.news_name != '' then f.news_name
+        when g.`name` != null or g.`name` != '' then g.`name`
+        when h.sales_batch_name != null or h.sales_batch_name != '' then h.sales_batch_name
         else '空'
         end as shareTitle,t.create_date
         from ta_share_count t
@@ -39,7 +39,7 @@
         left JOIN ta_person g on t.be_share = g.person_id and t.tagert_type = 'consultant'
         where t.person_id = #{personId}
         <if test="shareType != null and shareType != ''">
-            and (t.tagert_type = #{shareType} || t.tagert_type like CONCAT(#{shareType} , '%'))
+            and (t.tagert_type = #{shareType} or t.tagert_type like CONCAT(#{shareType} , '%'))
         </if>
         <if test="shareTitle != null and shareTitle != ''">
             and
@@ -60,14 +60,14 @@
     <select id="selectClickListByParams" resultType="com.yunzhi.marketing.entity.TaShareCount">
         SELECT
             case
-                when g.title != null || g.title != '' then g.title
-                when b.title != null || b.title != '' then b.title
-                when c.activity_name != null || c.activity_name != '' then c.activity_name
-                when d.`name` != null || d.name != '' then d.`name`
-                when e.building_name != null || e.building_name != '' then e.building_name
-                when f.news_name != null || f.news_name != '' then f.news_name
-                when h.sales_batch_name != null || h.sales_batch_name !='' then h.sales_batch_name
-                WHEN y.`name` != NULL || y.`name` != '' THEN y.`name`
+                when g.title != null or g.title != '' then g.title
+                when b.title != null or b.title != '' then b.title
+                when c.activity_name != null or c.activity_name != '' then c.activity_name
+                when d.`name` != null or d.name != '' then d.`name`
+                when e.building_name != null or e.building_name != '' then e.building_name
+                when f.news_name != null or f.news_name != '' then f.news_name
+                when h.sales_batch_name != null or h.sales_batch_name !='' then h.sales_batch_name
+                WHEN y.`name` != NULL or y.`name` != '' THEN y.`name`
                 else '空'
                 end as shareTitle,
                         z.phone as personPhone,

src/main/resources/mapper/TaUserMapper.xml

@@ -161,6 +161,7 @@
     <select id="selectPageList" resultType="com.yunzhi.marketing.center.taUser.entity.TaUserVO">
         SELECT
             s.person_id as user_id,
+            t.user_id as real_user_id,
             t.*
         FROM
             ta_user t

src/main/resources/mapper/xlk/SearchHouseMapper.xml

@@ -26,6 +26,7 @@
         <if test="params.status != null and params.status != ''">
             and t.status = #{params.status}
         </if>
+        order by CREATED_TIME desc
     </select>
     <select id="selectSearchHouseDetail" resultType="com.yunzhi.marketing.xlk.vo.SearchHouseVO">
         SELECT
@@ -39,4 +40,26 @@
             LEFT JOIN ta_person p ON t.person_id = p.person_id
             WHERE t.id = #{id}
     </select>
+    <select id="getRecommendBuildings" resultType="com.yunzhi.marketing.entity.TaBuilding">
+        SELECT
+            DISTINCT t.*
+        FROM
+            ta_building t
+            INNER JOIN ta_building_project_type s ON t.building_id = s.building_id
+        WHERE
+            t.org_id = #{orgId}
+        <if test="cityId != null">
+            AND t.city_id = #{cityId}
+        </if>
+        <if test="areaId != null">
+            AND t.building_area = #{areaId}
+        </if>
+            AND (
+                ( s.start_price &gt;= #{minPriceW} AND s.end_price &lt;= #{maxPriceW} AND s.price_type = 'total' )
+                OR ( s.start_price &gt;= #{minPrice} AND s.end_price &lt;= #{maxPrice} AND s.price_type = 'average' )
+            )
+            AND t.`status` > - 1
+        ORDER BY
+            t.is_main ASC
+    </select>
 </mapper>