From 9d16956755e506536ef9f2ccf40d56aa4abd37a4 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 13 May 2025 10:40:19 +0800 Subject: [PATCH 1/3] fix --- .../impl/BuildInformationServiceImpl.java | 39 +++++++++---------- 1 file changed, 19 insertions(+), 20 deletions(-) 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 7f0efaf68..fae418f59 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 @@ -77,13 +77,10 @@ public class BuildInformationServiceImpl implements BuildInformationService { response.setShopId(shopId); response.setShopName(shopInfo.getShopName()); response.setShopCode(shopInfo.getShopCode()); - PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(shopInfo.getPointId()); - if (Objects.nonNull(pointInfo)) { - response.setProvince(pointInfo.getProvince()); - response.setDistrict(pointInfo.getDistrict()); - response.setCity(pointInfo.getCity()); - response.setTownship(pointInfo.getTownship()); - } + response.setProvince(shopInfo.getProvince()); + response.setDistrict(shopInfo.getDistrict()); + response.setCity(shopInfo.getCity()); + response.setTownship(shopInfo.getDetailAddress()); BuildInformationDO informationDO = buildInformationDAO.selectOneByShopId(shopId); if (Objects.nonNull(informationDO)) { extracted(response, informationDO); @@ -112,31 +109,33 @@ public class BuildInformationServiceImpl implements BuildInformationService { } 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()); - if (Objects.nonNull(user)){ + if (Objects.nonNull(user)) { response.setXgjVicePresident(user.getName()); } } //根据映射关系默认带出新管家组织 - if (StringUtils.isBlank(response.getXgjRegionName())){ + if (StringUtils.isBlank(response.getXgjRegionName())) { Integer joinMode = shopInfo.getJoinMode() == 3 ? CommonConstants.ONE : CommonConstants.ZERO; BigRegionDO bigRegionDO = bigRegionDAO.queryOrgInfoByBigRegionAndJoinMode(shopInfo.getRegionId(), joinMode); - if (Objects.nonNull(bigRegionDO)){ + if (Objects.nonNull(bigRegionDO)) { response.setXgjRegionId(bigRegionDO.getOrgId()); response.setXgjRegionName(bigRegionDO.getOrgName()); } } - if (Objects.nonNull(pointInfo)) { - if (StringUtils.isBlank(response.getAddresseeProvince())){ - response.setAddresseeProvince(pointInfo.getProvince());} - if (StringUtils.isBlank(response.getAddresseeCity())){ - response.setAddresseeCity(pointInfo.getCity());} - if (StringUtils.isBlank(response.getAddresseeDistrict())){ - response.setAddresseeDistrict(pointInfo.getDistrict());} + if (StringUtils.isBlank(response.getAddresseeProvince())) { + response.setAddresseeProvince(shopInfo.getProvince()); + } + if (StringUtils.isBlank(response.getAddresseeCity())) { + response.setAddresseeCity(shopInfo.getCity()); + } + 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; From d7a7468c89cd3ee8ee03518d8dfbfde15da8ee93 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 13 May 2025 11:02:19 +0800 Subject: [PATCH 2/3] fix --- .../java/com/cool/store/enums/JoinModeEnum.java | 4 +++- .../service/impl/ExportRealizeServiceImpl.java | 17 +++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/JoinModeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/JoinModeEnum.java index 60b668860..ded308ffa 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/JoinModeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/JoinModeEnum.java @@ -10,7 +10,9 @@ public enum JoinModeEnum { FRANCHISE_DEPARTMENT(1,"加盟部加盟店"), FRANCHISE_COMPANIES(2,"加盟公司加盟店"), OWN_STORE(3,"加盟公司自有店"), - STRONG_FRANCHISE(4,"强加盟"); + STRONG_FRANCHISE(4,"强加盟"), + DIRECT_SALES_TO_JOINING(5,"直营转加盟") + ; private int code; private String desc; private JoinModeEnum(int code, String desc) { diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java index 781bbbc06..48fc90d0f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java @@ -40,6 +40,7 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.math.BigDecimal; import java.math.BigInteger; import java.text.MessageFormat; import java.text.ParseException; @@ -317,10 +318,10 @@ public class ExportRealizeServiceImpl implements ExportRealizeService { if (ObjectUtils.isNotEmpty(franchiseFeeDTO)) { dto.setFirstYearStartTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, franchiseFeeDTO.getFirstYearStartTime())); dto.setFirstYearEndTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, franchiseFeeDTO.getFirstYearEndTime())); - String total = (new BigInteger(franchiseFeeDTO.getPerformanceBond()).add(new BigInteger(franchiseFeeDTO.getFirstYearFee())) - .add(new BigInteger(franchiseFeeDTO.getFirstYearManagementFee())) - .add(new BigInteger(franchiseFeeDTO.getYearFranchiseFee())) - .add(new BigInteger(franchiseFeeDTO.getLoanMargin())).toString()); + String total = (new BigDecimal(franchiseFeeDTO.getPerformanceBond()).add(new BigDecimal(franchiseFeeDTO.getFirstYearFee())) + .add(new BigDecimal(franchiseFeeDTO.getFirstYearManagementFee())) + .add(new BigDecimal(franchiseFeeDTO.getYearFranchiseFee())) + .add(new BigDecimal(franchiseFeeDTO.getLoanMargin())).toString()); dto.setTotalAmountContributions(total); dto.setFranchiseFee(franchiseFeeDTO.getYearFranchiseFee()); dto.setLoanMargin(franchiseFeeDTO.getLoanMargin()); @@ -460,10 +461,10 @@ public class ExportRealizeServiceImpl implements ExportRealizeService { if (ObjectUtils.isNotEmpty(franchiseFeeDTO)) { dto.setFirstYearStartTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, franchiseFeeDTO.getFirstYearStartTime())); dto.setFirstYearEndTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, franchiseFeeDTO.getFirstYearEndTime())); - String total = (new BigInteger(franchiseFeeDTO.getPerformanceBond()).add(new BigInteger(franchiseFeeDTO.getFirstYearFee())) - .add(new BigInteger(franchiseFeeDTO.getFirstYearManagementFee())) - .add(new BigInteger(franchiseFeeDTO.getYearFranchiseFee())) - .add(new BigInteger(franchiseFeeDTO.getLoanMargin())).toString()); + String total = (new BigDecimal(franchiseFeeDTO.getPerformanceBond()).add(new BigDecimal(franchiseFeeDTO.getFirstYearFee())) + .add(new BigDecimal(franchiseFeeDTO.getFirstYearManagementFee())) + .add(new BigDecimal(franchiseFeeDTO.getYearFranchiseFee())) + .add(new BigDecimal(franchiseFeeDTO.getLoanMargin())).toString()); dto.setTotalAmountContributions(total); dto.setFranchiseFee(franchiseFeeDTO.getYearFranchiseFee()); dto.setLoanMargin(franchiseFeeDTO.getLoanMargin()); From 1867bbbde58fd4a39528db924cabf093aacd4d45 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 13 May 2025 11:54:49 +0800 Subject: [PATCH 3/3] fix --- .../src/main/java/com/cool/store/enums/JoinModeEnum.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/JoinModeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/JoinModeEnum.java index ded308ffa..31b543b89 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/JoinModeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/JoinModeEnum.java @@ -10,8 +10,7 @@ public enum JoinModeEnum { FRANCHISE_DEPARTMENT(1,"加盟部加盟店"), FRANCHISE_COMPANIES(2,"加盟公司加盟店"), OWN_STORE(3,"加盟公司自有店"), - STRONG_FRANCHISE(4,"强加盟"), - DIRECT_SALES_TO_JOINING(5,"直营转加盟") + STRONG_FRANCHISE(4,"强加盟") ; private int code; private String desc;