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

feat:regionName

Browse Source
This commit is contained in:
苏竹红
2025-12-04 14:53:48 +08:00
parent fb01212593
commit 5f2fcf944e
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-model/src/main/java/com/cool/store/dto/ContractInformationDTO.java
View File

@@ -103,5 +103,7 @@ public class ContractInformationDTO {
private String storeAddress; private String storeAddress;
@ApiModelProperty("折扣原因") @ApiModelProperty("折扣原因")
private String discountReason; private String discountReason;
@ApiModelProperty("所属大区")
private String regionName;
} }

5
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
View File

@@ -583,6 +583,8 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfoDO.getLineId()); LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfoDO.getLineId());
RegionDO region = regionDao.getRegionById(shopInfoDO.getRegionId());
log.info("加盟合同审批时签约类型:{}", SignTypeEnum.getDescByCode(signFranchiseDO.getSignType())); log.info("加盟合同审批时签约类型:{}", SignTypeEnum.getDescByCode(signFranchiseDO.getSignType()));
@@ -626,6 +628,9 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
contractInformationDTO.setStoreAddress(shopInfoDO.getDetailAddress()); contractInformationDTO.setStoreAddress(shopInfoDO.getDetailAddress());
contractInformationDTO.setDiscountReason(franchiseFeeDO.getDiscountReason()); contractInformationDTO.setDiscountReason(franchiseFeeDO.getDiscountReason());
if (region != null){
contractInformationDTO.setRegionName(region.getName());
}
//老店转加盟(也叫直营转加盟) //老店转加盟(也叫直营转加盟)
if (SignTypeEnum.DIRECT_SALES_TO_JOINING.getCode().equals(signFranchiseDO.getSignType())){ if (SignTypeEnum.DIRECT_SALES_TO_JOINING.getCode().equals(signFranchiseDO.getSignType())){