suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化仓储找副总裁问题

Browse Source
This commit is contained in:
shuo.wang
2025-06-06 09:39:42 +08:00
parent f19507e153
commit 431929338a
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java
View File

@@ -4,10 +4,7 @@ package com.cool.store.service.impl;
import com.cool.store.constants.CommonConstants; import com.cool.store.constants.CommonConstants;
import com.cool.store.dao.*; import com.cool.store.dao.*;
import com.cool.store.entity.*; import com.cool.store.entity.*;
import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.enums.*;
import com.cool.store.enums.MessageEnum;
import com.cool.store.enums.OrderSysTypeEnum;
import com.cool.store.enums.UserRoleEnum;
import com.cool.store.enums.point.ShopSubStageEnum; import com.cool.store.enums.point.ShopSubStageEnum;
import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.enums.point.ShopSubStageStatusEnum;
import com.cool.store.exception.ServiceException; import com.cool.store.exception.ServiceException;
@@ -16,12 +13,14 @@ import com.cool.store.request.BuildInformationRequest;
import com.cool.store.response.BuildInformationResponse; import com.cool.store.response.BuildInformationResponse;
import com.cool.store.service.BuildInformationService; import com.cool.store.service.BuildInformationService;
import com.cool.store.mapper.BuildInformationMapper; import com.cool.store.mapper.BuildInformationMapper;
import com.cool.store.service.EnumInfoService;
import com.cool.store.service.PreparationService; import com.cool.store.service.PreparationService;
import com.cool.store.service.UserAuthMappingService; import com.cool.store.service.UserAuthMappingService;
import com.cool.store.utils.RedisConstantUtil; import com.cool.store.utils.RedisConstantUtil;
import com.cool.store.utils.RedisUtilPool; import com.cool.store.utils.RedisUtilPool;
import com.cool.store.utils.poi.StringUtils; import com.cool.store.utils.poi.StringUtils;
import io.lettuce.core.ZAddArgs; import io.lettuce.core.ZAddArgs;
import org.apache.commons.collections4.CollectionUtils;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -30,6 +29,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream;
/** /**
* @author EDY * @author EDY
@@ -38,7 +38,8 @@ import java.util.stream.Collectors;
*/ */
@Service @Service
public class BuildInformationServiceImpl implements BuildInformationService { public class BuildInformationServiceImpl implements BuildInformationService {
@Resource
private EnumInfoService enumInfoService;
@Resource @Resource
private RedisConstantUtil redisConstantUtil; private RedisConstantUtil redisConstantUtil;
@Resource @Resource
@@ -116,9 +117,17 @@ public class BuildInformationServiceImpl implements BuildInformationService {
response.setDeclareGoodsType(orderSysInfoDO.getDeclareGoodsType()); response.setDeclareGoodsType(orderSysInfoDO.getDeclareGoodsType());
} }
if (StringUtils.isBlank(response.getXgjVicePresident())) { if (StringUtils.isBlank(response.getXgjVicePresident())) {
EnterpriseUserDO user = userAuthMappingService.getUserByRoleEnumAndRegionId(UserRoleEnum.VICE_PRESIDENT_IN_CHARGE, shopInfo.getRegionId()); List<EnterpriseUserDO> userList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.VICE_PRESIDENT_IN_CHARGE, shopInfo.getRegionId());
if (Objects.nonNull(user)) { if (CollectionUtils.isNotEmpty(userList)) {
response.setXgjVicePresident(user.getName()); List<EnumInfoDO> xgjVicePresidentList = enumInfoService.getByTypeCode(ZxjpEnum.XGJ_VICE_PRESIDENT.getCode());
List<String> userNameSet = userList.stream().map(EnterpriseUserDO::getName).collect(Collectors.toList());
List<String> xgjVicePresidentNameList = xgjVicePresidentList.stream().map(EnumInfoDO::getSysValue).collect(Collectors.toList());
List<String> resultUserNameList = userNameSet.stream()
.filter(xgjVicePresidentNameList::contains)
.collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(resultUserNameList)){
response.setXgjVicePresident(resultUserNameList.get(0));
}
} }
} }
//根据映射关系默认带出新管家组织 //根据映射关系默认带出新管家组织