Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/controller/MiniAppController.java

 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.mapper.TaOrgCityMapper;
+import com.huiju.estateagents.mapper.TaSalesBatchMapper;
 import com.huiju.estateagents.service.*;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
 import me.chanjar.weixin.common.error.WxErrorException;
     @Autowired
     private ITaDrainageService taDrainageService;
 
+    @Autowired
+    private TaSalesBatchMapper taSalesBatchMapper;
+
     /**
      * 验证接入
      */
                     TaDrainage taDrainage = taDrainageService.getById(targetId);
                     taSharePersonFrom.setBuildingId(taDrainage.getBuildingId());
                     sharePersonFromQueryWrapper.eq("building_id", taDrainage.getBuildingId());
+                }else if (from.contains("house")) {
+                    TaSalesBatch taSalesBatch = taSalesBatchMapper.selectById(targetId);
+                    taSharePersonFrom.setBuildingId(taSalesBatch.getBuildingId());
+                    sharePersonFromQueryWrapper.eq("building_id", taSalesBatch.getBuildingId());
                 }
                 Integer isFirstTime = taSharePersonFromService.count(sharePersonFromQueryWrapper);
                 if (isFirstTime > 0) {

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

 import com.huiju.estateagents.entity.TaCustomerFrom;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
 
 /**
  * <p>
 @Mapper
 public interface TaCustomerFromMapper extends BaseMapper<TaCustomerFrom> {
 
+    Map<String, Number> countPerson(@Param("orgId") Integer orgId, @Param("buildingId") String buildingId, @Param("personId") String personId);
 }

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

 
                 withBuildings = taUserMapper.getBuildingIdsOf(taUser.getUserId(), null);
 
-                if (taUser.getIsAdmin()) {
+                if (null != taUser.getIsAdmin() && taUser.getIsAdmin()) {
                     isAssociated = true;
                 } else {
                     if (null != withBuildings && withBuildings.size() > 0 && !StringUtils.isEmpty(buildingId)) {
             return ;
         }
 
-        // 3. 处理客户, 没有新增一条记录, 有就依据手机号建立关联
-        TaRecommendCustomer customer = mergeCustomerByPhone(person, taUser, taBuilding, isAssociated, now);
+        // 3. 修正客户信息
+        List<TaBuilding> withBuildingList = null;
+        if (null != withBuildings && withBuildings.size() > 0) {
+            QueryWrapper<TaBuilding> queryBuilding = new QueryWrapper<>();
+            queryBuilding.in("building_id", withBuildings);
+            withBuildingList = taBuildingMapper.selectList(queryBuilding);
+        }
+        List<TaRecommendCustomer> customers = mergeCustomerByPhone(person, taUser, taBuilding, withBuildingList, isAssociated, now);
+        if (null == customers || customers.size() == 0) {
+            throw new Exception("生成客户信息异常, 请联系技术人员");
+        }
 
         // 4. 客户来源, 注意不是用户来源
         TaCustomerFrom customerFrom = new TaCustomerFrom();
         customerFrom.setPersonId(person.getPersonId());
-        customerFrom.setCustomerId(customer != null ? customer.getCustomerId() :  null);    // 辅助字段, 不必填
         customerFrom.setPersonName(StringUtils.ifNull(person.getName(), person.getNickname()));
         customerFrom.setTargetType(targetType);
         customerFrom.setTargetId(targetId);
         customerFrom.setTargetName(targetName);
-        customerFrom.setOrgId(person.getOrgId());
+        customerFrom.setOrgId(orgId);
         customerFrom.setSceneId(sceneId);
-        customerFrom.setIsOrgFirst(true);   // 授权手机号, 肯定是首次进入
+        customerFrom.setIsOrgFirst(true);   // 授权手机号, 肯定是第一次
         customerFrom.setCreateDate(now);
 
         if (null != taBuilding) {
             customerFrom.setBuildingId(buildingId);
             customerFrom.setBuildingName(taBuilding.getBuildingName());
             customerFrom.setIsProjectFirst(true);
+
+            for (TaRecommendCustomer cust : customers) {
+                if (buildingId.equals(cust.getBuildingId())) {
+                    customerFrom.setCustomerId(cust.getCustomerId());
+                }
+            }
         }
         if (null != recPerson) {
             customerFrom.setSharePersonId(recPerson.getPersonId());
         taCustomerFromMapper.insert(customerFrom);
     }
 
+    /**
+     * 此处逻辑按照复杂流程处理
+     * 除了新增客户外，还有修正原有数据的目的
+     * @param person
+     * @param taUser
+     * @param building
+     * @param withBuildings
+     * @param isAssociated
+     * @param now
+     * @return
+     * @throws Exception
+     */
+    private List<TaRecommendCustomer> mergeCustomerByPhone(TaPerson person, TaUser taUser, TaBuilding building, List<TaBuilding> withBuildings, boolean isAssociated, LocalDateTime now) throws Exception {
+
+        // 先更新之前的数据, 有一种可能的情况, 客户是推荐的，之前未进入过小程序
+        // 后面所有的查询就可以不需要 phone , 改用 person_id 了
+        QueryWrapper<TaRecommendCustomer> q1 = new QueryWrapper<>();
+        q1.eq("org_id", person.getOrgId());
+        q1.eq("phone", person.getPhone());
+        q1.isNull("person_id");
+        List<TaRecommendCustomer> customers = taRecommendCustomerMapper.selectList(q1);
+        if (null != customers) {
+            for (int i = 0; i < customers.size(); i++) {
+                TaRecommendCustomer cust = customers.get(i);
+                cust = copyByPerosn(person, cust);
+                taRecommendCustomerMapper.updateById(cust);
+            }
+        }
+
+        /**
+         * 新增客户流程
+         * 1. 推广人是置业, 楼盘跟置业关联 => return 新增一条客户
+         * 2. 有楼盘  => 新增一条项目公客  continue
+         * 3. 有推广人 => 更新为私客, 或者新增一条公客 continue
+         * 4. return
+         */
 
-    private TaRecommendCustomer mergeCustomerByPhone(TaPerson person, TaUser taUser, TaBuilding building, boolean isAssociated, LocalDateTime now) throws Exception {
         TaPerson recPerson = null;
         if (null != taUser) {
             recPerson = taUser.getPersonIds().get(0);
         }
-
-        QueryWrapper<TaRecommendCustomer> query = new QueryWrapper<>();
-        query.eq("org_id", person.getOrgId());
-        query.eq("phone", person.getPhone());
-
-        List<TaRecommendCustomer> customers = taRecommendCustomerMapper.selectList(query);
-
-        // 如果用户不存在, 则新建一个
-        // 推广人为 TaUser
-        if (null == customers || customers.size() == 0) {
-            TaRecommendCustomer customer = copyByPerosn(person, new TaRecommendCustomer());
-            customer.setVerifyStatus(CommConstant.VERIFY_AGREE);
-            customer.setStatus(CommConstant.CUSTOMER_REPORT);
-            customer.setEntryType(CommConstant.ENTRY_INPUT);
-            customer.setCreateDate(now);
-            if (null != recPerson) {
+        // 推广人是否置业
+        boolean isConsultant = taUser != null && taUser.getIsConsultant() != null && taUser.getIsConsultant();
+        // 置业授权的楼盘
+        TaBuilding taBuilding = null != withBuildings ? withBuildings.get(0) : null;
+
+        // 1. 如果置业跟楼盘是关联的
+        if (isAssociated) {
+            // 查询是否已经存在记录
+            QueryWrapper<TaRecommendCustomer> q2 = new QueryWrapper<>();
+            q2.eq("org_id", person.getOrgId());
+            q2.eq("building_id", building.getBuildingId());
+            q2.eq("person_id", person.getPersonId());
+            List<TaRecommendCustomer> existsRows = taRecommendCustomerMapper.selectList(q2);
+
+            if (null == existsRows || existsRows.size() < 1) {
+                TaRecommendCustomer customer = copyByPerosn(person, new TaRecommendCustomer());
+                customer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+                customer.setStatus(CommConstant.CUSTOMER_REPORT);
+                customer.setEntryType(CommConstant.ENTRY_INPUT);
+                customer.setCreateDate(now);
+                customer.setReportDate(now);
                 customer.setRecommendPerson(recPerson.getPersonId());
-            }
-
-            if (taUser.getIsConsultant()) {
                 customer.setRealtyConsultant(taUser.getUserId().toString());
+                customer.setBuildingId(building.getBuildingId());
+                customer.setIntention(building.getBuildingName());
+                taRecommendCustomerMapper.insert(customer);
+
+                return new ArrayList<TaRecommendCustomer>(){{
+                    add(customer);
+                }};
             }
+        }
 
-            if (null != building && (isAssociated || null == taUser)) {
+        // 2. 有楼盘
+        if (null != building) {
+            // 查询是否已经存在记录
+            QueryWrapper<TaRecommendCustomer> q3 = new QueryWrapper<>();
+            q3.eq("org_id", person.getOrgId());
+            q3.eq("building_id", building.getBuildingId());
+            q3.eq("person_id", person.getPersonId());
+            List<TaRecommendCustomer> existsRows = taRecommendCustomerMapper.selectList(q3);
+
+            if (null == existsRows || existsRows.size() < 1) {
+                TaRecommendCustomer customer = copyByPerosn(person, new TaRecommendCustomer());
+                customer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+                customer.setStatus(CommConstant.CUSTOMER_REPORT);
+                customer.setEntryType(CommConstant.ENTRY_INPUT);
+                customer.setCreateDate(now);
+                customer.setReportDate(now);
                 customer.setBuildingId(building.getBuildingId());
                 customer.setIntention(building.getBuildingName());
+                taRecommendCustomerMapper.insert(customer);
             }
+        }
 
-            taRecommendCustomerMapper.insert(customer);
-            return customer;
-        } else {
-            for (int i = 0; i < customers.size(); i++) {
-                TaRecommendCustomer customer = customers.get(i);
-                if (null == customer.getPersonId()) {
-                    customer = copyByPerosn(person, customer);
+        // 3. 有推广人
+        if (null != recPerson) {
+            if (isConsultant) {
+                // 如果是置业, 需要验证是否置业所在项目的客户
+                if (null != taBuilding) {
+                    // 查询是否已经存在记录
+                    // 客户是以项目为纬度的, 因此验证查询不能加置业的条件
+                    QueryWrapper<TaRecommendCustomer> q4 = new QueryWrapper<>();
+                    q4.eq("org_id", person.getOrgId());
+                    q4.eq("building_id", taBuilding.getBuildingId());
+                    q4.eq("person_id", person.getPersonId());
+                    List<TaRecommendCustomer> existsRows = taRecommendCustomerMapper.selectList(q4);
+
+                    if (null == existsRows || existsRows.size() < 1) {
+                        TaRecommendCustomer customer = copyByPerosn(person, new TaRecommendCustomer());
+                        customer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+                        customer.setStatus(CommConstant.CUSTOMER_REPORT);
+                        customer.setEntryType(CommConstant.ENTRY_INPUT);
+                        customer.setCreateDate(now);
+                        customer.setReportDate(now);
+                        customer.setRecommendPerson(recPerson.getPersonId());
+                        customer.setRealtyConsultant(taUser.getUserId().toString());
+                        customer.setBuildingId(taBuilding.getBuildingId());
+                        customer.setIntention(taBuilding.getBuildingName());
+                        taRecommendCustomerMapper.insert(customer);
+                    } else {
+                        // 如果存在项目公客, 把公客绑定为置业的私客
+                        for (int i = 0; i < existsRows.size(); i ++) {
+                            TaRecommendCustomer cust = existsRows.get(0);
+                            if (StringUtils.isEmpty(cust.getRealtyConsultant())) {
+                                cust.setRealtyConsultant(taUser.getUserId().toString());
+                                cust.setReportDate(now);    // 这个更新会覆盖原来的真实时间
+                                taRecommendCustomerMapper.updateById(cust);
+                                break;
+                            }
+                        }
+                    }
                 }
+            }
 
-                if (taUser.getIsConsultant() && StringUtils.isEmpty(customer.getRealtyConsultant())) {
-                    customer.setRealtyConsultant(taUser.getUserId().toString());
+            // 如果不是置业, 那么就是普通人推荐
+            // 如果置业没有绑定项目, 则认为置业是以普通人身份推荐
+            // 新增一个公客
+            if (!isConsultant || null == taBuilding) {
+                // 查询是否已经存在记录
+                QueryWrapper<TaRecommendCustomer> q5 = new QueryWrapper<>();
+                q5.eq("org_id", person.getOrgId());
+                q5.eq("person_id", person.getPersonId());
+                List<TaRecommendCustomer> existsRows = taRecommendCustomerMapper.selectList(q5);
+
+                if (null == existsRows || existsRows.size() < 1) {
+                    TaRecommendCustomer customer = copyByPerosn(person, new TaRecommendCustomer());
+                    customer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+                    customer.setStatus(CommConstant.CUSTOMER_REPORT);
+                    customer.setEntryType(CommConstant.ENTRY_INPUT);
+                    customer.setCreateDate(now);
+                    customer.setReportDate(now);
+                    customer.setRecommendPerson(recPerson.getPersonId());
+                    taRecommendCustomerMapper.insert(customer);
                 }
+            }
+        }
 
-                if (building != null && (isAssociated || null == taUser)) {
-                    if (StringUtils.isEmpty(customer.getBuildingId())) {
-                        customer.setBuildingId(building.getBuildingId());
-                    }
-                    if (StringUtils.isEmpty(customer.getIntention())) {
-                        customer.setIntention(building.getBuildingName());
-                    }
-                }
+        // 返回当前人作为客户的数据
+        QueryWrapper<TaRecommendCustomer> query = new QueryWrapper<>();
+        query.eq("org_id", person.getOrgId());
+        query.eq("person_id", person.getPersonId());
 
-                taRecommendCustomerMapper.updateById(customer);
-            }
-            return null;
+        List<String> buildingIds = new ArrayList<>();
+        if (null != building) {
+            buildingIds.add(building.getBuildingId());
         }
+        if (null != taBuilding) {
+            buildingIds.add(taBuilding.getBuildingId());
+        }
+
+        query.in(buildingIds.size() > 0,"building_id", buildingIds);
+        query.orderByAsc("create_date");
+        return taRecommendCustomerMapper.selectList(query);
     }
 
     private TaRecommendCustomer copyByPerosn(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()));

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

 //        taRecommendCustomer.setRecommendPerson(taPerson.getPersonId());
         taRecommendCustomer.setRecommendPerson(params.getString("realtyConsultant"));
 
+        // 插入客户来源逻辑, 防止下面 if 里面的 return
+        // 首次报备的客户, 写入客户来源表
+        TaCustomerFrom customerFrom = null;
+        if (!StringUtils.isEmpty(taRecommendCustomer.getBuildingId())) {
+            Map<String, Number> counter = taCustomerFromMapper.countPerson(taRecommendCustomer.getOrgId(), taRecommendCustomer.getBuildingId() ,taRecommendCustomer.getPersonId());
+            boolean orgFirst = counter.get("orgCount").longValue() < 1;
+            boolean projectFirst = counter.get("projectCount").longValue() < 1;
+            if (projectFirst) {
+                TaBuilding taBuilding = taBuildingMapper.selectById(taRecommendCustomer.getBuildingId());
+
+                customerFrom = new TaCustomerFrom();
+                customerFrom.setPersonId(taRecommendCustomer.getPersonId());
+                customerFrom.setCustomerId(taRecommendCustomer.getCustomerId());
+                customerFrom.setPersonName(taRecommendCustomer.getName());
+                customerFrom.setOrgId(taRecommendCustomer.getOrgId());
+//              customerFrom.setSceneId(sceneId);
+                customerFrom.setIsOrgFirst(orgFirst);
+                customerFrom.setIsProjectFirst(true);
+                customerFrom.setCreateDate(LocalDateTime.now());
+                customerFrom.setBuildingId(taRecommendCustomer.getBuildingId());
+                customerFrom.setBuildingName(taBuilding.getBuildingName());
+                customerFrom.setSharePersonId(consultantPerson.getPersonId());
+                customerFrom.setSharePersonName(consultantUser.getUserName());
+
+                // 半小时内如果有当前人员的分享记录
+                // 那么就认为当前客户是通过分享进入的
+                TaSharePersonFrom personShare = taSharePersonFromMapper.getConsultantLastShare(taRecommendCustomer.getOrgId(),
+                        taRecommendCustomer.getBuildingId(),
+                        consultantUser.getUserId(),
+                        taRecommendCustomer.getPersonId());
+                if (null != personShare) {
+                    // 强制转换 targetType
+                    String targetType = personShare.getTargetType().replace("_share", "").replace("dynamic", "activity");
+                    customerFrom.setTargetType(targetType);
+                    customerFrom.setTargetId(personShare.getTargetId());
+                    customerFrom.setTargetName(personShare.getTargetName());
+                }
+
+                taCustomerFromMapper.insert(customerFrom);
+            }
+        }
+
+
         // 报备有 10 天有效期
         QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("phone", taRecommendCustomer.getPhone());
         if (row < 1) {
             return ResponseBean.error("报备客户失败", ResponseBean.ERROR_UNAVAILABLE);
         }
+        if (null != customerFrom) {
+            customerFrom.setCustomerId(taRecommendCustomer.getCustomerId());
+            taCustomerFromMapper.updateById(customerFrom);
+        }
 
         // 找到销售经理，并推送消息
 //        TaPerson saleMan = taPersonMapper.getSalesExecutive();
 //            iMiniAppService.sendNewCustomerMessage(saleMan, CommConstant.MINIAPP_INDEX, taRecommendCustomer.getName(), taRecommendCustomer.getPhone(), "", taPerson.getName());
 //        }
 
-        // 首次报备的客户, 写入客户来源表
-        if (!StringUtils.isEmpty(taRecommendCustomer.getBuildingId())) {
-            QueryWrapper<TaCustomerFrom> queryFrom = new QueryWrapper<>();
-            queryFrom.eq("org_id", taRecommendCustomer.getOrgId());
-            queryFrom.eq("building_id", taRecommendCustomer.getBuildingId());
-            boolean has = taCustomerFromMapper.selectCount(queryFrom) > 0;
-            if (!has) {
-                TaBuilding taBuilding = taBuildingMapper.selectById(taRecommendCustomer.getBuildingId());
-
-                TaCustomerFrom customerFrom = new TaCustomerFrom();
-                customerFrom.setPersonId(taRecommendCustomer.getPersonId());
-                customerFrom.setCustomerId(taRecommendCustomer.getCustomerId());
-                customerFrom.setPersonName(taRecommendCustomer.getName());
-                customerFrom.setOrgId(taRecommendCustomer.getOrgId());
-//              customerFrom.setSceneId(sceneId);
-                customerFrom.setIsOrgFirst(false);
-                customerFrom.setIsProjectFirst(true);
-                customerFrom.setCreateDate(LocalDateTime.now());
-                customerFrom.setBuildingId(taRecommendCustomer.getBuildingId());
-                customerFrom.setBuildingName(taBuilding.getBuildingName());
-                customerFrom.setSharePersonId(consultantPerson.getPersonId());
-                customerFrom.setSharePersonName(consultantUser.getUserName());
-
-                // 半小时内如果有当前人员的分享记录
-                // 那么就认为当前客户是通过分享进入的
-                TaSharePersonFrom personShare = taSharePersonFromMapper.getConsultantLastShare(taRecommendCustomer.getOrgId(),
-                        taRecommendCustomer.getBuildingId(),
-                        consultantUser.getUserId(),
-                        taRecommendCustomer.getPersonId());
-                if (null != personShare) {
-                    // 强制转换 targetType
-                    String targetType = personShare.getTargetType().replace("_share", "").replace("dynamic", "activity");
-                    customerFrom.setTargetType(targetType);
-                    customerFrom.setTargetId(personShare.getTargetId());
-                    customerFrom.setTargetName(personShare.getTargetName());
-                }
-
-                taCustomerFromMapper.insert(customerFrom);
-            }
-        }
-
         return ResponseBean.success(taRecommendCustomer);
     }
 

src/main/resources/mapper/TaCustomerFromMapper.xml

 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaCustomerFromMapper">
 
+    <select id="countPerson" resultType="java.util.HashMap">
+        SELECT
+            count( 1 ) AS orgCount,
+            IFNULL( sum( IF ( t.building_id = #{buildingId}, 1, 0 ) ), 0 ) AS projectCount
+        FROM
+            ta_customer_from t
+        WHERE
+            t.org_id = #{orgId}
+        AND t.person_id = #{personId}
+    </select>
 </mapper>

src/main/resources/mapper/TsConsultantKpiMapper.xml

             e.create_date as visit_time
         FROM ta_customer_from e
         INNER JOIN ta_person t ON t.person_id = e.person_id
+        INNER JOIN ta_person s ON s.person_id = e.share_person_id
         WHERE e.org_id = #{orgId}
         <if test="buildingId != null and buildingId !=''">
             AND e.building_id = #{buildingId}
         AND e.target_type is not null
         AND e.create_date BETWEEN #{startDate} and #{endDate}
         AND e.is_project_first = 1
-        AND t.user_id = #{userId}
+        AND s.user_id = #{userId}
 
         AND t.person_type != 'Realty Consultant'