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

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

                 taPersonQueryWrapper.eq("org_id",taUser.getOrgId());
                 TaPerson taPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
                 if (null != taPerson){
-                    taPerson.setPersonType(CommConstant.PERSON_ESTATE_CUSTOMER);
-                    taPerson.setUserId(null);
-                    taPersonMapper.updateById(taPerson);
+                    taPersonMapper.cancelConsulatant(taPerson.getPersonId());
                 }
             }
         }
         Integer status = isOn ? CommConstant.STATUS_NORMAL : CommConstant.STATUS_CLOSED;
         TaUser user = new TaUser();
         user.setStatus(status);
+        user.setWeight(taUser.getWeight());
 
         QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
         if (CommConstant.LOGIN_TYPE_ADMIN.equals(plat)) {

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

     Integer selectTodayRecentlyCount(@Param("orgId") Integer orgId, @Param("nowDate") LocalDateTime nowDate);
 
     List<Map<String, Object>> selectCityPerson(@Param("orgId") Integer orgId);
+
+    Integer cancelConsulatant(@Param("personId") String personId);
 }

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

                                                            @Param("endDate") LocalDateTime endDate,
                                                            @Param("personId") String personId);
 
+    /**
+     * 查询 person 对应 楼盘 的客户
+     * 如果对应的楼盘没有客户, 则返回无楼盘的, 小程序级别的客户信息
+     * 如果没有无小程序级别客户, 则返回最早的一条
+     * @param orgId
+     * @param personId
+     * @param buildingId
+     * @return
+     */
+    TaRecommendCustomer getCustomerByProjectOrOrg(@Param("orgId") Integer orgId, @Param("personId") String personId, @Param("buildingId") String buildingId);
+
     /**
      * 获取置业福问下的客户
      * @param userId
      * @return
      */
     List<TaRecommendCustomer> getConsultantCustomerList(@Param("userId") Integer userId,@Param("personId") String personId,@Param("buildingId") String buildingId,@Param("orgId") Integer orgId);
+
 }

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

 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
+import org.checkerframework.checker.units.qual.C;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
         //
         LocalDateTime now = LocalDateTime.now();
 
-        // 1. 更新当前人员
+        // 更新人员手机号
         List<TaPerson> persons = getPersonsByOpenId(openid);
         if (null == persons || persons.size() != 1) {
             throw new Exception("当前人员 openid 异常");
         }
         TaPerson person = persons.get(0);
-
-        // 更新人员手机号
         person.setPhone(phone);
         person.setAuthPhoneTime(now);
         if (StringUtils.isEmpty(person.getBuildingId())) {
             person.setPersonType(CommConstant.PERSON_ESTATE_CUSTOMER);
         }
         updateById(person);
-        fixCustomerPersonId(person);
-
-        // 2. 发放积分
-        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));
-        }
-
-        // 3. 处理推广人
-        TaPerson recPerson = taPersonMapper.getById(promoter);
-        if (recPerson != null && CommConstant.STATUS_DELETE.equals(recPerson.getStatus())) {
-            recPerson = null;
-        }
-
-        TaUser taUser = null;
-        List<String> withBuildings = null;  // 推广人授权的楼盘
-        boolean isAssociated = false;       // 传入的楼盘与推广人是否有关联关系
-        boolean isConsultant = false;       // 是否置业顾问
-        if (!StringUtils.isEmpty(promoter)) {
-            taUser = taUserMapper.getUserByPerson(orgId, promoter);
-            if (null != taUser) {
-                isConsultant = taUser != null && taUser.getIsConsultant() != null && taUser.getIsConsultant();
-                List<TaPerson> userPerons = new ArrayList<>();
-                userPerons.add(recPerson);
-                taUser.setPersonIds(userPerons);
-
-                withBuildings = taUserMapper.getBuildingIdsOf(taUser.getUserId(), null);
-
-                if (null != taUser.getIsAdmin() && taUser.getIsAdmin()) {
-                    isAssociated = true;
-                } else {
-                    if (null != withBuildings && withBuildings.size() > 0 && !StringUtils.isEmpty(buildingId)) {
-                        isAssociated = withBuildings.contains(buildingId);
-                    }
-                }
-            }
-        }
-
-        // 楼盘
-        TaBuilding taBuilding = null;
-        if (!StringUtils.isEmpty(buildingId)) {
-            taBuilding = taBuildingMapper.selectById(buildingId);
-            if (taBuilding.getStatus().equals(CommConstant.STATUS_DELETE)) {
-                taBuilding = null;
-            }
-        }
+        // 只要授权手机号, 就是客户
+        // 或者 依据手机号反更新推荐客户中 person_id
+        // 默认场景, 普通人推荐
+        TaRecommendCustomer customer = newOrFixCustomerBy(person, promoter, buildingId);
 
