feats

src/main/java/com/yunzhi/marketing/base/BaseController.java

@@ -10,6 +10,7 @@ import com.yunzhi.marketing.entity.TaBuilding;
 import com.yunzhi.marketing.entity.TaPersonBuilding;
 import com.yunzhi.marketing.service.ITaBuildingService;
 import com.yunzhi.marketing.service.ITaPersonBuildingService;
+import com.yunzhi.marketing.service.ITaPersonService;
 import com.yunzhi.marketing.xlk.entity.Institution;
 import com.yunzhi.marketing.xlk.service.IInstitutionService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,16 +27,19 @@ import java.util.stream.Collectors;
  */
 public class BaseController {
     @Autowired
-    private ITaUserService taUserService;
+    protected ITaUserService taUserService;
 
     @Autowired
-    private ITaPersonBuildingService taPersonBuildingService;
+    protected ITaPersonBuildingService taPersonBuildingService;
 
     @Autowired
-    private ITaBuildingService taBuildingService;
+    protected ITaBuildingService taBuildingService;
 
     @Autowired
-    public IInstitutionService iInstitutionService;
+    protected IInstitutionService iInstitutionService;
+
+    @Autowired
+    protected ITaPersonService iTaPersonService;
 
     /**
      * 获取orgId

src/main/java/com/yunzhi/marketing/borker/controller/BkAgreementController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.common.CommConstant;
+import com.yunzhi.marketing.common.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -54,11 +55,13 @@ public class BkAgreementController extends BaseController {
     public ResponseBean bkAgreementList(@ApiParam("客户端") @PathVariable String client,
                                         @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                         @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                        HttpServletRequest request) throws Exception{
+                                        @ApiParam("楼盘ID") @RequestParam(value ="buildingId", required = false) String buildingId,
+                                        HttpServletRequest request) throws Exception {
 
         IPage<BkAgreement> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<BkAgreement> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("org_id", getOrgId(request));
+        queryWrapper.eq(!StringUtils.isEmpty(buildingId), "building_id", buildingId);
         queryWrapper.gt("status", CommConstant.STATUS_DELETE);
         queryWrapper.orderByDesc("create_date");
 
@@ -76,12 +79,16 @@ public class BkAgreementController extends BaseController {
     public ResponseBean bkAgreementAdd(@ApiParam("保存内容") @RequestBody BkAgreement bkAgreement,
                                        HttpServletRequest request) throws Exception {
 
+        if (StringUtils.isEmpty(bkAgreement.getBuildingId())) {
+            return ResponseBean.error("未绑定楼盘", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
         bkAgreement.setOrgId(getOrgId(request).toString());
         bkAgreement.setInstitutionId(CommConstant.ROOT_INSTITUTION);
 
         if (iBkAgreementService.save(bkAgreement)){
             return ResponseBean.success(bkAgreement);
-        }else {
+        } else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
@@ -121,8 +128,11 @@ public class BkAgreementController extends BaseController {
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
     public ResponseBean bkAgreementUpdate(@ApiParam("对象ID") @PathVariable String id,
                                           @ApiParam("更新内容") @RequestBody BkAgreement bkAgreement,
-                                          HttpServletRequest request) throws Exception{
+                                          HttpServletRequest request) throws Exception {
 
+        if (StringUtils.isEmpty(bkAgreement.getBuildingId())) {
+            return ResponseBean.error("未绑定楼盘", ResponseBean.ERROR_UNAVAILABLE);
+        }
 
         BkAgreement origin = iBkAgreementService.getById(id);
         if (null == bkAgreement || CommConstant.STATUS_DELETE.equals(bkAgreement)) {

src/main/java/com/yunzhi/marketing/borker/controller/BorkerController.java

@@ -0,0 +1,62 @@
+package com.yunzhi.marketing.borker.controller;
+
+import com.yunzhi.marketing.base.BaseController;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.borker.entity.BkBankCard;
+import com.yunzhi.marketing.borker.service.IBkBankCardService;
+import com.yunzhi.marketing.borker.vo.BorkerVO;
+import com.yunzhi.marketing.common.CommConstant;
+import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.entity.TaPerson;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+
+@Api(tags = "全民经纪人(新联康)")
+@RestController
+@RequestMapping("/api")
+public class BorkerController  extends BaseController {
+
+    @Autowired
+    IBkBankCardService iBkBankCardService;
+
+
+    @RequestMapping(value="/wx/bindBorker",method= RequestMethod.PUT)
+    @ApiOperation(value="成为经纪人", notes = "成为经纪人", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean bindBorker(@ApiParam("经纪人信息") @RequestBody BorkerVO borkerVO,
+                                   HttpServletRequest request) throws Exception {
+        String personId = getPersonId(request);
+
+        borkerVO.setPersonId(personId);
+        borkerVO.setPersonType(CommConstant.PERSON_BORKER);
+
+        TaPerson taPerson = new TaPerson();
+
+        BeanUtils.copyProperties(borkerVO, taPerson, "bankCardList");
+        taPerson.setTotalCommission(null);
+        taPerson.setSettledCommission(null);
+        taPerson.setUnsettledCommission(null);
+
+        // 更新数据
+        if (!iTaPersonService.updateById(taPerson)) {
+
+            // 如果是有人推荐的, 那么需要给予推荐人一定的奖励
+            if (!StringUtils.isEmpty(borkerVO.getRecommendAgent())) {
+                // TODO
+            }
+
+            return ResponseBean.error("操作失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        return ResponseBean.success(borkerVO);
+    }
+}

src/main/java/com/yunzhi/marketing/borker/entity/BkAccountRecord.java

@@ -40,7 +40,7 @@ public class BkAccountRecord implements Serializable {
     private String buildingId;
 
     @ApiModelProperty(value = "楼盘名称")
-    private String builidngName;
+    private String buildingName;
 
     @ApiModelProperty(value = "佣金;单位分")
     private Integer charges;

src/main/java/com/yunzhi/marketing/borker/entity/BkAgreement.java

@@ -30,6 +30,12 @@ public class BkAgreement implements Serializable {
     @TableId(value = "rule_id", type = IdType.UUID)
     private String ruleId;
 
+    @ApiModelProperty(value = "楼盘ID")
+    private String buildingId;
+
+    @ApiModelProperty(value = "楼盘名称")
+    private String buildingName;
+
     @ApiModelProperty(value = "规则内容")
     private String content;
 

src/main/java/com/yunzhi/marketing/borker/mapper/BkBankCardMapper.java

@@ -3,6 +3,9 @@ package com.yunzhi.marketing.borker.mapper;
 import com.yunzhi.marketing.borker.entity.BkBankCard;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface BkBankCardMapper extends BaseMapper<BkBankCard> {
 
+    List<BkBankCard> getListByBorker(@Param("personId") String personId);
 }

src/main/java/com/yunzhi/marketing/borker/service/IBkBankCardService.java

@@ -3,6 +3,8 @@ package com.yunzhi.marketing.borker.service;
 import com.yunzhi.marketing.borker.entity.BkBankCard;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 经纪人银行卡信息 服务类
@@ -13,4 +15,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IBkBankCardService extends IService<BkBankCard> {
 
+    List<BkBankCard> getListByBorker(String personId);
+
+    boolean mergeList(String personId, List<BkBankCard> bankCardList);
 }

src/main/java/com/yunzhi/marketing/borker/service/impl/BkBankCardServiceImpl.java

@@ -4,8 +4,13 @@ import com.yunzhi.marketing.borker.entity.BkBankCard;
 import com.yunzhi.marketing.borker.mapper.BkBankCardMapper;
 import com.yunzhi.marketing.borker.service.IBkBankCardService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.marketing.common.CommConstant;
+import com.yunzhi.marketing.common.DateUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * <p>
  * 经纪人银行卡信息 服务实现类
@@ -17,4 +22,30 @@ import org.springframework.stereotype.Service;
 @Service
 public class BkBankCardServiceImpl extends ServiceImpl<BkBankCardMapper, BkBankCard> implements IBkBankCardService {
 
+    @Override
+    public List<BkBankCard> getListByBorker(String personId) {
+        return baseMapper.getListByBorker(personId);
+    }
+
+    @Override
+    public boolean mergeList(String personId, List<BkBankCard> bankCardList) {
+        // 先删除已有的
+        removeByMap(new HashMap<String, Object>(){{
+            put("person_id", personId);
+        }});
+
+        // 挨个处理下
+        for (BkBankCard item : bankCardList) {
+            item.setPersonId(personId);
+            if (null == item.getStatus()) {
+                item.setStatus(CommConstant.STATUS_NORMAL);
+            }
+            if (null == item.getCreateDate()) {
+                item.setCreateDate(DateUtils.now());
+            }
+        }
+
+        // 再插入新的
+        return saveBatch(bankCardList);
+    }
 }

src/main/java/com/yunzhi/marketing/borker/vo/BorkerVO.java

@@ -0,0 +1,64 @@
+package com.yunzhi.marketing.borker.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yunzhi.marketing.borker.entity.BkBankCard;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="BorkerVO", description="全民经纪人")
+public class BorkerVO {
+
+    @ApiModelProperty("人员ID")
+    private String personId;
+
+    @ApiModelProperty("人员类型")
+    private String personType;
+
+    @ApiModelProperty("头像")
+    private String avatarurl;
+
+    @ApiModelProperty("姓名")
+    private String name;
+
+    @ApiModelProperty("昵称")
+    private String nickname;
+
+    @ApiModelProperty("电话")
+    private String phone;
+
+    @ApiModelProperty("性别")
+    private Integer sex;
+
+    @ApiModelProperty("身份证号")
+    private String idNo;
+
+    @ApiModelProperty("身份证正面")
+    private String idcardImg;
+
+    @ApiModelProperty("身份证反面")
+    private String idcardImg2;
+
+    @ApiModelProperty("推荐人(上家)")
+    private String recommendAgent;
+
+    @ApiModelProperty("总佣金")
+    private Integer totalCommission;
+
+    @ApiModelProperty("已结算佣金")
+    private Integer settledCommission;
+
+    @ApiModelProperty("待结算佣金")
+    private Integer unsettledCommission;
+
+    @TableField(exist = false)
+    @ApiModelProperty("银行卡列表")
+    List<BkBankCard> bankCardList;
+}

src/main/java/com/yunzhi/marketing/common/CommConstant.java

@@ -33,6 +33,11 @@ public class CommConstant {
      */
     public final static String PERSON_ESTATE_DRIFT = "drift";
 
+    /**
+     * 人员类型: 全民经纪人(新联家)
+     */
+    public final static String PERSON_BORKER = "borker";
+
     /**
      * 状态: 正常
      */

src/main/java/com/yunzhi/marketing/common/DateUtils.java

@@ -114,4 +114,8 @@ public class DateUtils {
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         return LocalDateTime.parse(target, df);
     }
+
+    public static LocalDateTime now() {
+        return LocalDateTime.now(ZoneId.of("Asia/Shanghai"));
+    }
 }

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

