From 34f25bb62d60696f4d98f42fd42330d7a0f1eb00 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Tue, 20 Jun 2023 13:43:26 +0800 Subject: [PATCH] update --- .../com/cool/store/dao/EnterpriseUserDAO.java | 7 ++++ .../store/mapper/EnterpriseUserMapper.java | 6 ++++ .../resources/mapper/EnterpriseUserMapper.xml | 9 ++++++ .../request/IntentAreaSettingRequest.java | 2 +- .../store/vo/EnterpriseUserSingleInfoVO.java | 21 ++++++++++++ .../store/service/EnterpriseUserService.java | 7 ++++ .../impl/EnterpriseUserServiceImpl.java | 32 ++++++++++++------- .../store/service/impl/ZoneServiceImpl.java | 2 +- .../cool/store/controller/TestController.java | 10 ++++++ .../main/resources/application-dev.properties | 2 +- .../main/resources/application-hd.properties | 2 +- .../resources/application-test.properties | 2 +- .../main/resources/application-dev.properties | 2 +- .../resources/application-local.properties | 2 +- 14 files changed, 88 insertions(+), 18 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java index c2b568388..4b9736dfd 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java @@ -83,4 +83,11 @@ public class EnterpriseUserDAO { } return enterpriseUserMapper.getUserListByDeptLeader(regionId); } + + public List getUserListByDeptLeaders(List regionIds){ + if(CollectionUtils.isEmpty(regionIds)){ + return Lists.newArrayList(); + } + return enterpriseUserMapper.getUserListByDeptLeaders(regionIds); + } } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java index 81a4bd25b..3360d9b63 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java @@ -77,4 +77,10 @@ public interface EnterpriseUserMapper { */ List getUserListByDeptLeader(String regionId); + /** + * 根据开发经理获取用户列表 + * @param regionIds + * @return + */ + List getUserListByDeptLeaders(@Param("regionIds") List regionIds); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml index 05e6c11b8..95d7dedc8 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml @@ -288,4 +288,13 @@ + + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/IntentAreaSettingRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/IntentAreaSettingRequest.java index 12c80bfce..4009e80c5 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/IntentAreaSettingRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/IntentAreaSettingRequest.java @@ -22,7 +22,7 @@ public class IntentAreaSettingRequest { @ApiModelProperty("战区名称") private String zoneName; @ApiModelProperty("组织机构ID集合") - private List orgIdList; + private List orgIdList; @ApiModelProperty("开放区域id集合") private List openAreaIdList; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/EnterpriseUserSingleInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/EnterpriseUserSingleInfoVO.java index e08f6e3cd..7c3eb8b56 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/EnterpriseUserSingleInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/EnterpriseUserSingleInfoVO.java @@ -1,6 +1,12 @@ package com.cool.store.vo; +import com.cool.store.entity.EnterpriseUserDO; +import com.google.common.collect.Lists; import lombok.Data; +import org.apache.commons.collections4.CollectionUtils; + +import java.util.ArrayList; +import java.util.List; /** * @Author suzhuhong @@ -15,4 +21,19 @@ public class EnterpriseUserSingleInfoVO { private String userName; private String mobile; + + public static List convertVO(List userList){ + if(CollectionUtils.isEmpty(userList)){ + return Lists.newArrayList(); + } + List resultList = new ArrayList<>(); + for (EnterpriseUserDO enterpriseUser : userList) { + EnterpriseUserSingleInfoVO result = new EnterpriseUserSingleInfoVO(); + result.setUserId(enterpriseUser.getUserId()); + result.setUserName(enterpriseUser.getName()); + result.setMobile(enterpriseUser.getMobile()); + resultList.add(result); + } + return resultList; + } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseUserService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseUserService.java index 675b05ba2..8d5d0addf 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseUserService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseUserService.java @@ -35,4 +35,11 @@ public interface EnterpriseUserService { List getDevelopmentDirectorList(String wantShopArea); + /** + * 根据意向区域获取开发主管 + * @param zoneId + * @return + */ + EnterpriseUserDO getDevelopmentByZoneId(Long zoneId); + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseUserServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseUserServiceImpl.java index f30d0cd05..135dcf49a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseUserServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseUserServiceImpl.java @@ -13,6 +13,7 @@ import com.cool.store.service.ZoneService; import com.cool.store.vo.EnterpriseUserSingleInfoVO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.*; @@ -82,15 +83,7 @@ public class EnterpriseUserServiceImpl implements EnterpriseUserService { if (CommonConstants.TRANSFER.equals(type)){ enterpriseUserDOS = enterpriseUserDAO.searchUserByRegionIdsAndKeyword(new ArrayList<>(regionList), keyword, Boolean.TRUE); } - List enterpriseUserSingleInfoVOS = new ArrayList<>(); - enterpriseUserDOS.forEach(x->{ - EnterpriseUserSingleInfoVO enterpriseUserSingleInfoVO = new EnterpriseUserSingleInfoVO(); - enterpriseUserSingleInfoVO.setUserId(x.getUserId()); - enterpriseUserSingleInfoVO.setUserName(x.getName()); - enterpriseUserSingleInfoVO.setMobile(x.getMobile()); - enterpriseUserSingleInfoVOS.add(enterpriseUserSingleInfoVO); - }); - return enterpriseUserSingleInfoVOS; + return EnterpriseUserSingleInfoVO.convertVO(enterpriseUserDOS); } @Override @@ -125,7 +118,7 @@ public class EnterpriseUserServiceImpl implements EnterpriseUserService { result.setInvestmentUserIds(userList); } //开发区域 - List developementList = zoneInfoList.stream().filter(o -> "developement".equals(o.getType())).flatMap(o->JSONObject.parseArray(o.getAssociatedRegionId(), String.class).stream()).collect(Collectors.toList()); + List developementList = zoneInfoList.stream().filter(o -> "dev".equals(o.getType())).flatMap(o->JSONObject.parseArray(o.getAssociatedRegionId(), String.class).stream()).collect(Collectors.toList()); if(CollectionUtils.isNotEmpty(developementList)){ //获取负责的区域 developementList.retainAll(subRegionIds); @@ -138,6 +131,23 @@ public class EnterpriseUserServiceImpl implements EnterpriseUserService { @Override public List getDevelopmentDirectorList(String wantShopArea) { - return null; + List devList = hyIntendDevZoneInfoDAO.getHyIntendDevZoneInfoList("dev"); + List regionIds = ListUtils.emptyIfNull(devList).stream().flatMap(o -> JSONObject.parseArray(o.getAssociatedRegionId(), String.class).stream()).collect(Collectors.toList()); + List userList = enterpriseUserDAO.getUserListByDeptLeaders(regionIds); + return EnterpriseUserSingleInfoVO.convertVO(userList); + } + + @Override + public EnterpriseUserDO getDevelopmentByZoneId(Long zoneId) { + HyIntendDevZoneInfoDO zoneInfo = hyIntendDevZoneInfoDAO.selectById(zoneId); + if(Objects.isNull(zoneInfo)){ + throw new ServiceException(ErrorCodeEnum.ZONE_NOT_EXIST); + } + List regionIds = JSONObject.parseArray(zoneInfo.getAssociatedRegionId(), String.class); + List userList = enterpriseUserDAO.getUserListByDeptLeaders(regionIds); + if(CollectionUtils.isEmpty(userList)){ + return null; + } + return userList.stream().findAny().get(); } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ZoneServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ZoneServiceImpl.java index 42dc570d7..d114200ef 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ZoneServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ZoneServiceImpl.java @@ -86,7 +86,7 @@ public class ZoneServiceImpl implements ZoneService { hyIntendDevZoneInfoDO.setId(intentAreaSettingRequest.getId()); hyIntendDevZoneInfoDO.setZoneName(intentAreaSettingRequest.getZoneName()); hyIntendDevZoneInfoDO.setUpdateUserId(userId); - hyIntendDevZoneInfoDO.setAssociatedRegionId(CollectionUtils.isNotEmpty(intentAreaSettingRequest.getOrgIdList())?JSONObject.toJSONString(intentAreaSettingRequest.getOrgIdList()):""); + hyIntendDevZoneInfoDO.setAssociatedRegionId(CollectionUtils.isNotEmpty(intentAreaSettingRequest.getOrgIdList())?JSONObject.toJSONString(intentAreaSettingRequest.getOrgIdList()):null); hyIntendDevZoneInfoDAO.updateByPrimaryKeySelective(hyIntendDevZoneInfoDO); //添加战区映射的意向区域 hyIntendDevMappingDAO.deleteByOpenAreaIds(intentAreaSettingRequest.getOpenAreaIdList(),intentAreaSettingRequest.getType()); diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java index 81bdfcdbb..62ec2a36c 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java @@ -229,4 +229,14 @@ public class TestController { return ResponseResult.success(enterpriseUserService.getUserIdsByScope(userId)); } + @GetMapping("getDevelopmentDirectorList") + public ResponseResult getDevelopmentDirectorList(@RequestParam("wantShopArea") String wantShopArea){ + return ResponseResult.success(enterpriseUserService.getDevelopmentDirectorList(wantShopArea)); + } + + @GetMapping("getDevelopmentByZoneId") + public ResponseResult getDevelopmentByZoneId(@RequestParam("zoneId") Long zoneId){ + return ResponseResult.success(enterpriseUserService.getDevelopmentByZoneId(zoneId)); + } + } diff --git a/coolstore-partner-webb/src/main/resources/application-dev.properties b/coolstore-partner-webb/src/main/resources/application-dev.properties index a37f56937..563263bcf 100644 --- a/coolstore-partner-webb/src/main/resources/application-dev.properties +++ b/coolstore-partner-webb/src/main/resources/application-dev.properties @@ -33,7 +33,7 @@ mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml mybatis.configuration.call-setters-on-nulls=true mybatis.configuration.map-underscore-to-camel-case=true -isv.domain = https://abstore-isv.coolstore.cn +isv.domain = https://abstore-isv.coolstore.cn/isv #rocketmq \u914D\u7F6E rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 diff --git a/coolstore-partner-webb/src/main/resources/application-hd.properties b/coolstore-partner-webb/src/main/resources/application-hd.properties index 0ca8ebeba..50f132839 100644 --- a/coolstore-partner-webb/src/main/resources/application-hd.properties +++ b/coolstore-partner-webb/src/main/resources/application-hd.properties @@ -33,7 +33,7 @@ mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml mybatis.configuration.call-setters-on-nulls=true mybatis.configuration.map-underscore-to-camel-case=true -isv.domain = https://hdstore-isv.coolcollege.cn +isv.domain = https://hdstore-isv.coolcollege.cn/isv #rocketmq \u914D\u7F6E rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 diff --git a/coolstore-partner-webb/src/main/resources/application-test.properties b/coolstore-partner-webb/src/main/resources/application-test.properties index d06b97aa7..d8a746a27 100644 --- a/coolstore-partner-webb/src/main/resources/application-test.properties +++ b/coolstore-partner-webb/src/main/resources/application-test.properties @@ -33,7 +33,7 @@ mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml mybatis.configuration.call-setters-on-nulls=true mybatis.configuration.map-underscore-to-camel-case=true -isv.domain = https://tstore-isv.coolcollege.cn +isv.domain = https://tstore-isv.coolcollege.cn/isv #rocketmq \u914D\u7F6E rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 diff --git a/coolstore-partner-webc/src/main/resources/application-dev.properties b/coolstore-partner-webc/src/main/resources/application-dev.properties index 4e69aa17c..295a2a312 100644 --- a/coolstore-partner-webc/src/main/resources/application-dev.properties +++ b/coolstore-partner-webc/src/main/resources/application-dev.properties @@ -33,7 +33,7 @@ mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml mybatis.configuration.call-setters-on-nulls=true mybatis.configuration.map-underscore-to-camel-case=true -isv.domain = https://abstore-isv.coolstore.cn +isv.domain = https://abstore-isv.coolstore.cn/isv #rocketmq \u914D\u7F6E rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 diff --git a/coolstore-partner-webc/src/main/resources/application-local.properties b/coolstore-partner-webc/src/main/resources/application-local.properties index e7808e80e..059473d6b 100644 --- a/coolstore-partner-webc/src/main/resources/application-local.properties +++ b/coolstore-partner-webc/src/main/resources/application-local.properties @@ -36,7 +36,7 @@ customize_sub_table_size=10 mybatis.configuration.call-setters-on-nulls=true mybatis.configuration.map-underscore-to-camel-case=true -isv.domain = https://abstore-isv.coolstore.cn +isv.domain = https://abstore-isv.coolstore.cn/isv #rocketmq \u914D\u7F6E rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2