From a99108a6fac63c9459a919ba652efa64013a6ff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 3 Jul 2023 17:25:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=84=8F=E5=90=91=E5=8C=BA=E5=9F=9F=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E6=88=98=E5=8C=BA=20=E4=BD=86=E6=98=AF=E6=88=98?= =?UTF-8?q?=E5=8C=BA=E7=BB=91=E5=AE=9A=E7=9A=84=E7=BB=84=E7=BB=87=E6=9C=BA?= =?UTF-8?q?=E6=9E=84=E4=B8=8B=E6=B2=A1=E4=BA=BA=20=E4=B8=8D=E5=88=86?= =?UTF-8?q?=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/HyPartnerLineInfoServiceImpl.java | 23 +++++++++++++++---- .../cool/store/controller/DeskController.java | 11 +++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java index 7fc9ebb2b..056bd0fce 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java +++ b/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 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 result = new ArrayList<>(); + if (hyIntendDevelopementMappingDO!=null){ + HyIntendDevZoneInfoDO hyIntendDevZoneInfoDO = hyIntendDevZoneInfoDAO.selectById(Long.valueOf(hyIntendDevelopementMappingDO.getMappingId())); + if (hyIntendDevZoneInfoDO!=null && StringUtil.isNotEmpty(hyIntendDevZoneInfoDO.getAssociatedRegionId())) { + List list = JSONObject.parseArray(hyIntendDevZoneInfoDO.getAssociatedRegionId(), String.class); + result.addAll(list); + } + } + List 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 result = new ArrayList<>(); if (hyIntendDevelopementMappingDO!=null){ HyIntendDevZoneInfoDO hyIntendDevZoneInfoDO = hyIntendDevZoneInfoDAO.selectById(Long.valueOf(hyIntendDevelopementMappingDO.getMappingId())); diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java index 431a990e4..953dd7a5f 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java +++ b/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 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({