From 537ecb2f61d83824d8d7e0dce0d0d6c965b53066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 21 Nov 2025 13:28:24 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=90=88=E5=90=8C=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/dto/ContractInformationDTO.java | 2 ++ .../com/cool/store/service/impl/SignFranchiseServiceImpl.java | 2 ++ 2 files changed, 4 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 2bb015289..7018fcef9 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 @@ -43,5 +43,7 @@ public class ContractInformationDTO { private String brandOwner; @ApiModelProperty("老店编码 签约类型选择老店转加盟时有") private String oldShopCode; + @ApiModelProperty("合同编号") + private String contractNo; } 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 2ea32f2fa..f0f2e35c2 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 @@ -491,6 +491,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu SignFranchiseDO signFranchiseDO = signFranchiseMapper.selectByShopId(shopId); log.info("加盟合同审批时签约类型:{}", SignTypeEnum.getDescByCode(signFranchiseDO.getSignType())); + //自营店 无缴费信息 不需要校验 if (franchiseFeeDO != null){ ContractInformationDTO contractInformationDTO = new ContractInformationDTO(); @@ -514,6 +515,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu contractInformationDTO.setPayeeName(enumByCode.getPayeeName()); contractInformationDTO.setBrandOwner(enumByCode.getBrandOwner()); } + contractInformationDTO.setContractNo(signFranchiseDO.getContractCode()); try { return pushService.pushContract(contractInformationDTO); } catch (Exception e) {