diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java index ea66eab9b..66e2e1cb4 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java @@ -35,6 +35,8 @@ import java.util.stream.Collectors; @Service public class BuildInformationServiceImpl implements BuildInformationService { + @Resource + private UserAuthMappingService userAuthMappingService; @Resource private BuildInformationDAO buildInformationDAO; @Autowired @@ -52,8 +54,6 @@ public class BuildInformationServiceImpl implements BuildInformationService { @Resource private CommonService commonService; @Autowired - private UserAuthMappingService userAuthMappingService; - @Autowired private OrderSysInfoDAO orderSysInfoDAO; @Resource private WarehouseInfoMapper warehouseInfoMapper; @@ -106,6 +106,12 @@ public class BuildInformationServiceImpl implements BuildInformationService { response.setDeclareGoodsLogisticsWarehouseName(warehouseInfoDO.getWarehouseName()); } response.setDeclareGoodsType(orderSysInfoDO.getDeclareGoodsType()); + } + if (StringUtils.isBlank(response.getXgjVicePresident())){ + EnterpriseUserDO user = userAuthMappingService.getUserByRoleEnumAndRegionId(UserRoleEnum.VICE_PRESIDENT_IN_CHARGE, shopInfo.getRegionId()); + if (Objects.nonNull(user)){ + response.setXgjVicePresident(user.getName()); + } } if (Objects.nonNull(pointInfo)) { if (StringUtils.isBlank(response.getAddresseeProvince())){ diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index 34362e259..f512cb4b2 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -512,7 +512,7 @@ public class DeskServiceImpl implements DeskService { subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_154.getShopSubStageStatus()); } if (userRoleIds.contains(UserRoleEnum.PRESIDENT.getCode()) ) { - subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_154.getShopSubStageStatus()); + subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_155.getShopSubStageStatus()); } return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_15, subStageStatusList, true); }