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

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

@@ -885,6 +885,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
             person.setPersonType(CommConstant.PERSON_ESTATE_CUSTOMER);
         }
         updateById(person);
+        fixCustomerPersonId(person);
 
         // 2. 发放积分
         applicationContext.publishEvent(new EventBus(person, EventBus.EventType.SignUpAgent, orgId));
@@ -928,6 +929,29 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
 
         // 没有置业, 也没楼盘
         if (recPerson == null || 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);
+            taCustomerFromMapper.insert(customerFrom);
+
+
+            TaRecommendCustomer customer = copyByPerosn(person, new TaRecommendCustomer());
+            customer.setVerifyStatus(CommConstant.VERIFY_READY);
+            customer.setStatus(CommConstant.CUSTOMER_REPORT);
+            customer.setEntryType(CommConstant.ENTRY_INPUT);
+            customer.setCreateDate(now);
+            customer.setReportDate(now);
+            customer.setRecommendPerson(promoter);
+            taRecommendCustomerMapper.insert(customer);
+
             return ;
         }
 
@@ -980,20 +1004,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         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 {
-
+    private void fixCustomerPersonId(TaPerson person) {
         // 先更新之前的数据, 有一种可能的情况, 客户是推荐的，之前未进入过小程序
         // 后面所有的查询就可以不需要 phone , 改用 person_id 了
         QueryWrapper<TaRecommendCustomer> q1 = new QueryWrapper<>();
@@ -1008,6 +1019,22 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
                 taRecommendCustomerMapper.updateById(cust);
             }
         }
+    }
+
+
+    /**
+     * 此处逻辑按照复杂流程处理
+     * 除了新增客户外，还有修正原有数据的目的
+     * @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 {
 
         /**
          * 新增客户流程