feats

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

     List<SalesExport> selectSalesList(@Param("orgId") Integer orgId,@Param("buildingId") String buildingId, @Param("startCreateDate")  String startCreateDate,@Param("endCreateDate") String endCreateDate, @Param("personBuildingList") List<TaPersonBuilding> taPersonBuildingList);
 
     List<TaBuilding> getBuildingsOf(@Param("personOrUser") String personOrUser);
+
 }

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

 
     IPage<TaRecommendCustomer>getCustomersIRecommended(IPage<TaRecommendCustomer> page,@Param("customerId")String customerId,@Param("status")Integer status,@Param("orgId") Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
+    /**
+     * @param page
+     * @param orgId
+     * @param userId
+     * @param buildingId
+     * @param startDate
+     * @param endDate
+     * @param personId
+     * @return
+     */
     IPage<TaRecommendCustomer> getCustomerListOfConsultant(IPage<TaRecommendCustomer> page,
                                                            @Param("orgId") Integer orgId,
                                                            @Param("userId") String userId,
      */
     List<TaRecommendCustomer> getConsultantCustomerList(@Param("userId") Integer userId,@Param("personId") String personId,@Param("buildingId") String buildingId,@Param("orgId") Integer orgId);
 
+    /**
+     * 校验客户存在记录
+     * @param orgId
+     * @param personId
+     * @param consultBuildingIds
+     * @param buildingId
+     * @return
+     */
+    Map<String, Number> checkCustomerBy(@Param("orgId") Integer orgId, @Param("personId") String personId, @Param("consultBuildingIds") List<String> consultBuildingIds, @Param("buildingId") String buildingId);
 }

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

 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaPersonBuilding;
-import com.huiju.estateagents.entity.TaRecommendCustomer;
+import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.excel.AgentsRecommendCustomer;
 import com.huiju.estateagents.excel.ExcelRecommendCustomer;
 import com.huiju.estateagents.excel.ReporRecommendCustomer;
      * @return
      */
     List<TaRecommendCustomer> getConsultantCustomerList(Integer userId, String personId, String buildingId, Integer orgId, List<TaPersonBuilding> taPersonBuildingListByUserId);
+
+    /**
+     * 生成新客户信息
+     * @param orgId
+     * @param person
+     * @param recommender
+     * @param consultant
+     * @param building
+     * @param from
+     * @return
+     * @throws Exception
+     */
+    List<TaRecommendCustomer> newCustomer(Integer orgId, TaPerson person, TaPerson recommender, TaUser consultant, TaBuilding building, TaCustomerFrom from) throws Exception;
 }

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

         }
         updateById(person);
 
-        // 只要授权手机号, 就是客户
-        // 或者 依据手机号反更新推荐客户中 person_id
-        // 默认场景, 普通人推荐
-        TaRecommendCustomer customer = newOrFixCustomerBy(person, promoter, buildingId);
-
-        // 发放积分
-        applicationContext.publishEvent(new EventBus(person, EventBus.EventType.SignUpAgent, orgId));
-
-        //授权手机给推广人加积分
-        String sharePersonId = getSharePersonFrom(person);
-        if (validateSceneId(sceneId) && !StringUtils.isEmpty(sharePersonId)){
-            applicationContext.publishEvent(new EventBus(promoter != null ? promoter : sharePersonId, EventBus.EventType.SharePosterAll, orgId));
-        }
+        // 关联推荐客户
+        fixCustomerPersonId(person);
 
         // 客户来源
         TaCustomerFrom customerFrom = new TaCustomerFrom();
         customerFrom.setPersonId(person.getPersonId());
         customerFrom.setPersonName(StringUtils.ifNull(person.getName(), person.getNickname()));
-        customerFrom.setCustomerId(customer.getCustomerId());
         customerFrom.setTargetType(targetType);
         customerFrom.setTargetId(targetId);
         customerFrom.setTargetName(targetName);
         customerFrom.setOrgId(orgId);
         customerFrom.setSceneId(sceneId);
-        customerFrom.setIsOrgFirst(true);   // 授权手机号, 肯定是第一次
-        customerFrom.setIsProjectFirst(false);
         customerFrom.setCreateDate(now);
 
         // 推广人
         TaPerson recPerson = StringUtils.isEmpty(promoter) ? null : taPersonMapper.getById(promoter);
