意向区域绑定战区 但是战区绑定的组织机构下没人 不分配

coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java

@@ -547,24 +547,43 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
 
     @Override
     public Boolean assignFollowUser(String partnerId, String wantShopArea, Integer acceptAdjustType) {
+        log.info("assignFollowUser partnerId:{}，wantShopArea：{}，acceptAdjustType：{}",partnerId,wantShopArea,acceptAdjustType);
         List<HyPartnerLineInfoDO> lineFollowHistoryList = hyPartnerLineInfoDAO.getLineFollowHistoryList(partnerId);
         //当前加盟商线索
         HyPartnerLineInfoDO HyPartnerLineInfo = hyPartnerLineInfoDAO.getByPartnerId(partnerId);
         //如果意向区域没有绑定战区 不分配招商经理
         HyIntendDevelopementMappingDO hyIntendDevelopementMappingDO = hyIntendDevMappingDAO.selectByOpenAreaMappingId(Long.valueOf(wantShopArea), "intent");
         if (hyIntendDevelopementMappingDO==null){
+            log.info("如果意向区域没有绑定战区 不分配招商经理");
             return Boolean.FALSE;
         }
+        List<String> result  = new ArrayList<>();
+        if (hyIntendDevelopementMappingDO!=null){
+            HyIntendDevZoneInfoDO hyIntendDevZoneInfoDO = hyIntendDevZoneInfoDAO.selectById(Long.valueOf(hyIntendDevelopementMappingDO.getMappingId()));
+            if (hyIntendDevZoneInfoDO!=null && StringUtil.isNotEmpty(hyIntendDevZoneInfoDO.getAssociatedRegionId())) {
+                List<String> list = JSONObject.parseArray(hyIntendDevZoneInfoDO.getAssociatedRegionId(), String.class);
+                result.addAll(list);
+            }
+        }
+        List<EnterpriseUserDO> userListByRegionIds = enterpriseUserDAO.getUserListByRegionIds(result);
+        if (CollectionUtils.isEmpty(userListByRegionIds)){
+            log.info("意向区域绑定战区 但是战区绑定的组织机构下没人 不分配");
+            return Boolean.FALSE;
+        }
+
         //如果是私海线索 不需要重新分配招商经理  或者跟进次数大于等于1
         if ((HyPartnerLineInfo != null && HyPartnerLineInfo.getLineStatus()==1) || CollectionUtils.isNotEmpty(lineFollowHistoryList)){
+            log.info("如果是私海线索 不需要重新分配招商经理  或者跟进次数大于等于1 lineStatus:{},lineFollowHistoryList:{}",HyPartnerLineInfo.getLineStatus(),lineFollowHistoryList.size());
             return Boolean.FALSE;
         }
+
         if(HyPartnerLineInfo == null){
             Boolean lineStatus = getLineStatus(Long.valueOf(wantShopArea), acceptAdjustType);
             return lineStatus;
         }
         HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(partnerId);
         Boolean lineStatus = getLineStatus(Long.valueOf(hyPartnerUserInfoDO.getWantShopArea()), hyPartnerUserInfoDO.getAcceptAdjustType());
+        log.info("lineStatus:{}",lineStatus);
         return lineStatus;
     }
 
@@ -618,12 +637,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
         HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(partnerId);
         //意向区域
         String wantShopArea = hyPartnerUserInfoDO.getWantShopArea();
-        EnterpriseUserDO enterpriseUserDO = new EnterpriseUserDO();
         //查询意向区域绑定的组织架构 没有绑定战区 分配空
         HyIntendDevelopementMappingDO hyIntendDevelopementMappingDO = hyIntendDevMappingDAO.selectByOpenAreaMappingId(Long.valueOf(wantShopArea),type);
-        if (hyIntendDevelopementMappingDO==null){
-           return "";
-        }
         List<String> result  = new ArrayList<>();
         if (hyIntendDevelopementMappingDO!=null){
             HyIntendDevZoneInfoDO hyIntendDevZoneInfoDO = hyIntendDevZoneInfoDAO.selectById(Long.valueOf(hyIntendDevelopementMappingDO.getMappingId()));

coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java

@@ -286,6 +286,17 @@ public class DeskController {
         return ResponseResult.success(hyPartnerLineInfoService.getAssignFollowUser(partnerId,type));
     }
 
+    @GetMapping(path = "/assignFollowUser")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "partnerId", value = "partnerId", required = false),
+    })
+    public ResponseResult<Boolean> getFollowHistory(@RequestParam(value = "partnerId",required = false)String partnerId,
+                                                   @RequestParam(value = "wantShopArea",required = false)String wantShopArea,
+                                                   @RequestParam(value = "acceptAdjustType",required = false)Integer acceptAdjustType){
+        return ResponseResult.success(hyPartnerLineInfoService.assignFollowUser(partnerId,wantShopArea,acceptAdjustType));
+    }
+
+
     @GetMapping(path = "/getInterviewInfoByLineId")
     @ApiOperation("查询加盟商线索详情 根据线索信息查询面试信息")
     @ApiImplicitParams({