From 1ab6ccf7b70c23f4152668aeb6350803d0b06751 Mon Sep 17 00:00:00 2001 From: suzhuhong Date: Tue, 10 Feb 2026 16:54:57 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=90=88=E5=90=8C=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AE=A1=E7=90=86=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/dto/ContractInformationDTO.java | 6 ++++++ .../service/impl/SignFranchiseServiceImpl.java | 15 ++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/ContractInformationDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/ContractInformationDTO.java index cdb92aabc..cf0b8fc81 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/ContractInformationDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/ContractInformationDTO.java @@ -110,4 +110,10 @@ public class ContractInformationDTO { @ApiModelProperty("所属大区") private String regionName; + @ApiModelProperty("加盟分部(归属分部)") + private String investRegionName; + + @ApiModelProperty("所属子区域(归属区域)") + private String subRegionName; + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index 39487e6b0..4d55a56ea 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -706,7 +706,9 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfoDO.getLineId()); - RegionDO region = regionDao.getRegionById(shopInfoDO.getRegionId()); + List regionIds = Arrays.asList(shopInfoDO.getRegionId(), shopInfoDO.getInvestRegionId(), shopInfoDO.getManagerRegionId()); + + Map regionNameMap = regionDao.getRegionNameMap(regionIds); log.info("加盟合同审批时签约类型:{}", SignTypeEnum.getDescByCode(signFranchiseDO.getSignType())); @@ -751,9 +753,16 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu contractInformationDTO.setStoreAddress(shopInfoDO.getDetailAddress()); contractInformationDTO.setDiscountReason(franchiseFeeDO.getDiscountReason()); - if (region != null){ - contractInformationDTO.setRegionName(region.getName()); + if (shopInfoDO.getRegionId()!=null){ + contractInformationDTO.setRegionName(regionNameMap.get(shopInfoDO.getRegionId())); } + if (shopInfoDO.getInvestRegionId()!=null){ + contractInformationDTO.setInvestRegionName(regionNameMap.get(shopInfoDO.getInvestRegionId())); + } + if (shopInfoDO.getRegionId()!=null){ + contractInformationDTO.setSubRegionName(regionNameMap.get(shopInfoDO.getManagerRegionId())); + } + //老店转加盟(也叫直营转加盟) if (SignTypeEnum.DIRECT_SALES_TO_JOINING.getCode().equals(signFranchiseDO.getSignType())){