+        // 推荐楼盘
+        TaBuilding building = StringUtils.isEmpty(buildingId) ? null : taBuildingMapper.selectById(buildingId);
         // 是否置业顾问
         boolean isConsultant = null != recPerson && CommConstant.PERSON_REALTY_CONSULTANT.equals(recPerson.getPersonType());
-        // 推广人授权的楼盘
-        List<String> withBuildings = isConsultant ? taUserMapper.getBuildingIdsOf(recPerson.getUserId(), null) : null;
-        // 推荐楼盘
-        TaBuilding recBuilding = StringUtils.isEmpty(buildingId) ? null : taBuildingMapper.selectById(buildingId);
-
-        // 传入的楼盘与推广人是否有关联关系
-        boolean isAssociated = null != withBuildings && withBuildings.contains(buildingId);
-
-        // 如果有推荐楼盘
-        if (null != recBuilding) {
-            customerFrom.setBuildingId(buildingId);
-            customerFrom.setBuildingName(recBuilding.getBuildingName());
-            customerFrom.setIsProjectFirst(true);
-
-            // 客户没楼盘 - 小程序级别公客, 则变成项目级别公客
-            if (StringUtils.isEmpty(customer.getBuildingId())) {
-                customer.setBuildingId(buildingId);
+        TaUser consultant = isConsultant ? taUserMapper.selectById(recPerson.getUserId()) : null;
 
-                // 如果项目跟推广人是关联关系, 那么就是私客
-                if (isAssociated) {
-                    customer.setRealtyConsultant(recPerson.getUserId().toString());
-                }
-
-                taRecommendCustomerMapper.updateById(customer);
-            }
-        }
-
-        // 推荐人不为空
-        if (null != recPerson) {
-            customerFrom.setSharePersonId(recPerson.getPersonId());
-            customerFrom.setSharePersonName(recPerson.getNickname());
-
-            // 如果没有关联关系
-            // 置业顾问推荐其他楼盘, 那么需要生成该置业的私客
-            if (isConsultant && !isAssociated) {
-                String consultantBuildingId = null != withBuildings ? withBuildings.get(0) : null;
-                if (!StringUtils.isEmpty(consultantBuildingId)) {
-                    TaBuilding onsultantBuilding = taBuildingMapper.selectById(consultantBuildingId);
-                    TaRecommendCustomer newCustomer = copyByPerosn(person, new TaRecommendCustomer());
-                    newCustomer.setBuildingId(onsultantBuilding.getBuildingId());
-                    newCustomer.setRealtyConsultant(recPerson.getUserId().toString());
-                    newCustomer.setRecommendPerson(recPerson.getPersonId());
-                    newCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
-                    newCustomer.setStatus(CommConstant.CUSTOMER_REPORT);
-                    newCustomer.setEntryType(CommConstant.ENTRY_INPUT);
-                    newCustomer.setCreateDate(now);
-                    newCustomer.setReportDate(now);
-                    taRecommendCustomerMapper.insert(newCustomer);
-
-                    TaCustomerFrom customerFrom2 = new TaCustomerFrom();
-                    customerFrom2.setPersonId(person.getPersonId());
-                    customerFrom2.setPersonName(StringUtils.ifNull(person.getName(), person.getNickname()));
-                    customerFrom2.setCustomerId(newCustomer.getCustomerId());
-                    customerFrom2.setBuildingId(onsultantBuilding.getBuildingId());
-                    customerFrom2.setBuildingName(onsultantBuilding.getBuildingName());
-                    customerFrom2.setSharePersonId(recPerson.getPersonId());
-                    customerFrom2.setSharePersonName(recPerson.getNickname());
-                    customerFrom2.setTargetType(targetType);
-                    customerFrom2.setTargetId(targetId);
-                    customerFrom2.setTargetName(targetName);
-                    customerFrom2.setOrgId(orgId);
-                    customerFrom2.setSceneId(sceneId);
-                    customerFrom2.setIsOrgFirst(true);
-                    customerFrom2.setIsProjectFirst(true);
-                    customerFrom2.setCreateDate(now);
-                    taCustomerFromMapper.insert(customerFrom2);
+        try {
+            List<TaRecommendCustomer> customerList = iTaRecommendCustomerService.newCustomer(orgId, person, recPerson, consultant, building, customerFrom);
+            if (customerList.size() > 0) {
+                // 发放积分
+                applicationContext.publishEvent(new EventBus(person, EventBus.EventType.SignUpAgent, orgId));
+
+                //授权手机给推广人加积分
+                String sharePersonId = getSharePersonFrom(person);
+                if (validateSceneId(sceneId) && !StringUtils.isEmpty(sharePersonId)){
+                    applicationContext.publishEvent(new EventBus(promoter != null ? promoter : sharePersonId, EventBus.EventType.SharePosterAll, orgId));
                 }
             }
+        } catch (Exception e) {
+            throw e;
         }
-
-        taCustomerFromMapper.insert(customerFrom);
     }
 
     private TaRecommendCustomer newOrFixCustomerBy(TaPerson person, String promoter, String buildingId) {

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

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cglib.beans.BeanCopier;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * <p>
         return taRecommendCustomerMapper.getConsultantCustomerList(userId, personId, buildingId, orgId);
     }
 
+    @Override
+    public List<TaRecommendCustomer> newCustomer(Integer orgId, TaPerson person, TaPerson recommender, TaUser consultant, TaBuilding building, TaCustomerFrom from) throws Exception {
+        // 如果置业推荐了非自己绑定楼盘, 会生成 2 条客户记录
+        List<TaRecommendCustomer> result = new ArrayList<>();
+        List<TaBuilding> consultBuildings = null;
+        List<String> consultBuildingIds = null;
+        if (null != consultant) {
+            consultBuildings = taPersonBuildingMapper.getBuildingsOf(consultant.getUserId().toString());
+            if (null != consultBuildings && consultBuildings.size() > 0) {
+                consultBuildingIds = consultBuildings.stream().map(TaBuilding::getBuildingId).collect(Collectors.toList());
+            }
+        }
+
+        Map<String, Number> checkNum = taRecommendCustomerMapper.checkCustomerBy(orgId, person.getPersonId(), consultBuildingIds, null != building ? building.getBuildingId() : null);
+        boolean hasOrgCust = checkNum.get("orgNum").intValue() > 0;
+        boolean hasConsultCust = checkNum.get("consultNum").intValue() > 0;
+        boolean hasBuildingCust = checkNum.get("buildingNum").intValue() > 0;
+        LocalDateTime now = LocalDateTime.now();
+
+        // 控制是否需要插入小程序级别公客
+        boolean inserted = false;
+        // 置业与楼盘是否有关联关系
+        boolean builingAssociated = false;
+
+        // 私客
+        if (null != consultant && !hasConsultCust && null != consultBuildings) {
+            TaBuilding taBuilding = null;
+            if (consultBuildingIds.contains(null != building ? building.getBuildingId() : null)) {
+                taBuilding = building;
+                builingAssociated = true;
+            } else {
+                taBuilding = consultBuildings.get(0);
+            }
+
+            TaRecommendCustomer customer = copyFromPerosn(person, new TaRecommendCustomer());
+            fillSomeFieldsOfCustomer(customer, recommender, now);
+            customer.setBuildingId(taBuilding.getBuildingId());
+            customer.setBuildingName(taBuilding.getBuildingName());
+            customer.setRealtyConsultant(consultant.getUserId().toString());
+            taRecommendCustomerMapper.insert(customer);
+            result.add(customer);
+            inserted = true;
+
+            TaCustomerFrom customerFrom = copyPropertiesFrom(from);
+            customerFrom.setCustomerId(customer.getCustomerId());
+            customerFrom.setSharePersonId(recommender.getPersonId());
+            customerFrom.setSharePersonName(StringUtils.ifNull(recommender.getName(), recommender.getNickname()));
+            customerFrom.setBuildingId(taBuilding.getBuildingId());
+            customerFrom.setBuildingName(taBuilding.getBuildingName());
+            customerFrom.setIsOrgFirst(!hasOrgCust);
+            customerFrom.setIsProjectFirst(true);
+            customerFrom.setCreateDate(now);
+            taCustomerFromMapper.insert(customerFrom);
+        }
+
+        // 项目公客
+        if (null != building && !hasBuildingCust && !builingAssociated) {
+            TaRecommendCustomer customer = copyFromPerosn(person, new TaRecommendCustomer());
+            fillSomeFieldsOfCustomer(customer, recommender, now);
+            customer.setBuildingId(building.getBuildingId());
+            taRecommendCustomerMapper.insert(customer);
+            result.add(customer);
+            inserted = true;
+
+            TaCustomerFrom customerFrom = copyPropertiesFrom(from);
+            customerFrom.setCustomerId(customer.getCustomerId());
+            customerFrom.setSharePersonId(null == recommender ? null : recommender.getPersonId());
+            customerFrom.setSharePersonName(null == recommender ? null : StringUtils.ifNull(recommender.getName(), recommender.getNickname()));
+            customerFrom.setBuildingId(building.getBuildingId());
+            customerFrom.setBuildingName(building.getBuildingName());
+            customerFrom.setIsOrgFirst(!hasOrgCust);
+            customerFrom.setIsProjectFirst(true);
+            customerFrom.setCreateDate(now);
+            taCustomerFromMapper.insert(customerFrom);
+        }
+
+        // 小程序公客
+        if (!hasOrgCust && !inserted) {
+            TaRecommendCustomer customer = copyFromPerosn(person, new TaRecommendCustomer());
+            fillSomeFieldsOfCustomer(customer, recommender, now);
+            taRecommendCustomerMapper.insert(customer);
+            result.add(customer);
+
+            TaCustomerFrom customerFrom = copyPropertiesFrom(from);
+            customerFrom.setCustomerId(customer.getCustomerId());
+            customerFrom.setSharePersonId(null == recommender ? null : recommender.getPersonId());
+            customerFrom.setSharePersonName(null == recommender ? null : StringUtils.ifNull(recommender.getName(), recommender.getNickname()));
+            customerFrom.setIsOrgFirst(true);
+            customerFrom.setIsProjectFirst(false);
+            customerFrom.setCreateDate(now);
+            taCustomerFromMapper.insert(customerFrom);
+        }
+
+        return result;
+    }
+
+    private void fillSomeFieldsOfCustomer(TaRecommendCustomer customer, TaPerson recommender, LocalDateTime now) {
+        customer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+        customer.setStatus(CommConstant.CUSTOMER_REPORT);
+        customer.setEntryType(null == recommender ? CommConstant.ENTRY_VOLUNTEER : CommConstant.ENTRY_INPUT);
+        customer.setCreateDate(now);
+        customer.setReportDate(now);
+        customer.setRecommendPerson(null == recommender ? null : recommender.getPersonId());
+    }
+
+    private TaRecommendCustomer copyFromPerosn(TaPerson person, TaRecommendCustomer cust) {
+        cust.setPersonId(person.getPersonId());
+        cust.setName(StringUtils.ifNull(person.getName(), person.getNickname()));
+        cust.setSex(null == person.getSex() ? str2Int(person.getGender()) : person.getSex());
+        cust.setPhone(StringUtils.ifNull(person.getPhone(), person.getTel()));
+        cust.setPicture(StringUtils.ifNull(person.getAvatarurl(), person.getPhoto()));
+        cust.setCountry(person.getCountry());
+        cust.setCity(person.getCity());
+        cust.setProvince(person.getProvince());
+        cust.setOrgId(person.getOrgId());
+
+        return cust;
+    }
+
+    private TaCustomerFrom copyPropertiesFrom(TaCustomerFrom from) {
+        BeanCopier copier = BeanCopier.create(TaCustomerFrom.class, TaCustomerFrom.class, false);
+        TaCustomerFrom to = new TaCustomerFrom();
+        copier.copy(from, to, null);
+        return to;
+    }
+
     @Override
     public ResponseBean getCustDetail(String id) {
         TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectById(id);

src/main/resources/mapper/TaRecommendCustomerMapper.xml

         AND t.verify_status = 1
         AND t.realty_consultant IN ( #{userId}, #{personId})
     </select>
+
+    <select id="checkCustomerBy" resultType="java.util.Map">
+        SELECT
+            count( 1 ) AS orgNum,
+
+        <!--   sum( IF ( t.building_id IN ( 'foo', 'bar' ), 1, 0 ) ) AS consultNum,     -->
+        <choose>
+            <when test="consultBuildingIds != null and consultBuildingIds.size > 0">
+                sum( IF ( t.building_id IN <foreach collection="consultBuildingIds" item="id" open="(" close=")" separator=",">#{id}</foreach>
+            </when>
+            <otherwise>
+                sum( IF ( t.building_id IN ('****')
+            </otherwise>
+        </choose>
+            , 1, 0 ) ) AS consultNum,
+
+            sum( IF ( t.building_id = #{buildingId}, 1, 0 ) ) AS buildingNum
+        FROM
+            ta_recommend_customer t
+        WHERE
+            t.org_id = #{orgId}
+            AND t.person_id = #{personId}
+    </select>
 </mapper>