bug fix

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

@@ -187,5 +187,5 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
      * @return
      * @throws Exception
      */
-    List<TaRecommendCustomer> newCustomer(Integer orgId, TaPerson person, TaPerson recommender, TaUser consultant, TaBuilding building, TaCustomerFrom from) throws Exception;
+    List<TaRecommendCustomer> newCustomer(Integer orgId, TaPerson person, TaPerson recommender, TaPerson consultant, TaBuilding building, TaCustomerFrom from) throws Exception;
 }

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

@@ -930,10 +930,9 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         TaBuilding building = StringUtils.isEmpty(buildingId) ? null : taBuildingMapper.selectById(buildingId);
         // 是否置业顾问
         boolean isConsultant = null != recPerson && CommConstant.PERSON_REALTY_CONSULTANT.equals(recPerson.getPersonType());
-        TaUser consultant = isConsultant ? taUserMapper.selectById(recPerson.getUserId()) : null;
 
         try {
-            List<TaRecommendCustomer> customerList = iTaRecommendCustomerService.newCustomer(orgId, person, recPerson, consultant, building, customerFrom);
+            List<TaRecommendCustomer> customerList = iTaRecommendCustomerService.newCustomer(orgId, person, recPerson, isConsultant ? recPerson : null, building, customerFrom);
             if (customerList.size() > 0) {
                 // 发放积分
                 applicationContext.publishEvent(new EventBus(person, EventBus.EventType.SignUpAgent, orgId));

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

@@ -174,7 +174,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public List<TaRecommendCustomer> newCustomer(Integer orgId, TaPerson person, TaPerson recommender, TaUser consultant, TaBuilding building, TaCustomerFrom from) throws Exception {
+    public List<TaRecommendCustomer> newCustomer(Integer orgId, TaPerson person, TaPerson recommender, TaPerson consultant, TaBuilding building, TaCustomerFrom from) throws Exception {
         // 如果置业推荐了非自己绑定楼盘, 会生成 2 条客户记录
         List<TaRecommendCustomer> result = new ArrayList<>();
         List<TaBuilding> consultBuildings = null;
@@ -186,11 +186,17 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             }
         }
 
+        //
+        LocalDateTime now = LocalDateTime.now();
+        from.setOrgId(orgId);
+        from.setPersonId(person.getPersonId());
+        from.setPersonName(StringUtils.ifNull(person.getName(), person.getNickname()));
+        from.setCreateDate(now);
+
         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;