@@ -7,6 +7,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.borker.entity.BkBankCard;
+import com.yunzhi.marketing.borker.service.IBkBankCardService;
 import com.yunzhi.marketing.center.sysUser.service.ISysTokenService;
 import com.yunzhi.marketing.center.taUser.entity.TaUser;
 import com.yunzhi.marketing.center.taUser.service.ITaUserService;
@@ -117,6 +119,9 @@ public class MiniAppController extends BaseController {
     @Autowired
     public ISysOrgParamsService iSysOrgParamsService;
 
+    @Autowired
+    public IBkBankCardService iBkBankCardService;
+
     /**
      * 验证接入
      */
@@ -398,6 +403,12 @@ public class MiniAppController extends BaseController {
             TdCity tdCity = iTdCityService.getLocationCity(location, orgId, taPerson.getPersonId());
             result.put("city", tdCity);
 
+            // 如果是新联康全民经纪人
+            if (CommConstant.PERSON_BORKER.equals(taPerson.getPersonType())) {
+                List<BkBankCard> bankCardList = iBkBankCardService.getListByBorker(taPerson.getPersonId());
+                result.put("bankCardList", bankCardList);
+            }
+
             return ResponseBean.success(result);
         } catch (WxErrorException e) {
             System.err.println(e.getError());

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

@@ -18,10 +18,7 @@ import com.yunzhi.marketing.service.ITaPersonBuildingService;
 import com.yunzhi.marketing.service.ITaPersonService;
 import com.yunzhi.marketing.service.ITaSaveService;
 import com.yunzhi.marketing.xlk.service.ISceneLogService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
@@ -348,6 +345,7 @@ public class TaBuildingController extends BaseController {
 //            @RequestParam(required = false) Integer maxPrice, // 最高价格
 //            @RequestParam(required = false) Double minBuildingArea, // 最小面积
 //            @RequestParam(required = false) Double maxBuildingArea, // 最大面积
+            @RequestParam(required = false) Boolean isBorker,   // 是否开启全民经纪人
             HttpServletRequest request
     ) {
         Integer orgId = getOrgId(request);
@@ -384,6 +382,7 @@ public class TaBuildingController extends BaseController {
                 isRecentOpening,
                 isCommerce,
                 marketStatus,
+                isBorker,
                 orderBy);
     }
 
@@ -534,5 +533,21 @@ public class TaBuildingController extends BaseController {
         }
         return responseBean;
     }
+
+    @ApiOperation(value = "admin - 开启全民经纪人", notes = "admin - 开启全民经纪人")
+    @PutMapping(value = "/admin/marketing/{id}/borker")
+    public  ResponseBean switchBorker(@ApiParam("楼盘ID") @PathVariable String id,
+                                      @ApiParam(value = "是否开启", allowableValues = "true,false") @RequestParam Boolean on,
+                                      HttpServletRequest request) throws Exception {
+        TaBuilding taBuilding = taBuildingService.getById(id);
+        if (taBuilding == null || CommConstant.STATUS_DELETE.equals(taBuilding.getStatus())) {
+            return ResponseBean.error("未找到楼盘", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        taBuilding.setIsBorker(on);
+        taBuildingService.updateById(taBuilding);
+        return ResponseBean.success("success");
+    }
+
 }
 

src/main/java/com/yunzhi/marketing/entity/TaBuilding.java

@@ -384,6 +384,9 @@ public class TaBuilding implements Serializable {
     /** 是否文旅商办 */
     private Integer isRecentOpening ;
 
+    // 是否开启全民经纪人
+    private Boolean isBorker;
+
     /**
      * 项目亮点封面
      */

src/main/java/com/yunzhi/marketing/entity/TaPerson.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -23,6 +25,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
+@ApiModel(value="TaPerson对象", description="用户表")
 public class TaPerson implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -362,4 +365,19 @@ public class TaPerson implements Serializable {
      */
     @TableField(exist = false)
     private String description;
+
+    @ApiModelProperty("身份证正面")
+    private String idcardImg;
+
+    @ApiModelProperty("身份证反面")
+    private String idcardImg2;
+
+    @ApiModelProperty("总佣金")
+    private Integer totalCommission;
+
+    @ApiModelProperty("已结算佣金")
+    private Integer settledCommission;
+
+    @ApiModelProperty("待结算佣金")
+    private Integer unsettledCommission;
 }

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

@@ -86,6 +86,7 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
                                          @Param("isRecentOpening") Boolean isRecentOpening,
                                          @Param("isCommerce") Boolean isCommerce,
                                          @Param("marketStatus") String marketStatus,
+                                         @Param("isBorker") Boolean isBorker,
                                          @Param("orderBy") String orderBy,
                                          @Param("buildingAreaLisr") List<String> buildingAreaLisr);
 

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

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

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

@@ -872,6 +872,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             Boolean isRecentOpening,
             Boolean isCommerce,
             String marketStatus,
+            Boolean isBorker,
             String orderBy) {
         IPage<TaBuilding> page = new Page<>(pageNum, pageSize);
 
@@ -932,6 +933,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
                 isRecentOpening,
                 isCommerce,
                 marketStatus,
+                isBorker,
                 orderBy,
                 buildingAreaLisr);
 

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

@@ -646,31 +646,53 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     @Override
     public ResponseBean averageReportCust(AverageReportDTO averageReportDTO) {
 
+        String buildingId = averageReportDTO.getBuildingId();
+        String phone = averageReportDTO.getPhone();
+
         // 当前人员
-//        TaPerson person = taPersonMapper.getById(averageReportDTO.getPersonId());
+        TaPerson person = taPersonMapper.getById(averageReportDTO.getPersonId());
 
         // 查询报备客户
         TaPerson reportPerson = taPersonMapper.getByPhone(averageReportDTO.getPhone());
 
         // 先查看在ta_recommend_customer 手机号是否存在
         LambdaQueryWrapper<TaRecommendCustomer> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(TaRecommendCustomer::getPhone,averageReportDTO.getPhone());
-        queryWrapper.eq(TaRecommendCustomer::getBuildingId,averageReportDTO.getBuildingId());
+        queryWrapper.eq(TaRecommendCustomer::getPhone, phone);
+        queryWrapper.eq(TaRecommendCustomer::getBuildingId, buildingId);
         queryWrapper.isNull(TaRecommendCustomer::getRecommendPerson);
         List<TaRecommendCustomer> taRecommendCustomers = taRecommendCustomerMapper.selectList(queryWrapper);
         if (taRecommendCustomers.size() > 0) {
             return ResponseBean.error("已存在的客户报备失败", ResponseBean.ERROR_UNAVAILABLE);
         }
 
-        // 查询是否在渠道推荐表中
-        LambdaQueryWrapper<ChannelCustomer> channelCustomerLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        channelCustomerLambdaQueryWrapper.eq(ChannelCustomer::getBuildingId,averageReportDTO.getBuildingId());
-        channelCustomerLambdaQueryWrapper.eq(ChannelCustomer::getPhone,averageReportDTO.getPhone());
-        channelCustomerLambdaQueryWrapper.ne(ChannelCustomer::getStatus,"3");
-        List<ChannelCustomer> channelCustomers = channelCustomerMapper.selectList(channelCustomerLambdaQueryWrapper);
-        List<ChannelCustomer> passCustomer = channelCustomers.stream().filter(e -> "2".equals(e.getStatus())).collect(Collectors.toList());
-        if (passCustomer.size() > 0) {
-            return ResponseBean.error("此用户已经被报备", ResponseBean.ERROR_UNAVAILABLE);
+
+        // 如果是全民经纪人
+        if (CommConstant.PERSON_BORKER.equals(person.getPersonType())) {
+            TaBuilding taBuilding = taBuildingMapper.selectById(buildingId);
+            if (null == taBuilding || CommConstant.STATUS_DELETE.equals(taBuilding.getStatus())) {
+                return ResponseBean.error("推荐楼盘不存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
+            }
+
+            if (null == taBuilding.getIsBorker() || !taBuilding.getIsBorker()) {
+                return ResponseBean.error("推荐楼盘未开启经纪人推荐", ResponseBean.ERROR_ILLEGAL_PARAMS);
+            }
+
+            // 查询在保护期的人员
+            List<ChannelCustomer> list = channelCustomerMapper.getRecommendedOrExpired(buildingId, phone);
+            if (null != list && list.size() > 0) {
+                return ResponseBean.error("此用户已经被报备", ResponseBean.ERROR_ILLEGAL_PARAMS);
+            }
+        } else {
+            // 查询是否在渠道推荐表中
+            LambdaQueryWrapper<ChannelCustomer> channelCustomerLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            channelCustomerLambdaQueryWrapper.eq(ChannelCustomer::getBuildingId, buildingId);
+            channelCustomerLambdaQueryWrapper.eq(ChannelCustomer::getPhone, phone);
+            channelCustomerLambdaQueryWrapper.ne(ChannelCustomer::getStatus,"3");
+            List<ChannelCustomer> channelCustomers = channelCustomerMapper.selectList(channelCustomerLambdaQueryWrapper);
+            List<ChannelCustomer> passCustomer = channelCustomers.stream().filter(e -> "2".equals(e.getStatus())).collect(Collectors.toList());
+            if (passCustomer.size() > 0) {
+                return ResponseBean.error("此用户已经被报备", ResponseBean.ERROR_UNAVAILABLE);
+            }
         }
 
         // 入渠道推荐客户表
@@ -679,17 +701,18 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             channelCustomer.setPersonId(reportPerson.getPersonId());
         }
 
-        channelCustomer.setBuildingId(averageReportDTO.getBuildingId());
+        channelCustomer.setBuildingId(buildingId);
         channelCustomer.setName(averageReportDTO.getName());
         channelCustomer.setPicture(averageReportDTO.getPicture());
-        channelCustomer.setPhone(averageReportDTO.getPhone());
+        channelCustomer.setPhone(phone);
         channelCustomer.setSex(averageReportDTO.getSex());
         channelCustomer.setRecommendPerson(averageReportDTO.getPersonId());
+        channelCustomer.setRecommendPersonType(person.getPersonType());
         channelCustomer.setCreateDate(LocalDateTime.now());
         channelCustomer.setStatus("1");
         channelCustomer.setRealtyConsultant(averageReportDTO.getRealtyConsultant());
         channelCustomer.setOrgId(averageReportDTO.getOrgId());
-        channelCustomer.setInstitutionId(getInstitutionId(averageReportDTO.getBuildingId()));
+        channelCustomer.setInstitutionId(getInstitutionId(buildingId));
         channelCustomerMapper.insert(channelCustomer);
         return ResponseBean.success(channelCustomer);
     }

src/main/java/com/yunzhi/marketing/xlk/entity/ChannelCustomer.java

@@ -102,6 +102,9 @@ public class ChannelCustomer implements Serializable {
      */
     private String recommendPerson;
 
+    // 推荐人身份类型
+    private String recommendPersonType;
+
     /**
      * 状态 1是审核中 2是审核通过 3是审核不通过
      */

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

@@ -58,4 +58,6 @@ public interface ChannelCustomerMapper extends BaseMapper<ChannelCustomer> {
     List<CustomerDetailVO> getSuccessCustomerDetail(@Param("params") StatisticsDTO statisticsDTo);
 
     ChannelCustomer getMoreInfoById(String id);
+
+    List<ChannelCustomer> getRecommendedOrExpired(@Param("buildingId") String buildingId,@Param("phone") String phone);
 }

src/main/resources/mapper/BkBankCardMapper.xml

@@ -2,4 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.marketing.borker.mapper.BkBankCardMapper">
 
+    <select id="getListByBorker" resultType="com.yunzhi.marketing.borker.entity.BkBankCard">
+        SELECT
+            *
+        FROM
+            bk_bank_card t
+        WHERE
+            t.person_id = #{personId}
+          AND t.`status` &gt; -1
+        ORDER BY
+            t.create_date DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaBuildingMapper.xml

@@ -135,6 +135,9 @@
                 <if test="isCommerce != null and isCommerce">
                     AND is_commerce = 1
                 </if>
+                <if test="isBorker != null and isBorker">
+                    AND is_borker = 1
+                </if>
                 <if test="isRecentOpening != null and isRecentOpening">
                     AND is_recent_opening = 1
                 </if>

src/main/resources/mapper/TaMiniappTheme.xml → src/main/resources/mapper/TaMiniappThemeMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yunzhi.marketing.entity.TaMiniappTheme">
+<mapper namespace="com.yunzhi.marketing.mapper.TaMiniappThemeMapper">
 
 </mapper>

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

@@ -193,4 +193,25 @@
         WHERE
             t.channel_customer_id = #{id}
     </select>
+    <select id="getRecommendedOrExpired" resultType="com.yunzhi.marketing.xlk.entity.ChannelCustomer">
+        SELECT
+            t.*
+        FROM
+            xlk_channel_customer t
+        LEFT JOIN xlk_building_channel s ON t.building_id = s.building_id
+            AND s.channel_id IS NOT NULL
+            AND t.channel_id = s.channel_id
+        LEFT JOIN bk_agreement m ON t.building_id = s.building_id
+            AND s.channel_id IS NULL
+        WHERE
+            t.building_id = #{buildingId}
+            AND t.phone = #{phone}
+            AND (
+                t.`status` = 2
+                OR (
+                    t.`status` = 1
+                    AND IFNULL( s.expiration_date, IFNULL( m.expiration_days, 0 ) ) &lt;= TIMESTAMPDIFF( DAY, t.create_date, now( ) )
+                )
+            )
+    </select>
 </mapper>