-        // 没有置业, 也没楼盘
-        if ((recPerson == null || !isConsultant) && taBuilding == null) {
-            TaCustomerFrom customerFrom = new TaCustomerFrom();
-            customerFrom.setPersonId(person.getPersonId());
-            customerFrom.setPersonName(StringUtils.ifNull(person.getName(), person.getNickname()));
-            customerFrom.setTargetType(targetType);
-            customerFrom.setTargetId(targetId);
-            customerFrom.setTargetName(targetName);
-            customerFrom.setOrgId(orgId);
-            customerFrom.setSceneId(sceneId);
-            customerFrom.setIsOrgFirst(true);   // 授权手机号, 肯定是第一次
-            customerFrom.setIsProjectFirst(false);
-            customerFrom.setCreateDate(now);
-            if (null != recPerson) {
-                customerFrom.setSharePersonId(recPerson.getPersonId());
-                customerFrom.setSharePersonName(StringUtils.ifNull(recPerson.getName(), recPerson.getNickname()));
-            }
-
-            taCustomerFromMapper.insert(customerFrom);
-
-
-            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(promoter);
-            taRecommendCustomerMapper.insert(customer);
-
-            return ;
-        }
-
-        // 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("生成客户信息异常, 请联系技术人员");
-        }
+        // 发放积分
+        applicationContext.publishEvent(new EventBus(person, EventBus.EventType.SignUpAgent, orgId));
 
-        // 4. 客户来源, 注意不是用户来源
+        // 客户来源
         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);
 
-        if (null != taBuilding) {
+        // 推广人
+        TaPerson recPerson = StringUtils.isEmpty(promoter) ? null : taPersonMapper.getById(promoter);
+        // 是否置业顾问
+        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(taBuilding.getBuildingName());
-            QueryWrapper<TaCustomerFrom> queryWrapper = new QueryWrapper<TaCustomerFrom>();
-            queryWrapper.eq("person_id", person.getPersonId());
-            queryWrapper.eq("org_id", orgId);
-            queryWrapper.eq("building_id", buildingId);
-            if (taCustomerFromMapper.selectList(queryWrapper).size() < 1){
-                customerFrom.setIsProjectFirst(true);
-            }
+            customerFrom.setBuildingName(recBuilding.getBuildingName());
+            customerFrom.setIsProjectFirst(true);
 
-            for (TaRecommendCustomer cust : customers) {
-                if (buildingId.equals(cust.getBuildingId())) {
-                    customerFrom.setCustomerId(cust.getCustomerId());
+            // 客户没楼盘 - 小程序级别公客, 则变成项目级别公客
+            if (StringUtils.isEmpty(customer.getBuildingId())) {
+                customer.setBuildingId(buildingId);
+
+                // 如果项目跟推广人是关联关系, 那么就是私客
+                if (isAssociated) {
+                    customer.setRealtyConsultant(recPerson.getUserId().toString());
                 }
+
+                taRecommendCustomerMapper.updateById(customer);
             }
-        } else if (isConsultant && null != withBuildingList && withBuildingList.size() > 0) {
-            // 没有楼盘则使用置业授权的楼盘
-            customerFrom.setBuildingId(withBuildingList.get(0).getBuildingId());
-            customerFrom.setBuildingName(withBuildingList.get(0).getBuildingName());
         }
+
+        // 推荐人不为空
         if (null != recPerson) {
             customerFrom.setSharePersonId(recPerson.getPersonId());
-            customerFrom.setSharePersonName(StringUtils.ifNull(recPerson.getName(), recPerson.getNickname()));
+            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);
+                }
+            }
         }
 
         taCustomerFromMapper.insert(customerFrom);
     }
 
