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

Merge branch 'cc20250207_optimize_v2.5' into cc_20250211_v2.6

Browse Source
This commit is contained in:
shuo.wang
2025-02-17 15:32:16 +08:00
parent 50a7700fdf 82d90774ab
commit 3588919fcc
10 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-model/src/main/java/com/cool/store/entity/FranchiseFeeDO.java
View File

@@ -33,6 +33,8 @@ public class FranchiseFeeDO {
private Date firstYearEndTime;
@Column(name = "first_year_fee")
private String firstYearFee;
@Column(name = "first_year_manage_fee")
private String firstYearManageFee;
@Column(name = "second_year_start_time")
private Date secondYearStartTime;
@Column(name = "second_year_end_time")

5
coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseFeeRequest.java
View File

@@ -23,8 +23,10 @@ public class FranchiseFeeRequest {
private Date firstYearStartTime;
@ApiModelProperty("第一年度结束时间")
private Date firstYearEndTime;
@ApiModelProperty("第一年度加盟费")
@ApiModelProperty("第一年度品牌使用费")
private String firstYearFee;
@ApiModelProperty("第一年度管理费")
private String firstYearManageFee;
@ApiModelProperty("第二年度开始时间")
private Date secondYearStartTime;
@ApiModelProperty("第二年度结束时间")
@@ -50,6 +52,7 @@ public class FranchiseFeeRequest {
franchiseFeeDO.setFirstYearStartTime(this.firstYearStartTime);
franchiseFeeDO.setFirstYearEndTime(this.firstYearEndTime);
franchiseFeeDO.setFirstYearFee(this.firstYearFee);
franchiseFeeDO.setFirstYearManageFee(this.firstYearManageFee);
franchiseFeeDO.setSecondYearStartTime(this.secondYearStartTime);
franchiseFeeDO.setSecondYearEndTime(this.secondYearEndTime);
franchiseFeeDO.setSecondYearFee(this.secondYearFee);

5
coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java
View File

@@ -23,8 +23,10 @@ public class FranchiseFeeResponse {
private Date firstYearStartTime;
@ApiModelProperty("第一年度结束时间")
private Date firstYearEndTime;
@ApiModelProperty("第一年度加盟费")
@ApiModelProperty("第一年度品牌使用费")
private String firstYearFee;
@ApiModelProperty("第一年度管理费")
private String firstYearManageFee;
@ApiModelProperty("第二年度开始时间")
private Date secondYearStartTime;
@ApiModelProperty("第二年度结束时间")
@@ -174,6 +176,7 @@ public class FranchiseFeeResponse {
franchiseFeeResponse.setPerformanceBond(franchiseFeeDO.getPerformanceBond());
franchiseFeeResponse.setCreateTime(franchiseFeeDO.getCreateTime());
franchiseFeeResponse.setUpdateTime(franchiseFeeDO.getUpdateTime());
franchiseFeeResponse.setFirstYearManageFee(franchiseFeeDO.getFirstYearManageFee());
return franchiseFeeResponse;
}
}