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

加盟合同增加字段+导出字段增加

Browse Source
This commit is contained in:
shuo.wang
2025-03-12 17:32:50 +08:00
parent d740d9ba6c
commit 298b46d044
8 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
View File

@@ -153,6 +153,7 @@ public class ExportRealizeServiceImpl implements ExportRealizeService {
dto.setPerformanceBondBill(franchiseFeeDTO.getPerformanceBond());
dto.setFirstYearManagementFeeBill(franchiseFeeDTO.getFirstYearManagementFee());
dto.setFirstYearBrandingFeeBill(franchiseFeeDTO.getFirstYearFee());
dto.setPayUserName(franchiseFeeDTO.getPayUserName());
}
dto.setUserName(response.getUsername());
dto.setMobile(response.getMobile());
@@ -169,6 +170,8 @@ public class ExportRealizeServiceImpl implements ExportRealizeService {
dto.setContractStartTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, signFranchiseDO.getContractStartTime()));
dto.setContractEndTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, signFranchiseDO.getContractEndTime()));
dto.setSignTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, signFranchiseDO.getCreateTime()));
dto.setPartnershipSignatoryFirst(signFranchiseDO.getPartnershipSignatoryFirst());
dto.setPartnershipSignatorySecond(signFranchiseDO.getPartnershipSignatorySecond());
}
List<Date> payTime = payTimeMap.getOrDefault(response.getShopId(), new ArrayList<>());
for (int i = 0; i < payTime.size() && i <= 3; i++) {

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

@@ -288,6 +288,8 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
addSignFranchiseResponse.setMobile(signFranchiseDO.getMobile());
addSignFranchiseResponse.setContractCode(signFranchiseDO.getContractCode());
addSignFranchiseResponse.setContractAmount(signFranchiseDO.getContractAmount());
addSignFranchiseResponse.setPartnershipSignatoryFirst(signFranchiseDO.getPartnershipSignatoryFirst());
addSignFranchiseResponse.setPartnershipSignatorySecond(signFranchiseDO.getPartnershipSignatorySecond());
} else {
BigDecimal total = new BigDecimal(franchiseFeeDO.getYearFranchiseFee())