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

Merge branch 'cc_20250513_fix' into cc_20250513

Browse Source
This commit is contained in:
shuo.wang
2025-05-13 10:40:46 +08:00
parent d9af75edca 9d16956755
commit e610035467
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,13 +77,10 @@ public class BuildInformationServiceImpl implements BuildInformationService {
response.setShopId(shopId); response.setShopId(shopId);
response.setShopName(shopInfo.getShopName()); response.setShopName(shopInfo.getShopName());
response.setShopCode(shopInfo.getShopCode()); response.setShopCode(shopInfo.getShopCode());
PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(shopInfo.getPointId()); response.setProvince(shopInfo.getProvince());
if (Objects.nonNull(pointInfo)) { response.setDistrict(shopInfo.getDistrict());
response.setProvince(pointInfo.getProvince()); response.setCity(shopInfo.getCity());
response.setDistrict(pointInfo.getDistrict()); response.setTownship(shopInfo.getDetailAddress());
response.setCity(pointInfo.getCity());
response.setTownship(pointInfo.getTownship());
}
BuildInformationDO informationDO = buildInformationDAO.selectOneByShopId(shopId); BuildInformationDO informationDO = buildInformationDAO.selectOneByShopId(shopId);
if (Objects.nonNull(informationDO)) { if (Objects.nonNull(informationDO)) {
extracted(response, informationDO); extracted(response, informationDO);
@@ -112,31 +109,33 @@ 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()); EnterpriseUserDO user = userAuthMappingService.getUserByRoleEnumAndRegionId(UserRoleEnum.VICE_PRESIDENT_IN_CHARGE, shopInfo.getRegionId());
if (Objects.nonNull(user)){ if (Objects.nonNull(user)) {
response.setXgjVicePresident(user.getName()); response.setXgjVicePresident(user.getName());
} }
} }
//根据映射关系默认带出新管家组织 //根据映射关系默认带出新管家组织
if (StringUtils.isBlank(response.getXgjRegionName())){ if (StringUtils.isBlank(response.getXgjRegionName())) {
Integer joinMode = shopInfo.getJoinMode() == 3 ? CommonConstants.ONE : CommonConstants.ZERO; Integer joinMode = shopInfo.getJoinMode() == 3 ? CommonConstants.ONE : CommonConstants.ZERO;
BigRegionDO bigRegionDO = bigRegionDAO.queryOrgInfoByBigRegionAndJoinMode(shopInfo.getRegionId(), joinMode); BigRegionDO bigRegionDO = bigRegionDAO.queryOrgInfoByBigRegionAndJoinMode(shopInfo.getRegionId(), joinMode);
if (Objects.nonNull(bigRegionDO)){ if (Objects.nonNull(bigRegionDO)) {
response.setXgjRegionId(bigRegionDO.getOrgId()); response.setXgjRegionId(bigRegionDO.getOrgId());
response.setXgjRegionName(bigRegionDO.getOrgName()); response.setXgjRegionName(bigRegionDO.getOrgName());
} }
} }
if (Objects.nonNull(pointInfo)) { if (StringUtils.isBlank(response.getAddresseeProvince())) {
if (StringUtils.isBlank(response.getAddresseeProvince())){ response.setAddresseeProvince(shopInfo.getProvince());
response.setAddresseeProvince(pointInfo.getProvince());} }
if (StringUtils.isBlank(response.getAddresseeCity())){ if (StringUtils.isBlank(response.getAddresseeCity())) {
response.setAddresseeCity(pointInfo.getCity());} response.setAddresseeCity(shopInfo.getCity());
if (StringUtils.isBlank(response.getAddresseeDistrict())){ }
response.setAddresseeDistrict(pointInfo.getDistrict());} if (StringUtils.isBlank(response.getAddresseeDistrict())) {
response.setAddresseeDistrict(shopInfo.getDistrict());
}
if (StringUtils.isBlank(response.getAddresseeAddress())) {
response.setAddresseeAddress(shopInfo.getDetailAddress());
} }
if (StringUtils.isBlank(response.getAddresseeAddress())){
response.setAddresseeAddress(shopInfo.getDetailAddress());}
return response; return response;