From 5f2fcf944ef3c11727eea303b16316adbd1f375a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 4 Dec 2025 14:53:48 +0800 Subject: [PATCH] feat:regionName --- .../main/java/com/cool/store/dto/ContractInformationDTO.java | 2 ++ .../cool/store/service/impl/SignFranchiseServiceImpl.java | 5 +++++ 2 files changed, 7 insertions(+) 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 13dee74f1..55b684ee8 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 @@ -103,5 +103,7 @@ public class ContractInformationDTO { private String storeAddress; @ApiModelProperty("折扣原因") private String discountReason; + @ApiModelProperty("所属大区") + private String regionName; } 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 df35e5d59..2e30996ef 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 @@ -583,6 +583,8 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfoDO.getLineId()); + RegionDO region = regionDao.getRegionById(shopInfoDO.getRegionId()); + log.info("加盟合同审批时签约类型:{}", SignTypeEnum.getDescByCode(signFranchiseDO.getSignType())); @@ -626,6 +628,9 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu contractInformationDTO.setStoreAddress(shopInfoDO.getDetailAddress()); contractInformationDTO.setDiscountReason(franchiseFeeDO.getDiscountReason()); + if (region != null){ + contractInformationDTO.setRegionName(region.getName()); + } //老店转加盟(也叫直营转加盟) if (SignTypeEnum.DIRECT_SALES_TO_JOINING.getCode().equals(signFranchiseDO.getSignType())){