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:18:39 +08:00
parent 6727fe6931
commit d431a0205f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,9 +94,9 @@ public class ContractInformationDTO {
private Integer contractServiceLife; private Integer contractServiceLife;
@ApiModelProperty(name = "合同开始时间") @ApiModelProperty(name = "合同开始时间")
private Date contractStartTime; private String contractStartTime;
@ApiModelProperty(name = "合同结束时间") @ApiModelProperty(name = "合同结束时间")
private Date contractEndTime; private String contractEndTime;
} }

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

@@ -577,8 +577,8 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
contractInformationDTO.setDiscountAmount(signFranchiseDO.getDiscountAmount()); contractInformationDTO.setDiscountAmount(signFranchiseDO.getDiscountAmount());
contractInformationDTO.setSummitUserName(userName); contractInformationDTO.setSummitUserName(userName);
contractInformationDTO.setCurrency(signFranchiseDO.getCurrency()); contractInformationDTO.setCurrency(signFranchiseDO.getCurrency());
contractInformationDTO.setContractStartTime(signFranchiseDO.getContractStartTime()); contractInformationDTO.setContractStartTime(DateUtils.dateTime(signFranchiseDO.getContractStartTime()));
contractInformationDTO.setContractEndTime(signFranchiseDO.getContractEndTime()); contractInformationDTO.setContractEndTime(DateUtils.dateTime(signFranchiseDO.getContractEndTime()));
contractInformationDTO.setContractServiceLife(signFranchiseDO.getContractServiceLife()); contractInformationDTO.setContractServiceLife(signFranchiseDO.getContractServiceLife());
//老店转加盟(也叫直营转加盟) //老店转加盟(也叫直营转加盟)