* bug fix

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -233,6 +233,12 @@ public class TaUser implements Serializable {
     @TableField(exist = false)
     private List<TaPerson> personIds;
 
+    /**
+     * customerId集合
+     */
+    @TableField(exist = false)
+    private List<TaRecommendCustomer> customerIds;
+
     @TableField(exist = false)
     private String miniAppName;
 }

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

@@ -453,7 +453,7 @@ public class TaRecommendCustomerController extends BaseController {
      */
     @RequestMapping(value = "/admin/customer/consultant/batchAssist", method = RequestMethod.POST)
     public ResponseBean batchAssistConsultant(@RequestBody TaUser taUser, HttpServletRequest request) {
-        if (CollectionUtils.isEmpty(taUser.getPersonIds())) {
+        if (CollectionUtils.isEmpty(taUser.getCustomerIds())) {
             return ResponseBean.error("请至少选择一条数据", ResponseBean.ERROR_UNAVAILABLE);
         }
         try {

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

@@ -25,6 +25,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.statistic.entity.TaCustomerFollowUpRecord;
 import com.huiju.estateagents.statistic.mapper.TaCustomerFollowUpRecordMapper;
 import org.apache.commons.collections.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -44,6 +46,8 @@ import java.util.Map;
 @Service
 public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCustomerMapper, TaRecommendCustomer> implements ITaRecommendCustomerService {
 
+    private Logger logger = LoggerFactory.getLogger(TaRecommendCustomerServiceImpl.class);
+
     @Autowired
     TaPersonMapper taPersonMapper;
 
@@ -835,9 +839,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
     @Override
     public ResponseBean batchConsultantAssist(TaUser taUser, Integer orgId) {
-        if (CollectionUtils.isNotEmpty(taUser.getPersonIds())) {
-            for (TaPerson taPerson : taUser.getPersonIds()) {
-                consultantAssist(taUser, taPerson.getPersonId(), orgId);
+        if (CollectionUtils.isNotEmpty(taUser.getCustomerIds())) {
+            for (TaRecommendCustomer taRecommendCustomer : taUser.getCustomerIds()) {
+                consultantAssist(taUser, taRecommendCustomer.getCustomerId(), orgId);
             }
         }
         return ResponseBean.success("操作成功");
@@ -845,6 +849,8 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
     @Override
     public ResponseBean consultantAssist(TaUser taUser, String customerId, Integer orgId) {
+        logger.info("公客分配置业顾问 接收参数，taUser={}，customerId={}，orgId={}",
+                JSONObject.toJSONString(taUser), customerId, orgId);
 
         // 1.校验置业顾问
         QueryWrapper<TaUser> queryWrapper = new QueryWrapper();
@@ -855,27 +861,46 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         taPersonBuildingQueryWrapper.eq("user_id", taUser.getUserId());
         TaPersonBuilding taPersonBuilding = taPersonBuildingMapper.selectOne(taPersonBuildingQueryWrapper);
 
-        if (null == userInfo || CommConstant.STATUS_NORMAL != userInfo.getStatus() ) {
+        if (null == userInfo || CommConstant.STATUS_NORMAL != userInfo.getStatus()) {
             return ResponseBean.error("置业顾问不存在或已被注销", ResponseBean.ERROR_UNAVAILABLE);
         }
 
         // 2.根据customerId获取personId
-        TaRecommendCustomer recommendCustomerInfo = taRecommendCustomerMapper.selectById(customerId);
-        if(recommendCustomerInfo == null){
-            return ResponseBean.error("分配客户失败",ResponseBean.ERROR_UNAVAILABLE);
+        QueryWrapper<TaRecommendCustomer> customerQueryWrapper = new QueryWrapper<>();
+        customerQueryWrapper.eq("customer_id", customerId);
+        customerQueryWrapper.isNull("realty_consultant");
+        TaRecommendCustomer customerInfo = taRecommendCustomerMapper.selectOne(customerQueryWrapper);
+        if (customerInfo == null) {
+            logger.info("公客分配置业顾问 customerInfo为空");
+            return ResponseBean.error("分配客户失败", ResponseBean.ERROR_UNAVAILABLE);
         }
 
         // 3.判断是否有buildingId,有则直接更新数据
-        if(!StringUtils.isEmpty(recommendCustomerInfo.getBuildingId()) && StringUtils.isEmpty(recommendCustomerInfo.getRealtyConsultant())){
-            log.error("公客添加置业顾问 customer:" + JSONObject.toJSONString(recommendCustomerInfo));
-            recommendCustomerInfo.setRealtyConsultant(userInfo.getUserId().toString());
-            return ResponseBean.success(taRecommendCustomerMapper.updateById(recommendCustomerInfo));
+        if (!StringUtils.isEmpty(customerInfo.getBuildingId())) {
+            logger.info("公客分配置业顾问 customer={}", JSONObject.toJSONString(customerInfo));
+            customerInfo.setRealtyConsultant(userInfo.getUserId().toString());
+            return ResponseBean.success(taRecommendCustomerMapper.updateById(customerInfo));
+        }
+
+        // 4.校验公客是否已经是分配项目下的私客
+        QueryWrapper<TaRecommendCustomer> customerQueryWrapper2 = new QueryWrapper<>();
+        customerQueryWrapper2.eq("org_id", orgId);
+        customerQueryWrapper2.eq("person_id", customerInfo.getPersonId());
+        customerQueryWrapper2.eq("building_id", taPersonBuilding.getBuildingId());
+        customerQueryWrapper2.eq("status", CommConstant.CUSTOMER_REPORT);
+        customerQueryWrapper2.eq("verify_status", CommConstant.VERIFY_AGREE);
+        customerQueryWrapper2.isNotNull("realty_consultant");
+        TaRecommendCustomer customerInfo2 = taRecommendCustomerMapper.selectOne(customerQueryWrapper2);
+        if (customerInfo2 != null) {
+            logger.info("公客分配置业顾问 customerInfo2为空");
+            return ResponseBean.error("分配客户失败", ResponseBean.ERROR_UNAVAILABLE);
         }
 
-        // 4.无buildingId，新增一条私客数据
-        TaPerson taPerson = taPersonMapper.getById(recommendCustomerInfo.getPersonId());
-        if(taPerson == null){
-            return ResponseBean.error("分配客户失败",ResponseBean.ERROR_UNAVAILABLE);
+        // 5.无buildingId，新增一条私客数据
+        TaPerson taPerson = taPersonMapper.getById(customerInfo.getPersonId());
+        if (taPerson == null) {
+            logger.info("公客分配置业顾问 taPerson为空");
+            return ResponseBean.error("分配客户失败", ResponseBean.ERROR_UNAVAILABLE);
         }
 
         TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();