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

feat:合同

Browse Source
This commit is contained in:
苏竹红
2025-11-28 11:14:31 +08:00
parent c404e6c51a
commit 6727fe6931
4 changed files with 47 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -538,12 +538,19 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
userName = enterpriseUserDAO.getUserName(signFranchiseDO.getCreateUserId());
}
LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfoDO.getLineId());
log.info("加盟合同审批时签约类型:{}", SignTypeEnum.getDescByCode(signFranchiseDO.getSignType()));
ContractInformationDTO contractInformationDTO = new ContractInformationDTO();
if (Objects.nonNull(lineInfo)){
contractInformationDTO.setSignerAddress(lineInfo.getLiveAddress());
contractInformationDTO.setSignerPhone(lineInfo.getMobile());
}
//自营店 无缴费信息 不需要校验
if (franchiseFeeDO != null){
ContractInformationDTO contractInformationDTO = new ContractInformationDTO();
contractInformationDTO.setShopId(shopId);
contractInformationDTO.setJoinModel(shopInfoDO.getJoinMode());
contractInformationDTO.setShopName(shopInfoDO.getShopName());
@@ -569,6 +576,10 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
contractInformationDTO.setManageFeeFrequency(signFranchiseDO.getManageFeeFrequency());
contractInformationDTO.setDiscountAmount(signFranchiseDO.getDiscountAmount());
contractInformationDTO.setSummitUserName(userName);
contractInformationDTO.setCurrency(signFranchiseDO.getCurrency());
contractInformationDTO.setContractStartTime(signFranchiseDO.getContractStartTime());
contractInformationDTO.setContractEndTime(signFranchiseDO.getContractEndTime());
contractInformationDTO.setContractServiceLife(signFranchiseDO.getContractServiceLife());
//老店转加盟(也叫直营转加盟)
if (SignTypeEnum.DIRECT_SALES_TO_JOINING.getCode().equals(signFranchiseDO.getSignType())){