+    private TaRecommendCustomer newOrFixCustomerBy(TaPerson person, String promoter, String buildingId) {
+        QueryWrapper<TaRecommendCustomer> query = new QueryWrapper<>();
+        query.eq("org_id", person.getOrgId());
+        query.eq("phone", person.getPhone());
+        query.orderByAsc("create_date");
+        List<TaRecommendCustomer> customers = taRecommendCustomerMapper.selectList(query);
+
+        TaRecommendCustomer customer = null;
+        if (null != customers && customers.size() > 0) {
+            for (TaRecommendCustomer cust: customers) {
+                if (null == customer && StringUtils.isEmpty(cust.getBuildingId())) {
+                    customer = cust;
+                }
+
+                if (!StringUtils.isEmpty(buildingId) && buildingId.equals(cust.getBuildingId())) {
+                    customer = cust;
+                }
+
+                // 先更新之前的数据, 有一种可能的情况, 客户是推荐的，之前未进入过小程序
+                // 后面所有的查询就可以不需要 phone , 改用 person_id 了
+                if (StringUtils.isEmpty(cust.getPersonId())) {
+                    cust = copyByPerosn(person, cust);
+                    taRecommendCustomerMapper.updateById(cust);
+                }
+            }
+        }
+
+        if (null == customer) {
+            LocalDateTime now = LocalDateTime.now();
+            customer = copyByPerosn(person, new TaRecommendCustomer());
+            customer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+            customer.setStatus(CommConstant.CUSTOMER_REPORT);
+            customer.setEntryType(StringUtils.isEmpty(promoter) ? CommConstant.ENTRY_VOLUNTEER : CommConstant.ENTRY_INPUT);
+            customer.setCreateDate(now);
+            customer.setReportDate(now);
+            customer.setRecommendPerson(promoter);
+            taRecommendCustomerMapper.insert(customer);
+        }
+
+        return customer;
+    }
+
     private String getSharePersonFrom(TaPerson person){
         QueryWrapper<TaSharePersonFrom> taSharePersonFromQueryWrapper = new QueryWrapper<>();
         taSharePersonFromQueryWrapper.eq("person_id", person.getPersonId());
         }
     }
 
-
     /**
      * 此处逻辑按照复杂流程处理
      * 除了新增客户外，还有修正原有数据的目的

src/main/resources/mapper/TaPersonMapper.xml

             </if>
         </trim>
     </insert>
+
+    <update id="cancelConsulatant">
+        UPDATE ta_person
+        SET  person_type = 'customer', user_id = null
+        WHERE person_id = #{personId}
+    </update>
 </mapper>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

         order by s.report_date desc
     </select>
 
+    <select id="getCustomerByProjectOrOrg" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
+        SELECT
+            *
+        FROM
+            ta_recommend_customer t
+        WHERE
+            t.org_id = #{orgId}
+            AND t.person_id = #{personId}
+        ORDER BY
+            IF( t.building_id = #{buildingId}, 0, 1 ) ASC,
+            IF( ifnull( t.building_id, '' ) = '', 0, 1 ) ASC,
+            t.create_date ASC
+        LIMIT 1
+    </select>
+
     <select id="getConsultantCustomerList" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
         SELECT
             *
             AND t.verify_status = 1
             AND t.realty_consultant IN ( #{userId}, #{personId})
     </select>
-
-
 </mapper>