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

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.common.CommConstant;
+import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.entity.TaBuilding;
 import com.yunzhi.marketing.entity.TaPolicy;
 import com.yunzhi.marketing.entity.TdCity;
@@ -117,6 +118,7 @@ public class TaPolicyController extends BaseController {
     @RequestMapping(value="/wx/taPolicy",method= RequestMethod.GET)
     public ResponseBean taPolicyListCity(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                     @RequestParam(value ="policyTypeId",required = false) String policyTypeId,
                                          @RequestParam(value ="cityId", required = false) Integer cityId,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -128,6 +130,7 @@ public class TaPolicyController extends BaseController {
             queryWrapper.eq("org_id",getOrgId(request));
             queryWrapper.orderByDesc("weight", "create_date");
             queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            queryWrapper.eq(!StringUtils.isEmpty(policyTypeId), "policy_type_id", policyTypeId);
 
             IPage<TaPolicy> result = iTaPolicyService.page(pg, queryWrapper);
             responseBean.addSuccess(result);

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

@@ -42,7 +42,7 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("/api")
-@Api(value = "项目类型", tags = "项目类型")
+@Api(value = "项目类型", tags = "xlk-项目类型")
 public class TdBuildingTypeController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TdBuildingTypeController.class);
@@ -116,7 +116,7 @@ public class TdBuildingTypeController extends BaseController {
      * @param pageSize
      * @return
      */
-    @ApiOperation(value = "微信查询项目类型", notes = "微信查询项目类型")
+    @ApiOperation(value = "wx-微信查询项目类型", notes = "wx-微信查询项目类型")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行")

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

@@ -373,6 +373,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         LambdaQueryWrapper<TaRecommendCustomer> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(TaRecommendCustomer::getPhone,channelReportDTO.getPhone());
         queryWrapper.eq(TaRecommendCustomer::getBuildingId,channelReportDTO.getBuildingId());
+        queryWrapper.isNull(TaRecommendCustomer::getRecommendPerson);
         List<TaRecommendCustomer> taRecommendCustomers = taRecommendCustomerMapper.selectList(queryWrapper);
         if (taRecommendCustomers.size() > 0) {
             return ResponseBean.error("已存在的客户报备失败", ResponseBean.ERROR_UNAVAILABLE);

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

@@ -90,6 +90,19 @@ public class ChannelCustomerController extends BaseController {
         return iChannelCustomerService.markingChannelCustomer(params);
     }
 
+
+    /**
+     * 驻场 无效报备
+     *
+     * @param
+     * @return
+     */
+    @ApiOperation(value = "森哥看这里-wx-无效报备", notes = "森哥看这里-wx-无效报备")
+    @RequestMapping(value="/wx/marking/invalidCustomer",method= RequestMethod.PUT)
+    public ResponseBean invalidCustomerUpdate(@RequestBody MarkingChannelCustomerDTO params){
+        return iChannelCustomerService.invalidCustomerUpdate(params);
+    }
+
     /**
      * 根据id查询对象
      * @param id  实体ID

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

@@ -69,11 +69,13 @@ public class SearchHouseController extends BaseController {
     @RequestMapping(value="/admin/searchHouse",method= RequestMethod.GET)
     public ResponseBean searchHouseList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                        @RequestParam(value ="type") Integer type,
                                         @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             SearchHouse searchHouse = new SearchHouse();
             searchHouse.setOrgId(getOrgId(request));
+            searchHouse.setType(type);
             //使用分页插件
             IPage<SearchHouseVO> pg = new Page<>(pageNum, pageSize);
             responseBean = iSearchHouseService.selectSearchHouseList(pg,searchHouse);

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

@@ -31,4 +31,11 @@ public interface IChannelCustomerService extends IService<ChannelCustomer> {
      * @return
      */
     ResponseBean markingChannelCustomer(MarkingChannelCustomerDTO params);
+
+    /**
+     * 驻场 无效报备
+     * @param params
+     * @return
+     */
+    ResponseBean invalidCustomerUpdate(MarkingChannelCustomerDTO params);
 }

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

@@ -156,4 +156,40 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
 
         return ResponseBean.error("此客户是私客或已被报备", ResponseBean.ERROR_UNAVAILABLE);
     }
+
+    /**
+     * 驻场 无效报备
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public ResponseBean invalidCustomerUpdate(MarkingChannelCustomerDTO params) {// 渠道推荐的客户
+        if ("channel".equals(params.getType())) {
+            ChannelCustomer customer = channelCustomerMapper.selectById(params.getId());
+            // 审核不通过 先查看在ta_recommend_customer 手机号是否存在
+            LambdaQueryWrapper<TaRecommendCustomer> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(TaRecommendCustomer::getPhone,customer.getPhone());
+            queryWrapper.eq(TaRecommendCustomer::getBuildingId,customer.getBuildingId());
+            TaRecommendCustomer recommendCustomer = taRecommendCustomerMapper.selectOne(queryWrapper);
+            if (null != recommendCustomer) {
+                // 审核不通过
+                recommendCustomer.setRecommendPerson(customer.getRecommendPerson());
+                recommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+                recommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
+                taRecommendCustomerMapper.updateById(recommendCustomer);
+
+            }
+            customer.setStatus("2");
+            channelCustomerMapper.updateById(customer);
+            return ResponseBean.success("审核成功");
+        }else if ("customer".equals(params.getType())) {
+            // 置业顾问 经纪人推荐的客户
+            TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectById(params.getId());
+            taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_DISAGREE);
+            taRecommendCustomerMapper.updateById(taRecommendCustomer);
+            return ResponseBean.success("审核成功");
+        }
+        return ResponseBean.error("无效操作", ResponseBean.ERROR_UNAVAILABLE);
+    }
 }

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

@@ -13,6 +13,7 @@
             xlk_search_house t
             LEFT JOIN ta_person p ON t.person_id = p.person_id
             WHERE t.ORG_ID = #{params.orgId}
+                and t.type = #{params.type}
     </select>
     <select id="selectSearchHouseDetail" resultType="com.yunzhi.marketing.xlk.vo.SearchHouseVO">
         SELECT