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-04-21 11:35:08 +08:00
parent 65b5d08747
commit 4cf5471c61
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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())){

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
View File

@@ -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);
}