diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopRentInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopRentInfoMapper.xml
index 887ad74ea..012de5020 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/ShopRentInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/ShopRentInfoMapper.xml
@@ -8,6 +8,7 @@
+
@@ -23,7 +24,7 @@
- id, shop_id, point_id, rent_type, sign_time, contract_start_time, contract_months, shop_rent_type,
+ id, shop_id, point_id, rent_type, sign_time, contract_start_time, contract_end_time, contract_months, shop_rent_type,
month_rent, first_year_month_rent, second_year_month_rent, third_year_month_rent, contract_pic,
house_certificate_pic, audit_id, deleted, create_time, update_time
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopRentInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopRentInfoDO.java
index 8694a1248..7e53bdc71 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopRentInfoDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopRentInfoDO.java
@@ -42,6 +42,12 @@ public class ShopRentInfoDO {
@Column(name = "contract_start_time")
private Date contractStartTime;
+ /**
+ * 合同结束日期
+ */
+ @Column(name = "contract_end_time")
+ private Date contractEndTime;
+
/**
* 签约年限
*/
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AddRentContractRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AddRentContractRequest.java
index 6f7143801..6289dd1e7 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/AddRentContractRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AddRentContractRequest.java
@@ -40,6 +40,9 @@ public class AddRentContractRequest {
@ApiModelProperty("合同开始日期")
private Date contractStartTime;
+ @ApiModelProperty("合同结束日期")
+ private Date contractEndTime;
+
@ApiModelProperty("签约年限")
private Integer contractMonths;
@@ -79,7 +82,7 @@ public class AddRentContractRequest {
}
return true;
}
- if(Objects.isNull(signTime) || Objects.isNull(contractStartTime)){
+ if(Objects.isNull(signTime) || Objects.isNull(contractStartTime) || Objects.isNull(contractEndTime)){
return false;
}
if(Objects.isNull(contractMonths) || Objects.isNull(shopRentType)){
@@ -111,6 +114,7 @@ public class AddRentContractRequest {
shopRentInfoDO.setRentType(param.getRentType());
shopRentInfoDO.setSignTime(param.getSignTime());
shopRentInfoDO.setContractStartTime(param.getContractStartTime());
+ shopRentInfoDO.setContractEndTime(param.getContractEndTime());
shopRentInfoDO.setContractMonths(param.getContractMonths());
shopRentInfoDO.setShopRentType(param.getShopRentType());
shopRentInfoDO.setMonthRent(param.getMonthRent());
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/ShopRentInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/ShopRentInfoVO.java
index b911fec09..b25cd5e8e 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/ShopRentInfoVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/ShopRentInfoVO.java
@@ -82,9 +82,7 @@ public class ShopRentInfoVO {
result.setSignTime(shopRentInfo.getSignTime());
if(RentTypeEnum.RENT.getCode().equals(shopRentInfo.getRentType())){
result.setContractStartTime(shopRentInfo.getContractStartTime());
- LocalDate start = shopRentInfo.getContractStartTime().toInstant().atZone(java.time.ZoneId.systemDefault()).toLocalDate();
- Instant instant = start.plusMonths(shopRentInfo.getContractMonths()).minusDays(1L).atStartOfDay().atZone(ZoneId.systemDefault()).toInstant();
- result.setContractEndTime(Date.from(instant));
+ result.setContractEndTime(shopRentInfo.getContractEndTime());
result.setContractMonths(shopRentInfo.getContractMonths());
}
result.setShopRentType(shopRentInfo.getShopRentType());