diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java
index 5053ce15a..f61af509d 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java
@@ -133,6 +133,13 @@ public class WxPropertyContract implements Serializable {
/*租金合同ID**/
@io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="rentContractId")
private Long rentContractId;
+
+ @io.swagger.annotations.ApiModelProperty(value = "起租开始时间", name = "rentalStartDate")
+ private Date startDate;
+
+ @io.swagger.annotations.ApiModelProperty(value = "起租结束时间", name = "rentalEndDate")
+ private Date endDate;
+
public Long getMerchantId() {
return merchantId;
}
@@ -296,7 +303,21 @@ public class WxPropertyContract implements Serializable {
rentContractId = _rentContractId;
}
+ public Date getStartDate() {
+ return startDate;
+ }
+ public void setStartDate(Date startDate) {
+ this.startDate = startDate;
+ }
+
+ public Date getEndDate() {
+ return endDate;
+ }
+
+ public void setEndDate(Date endDate) {
+ this.endDate = endDate;
+ }
public static enum Field
{
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
index fa9c30cbb..08c36d11e 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
@@ -171,6 +171,11 @@ public class WxRentContract implements Serializable {
@io.swagger.annotations.ApiModelProperty(value = "营业额", name = "revenue")
private Integer revenue;
+ @io.swagger.annotations.ApiModelProperty(value = "起租开始时间", name = "rentalStartDate")
+ private Date startDate;
+
+ @io.swagger.annotations.ApiModelProperty(value = "起租结束时间", name = "rentalEndDate")
+ private Date endDate;
public Long getMerchantId() {
return merchantId;
@@ -420,6 +425,22 @@ public class WxRentContract implements Serializable {
this.revenue = revenue;
}
+ public Date getStartDate() {
+ return startDate;
+ }
+
+ public void setStartDate(Date startDate) {
+ this.startDate = startDate;
+ }
+
+ public Date getEndDate() {
+ return endDate;
+ }
+
+ public void setEndDate(Date endDate) {
+ this.endDate = endDate;
+ }
+
public static enum Field {
Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), MerchantId_ASC("`merchant_id` ASC"), MerchantId_DESC("`merchant_id` DESC"), Price_ASC("`price` ASC"), Price_DESC("`price` DESC"), RentalStartDate_ASC("`rental_start_date` ASC"), RentalStartDate_DESC("`rental_start_date` DESC"), RentalEndDate_ASC("`rental_end_date` ASC"), RentalEndDate_DESC("`rental_end_date` DESC"), SignDate_ASC("`sign_date` ASC"), SignDate_DESC("`sign_date` DESC"), ReceivePeriod_ASC("`receive_period` ASC"), ReceivePeriod_DESC("`receive_period` DESC"), TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"), Filepath_ASC("`filepath` ASC"), Filepath_DESC("`filepath` DESC"), Status_ASC("`status` ASC"), Status_DESC("`status` DESC"), ContractNumber_ASC("`contract_number` ASC"), ContractNumber_DESC("`contract_number` DESC"), Deposit_ASC("`deposit` ASC"), Deposit_DESC("`deposit` DESC"), PayDate_ASC("`pay_date` ASC"), PayDate_DESC("`pay_date` DESC"), IsDel_ASC("`is_del` ASC"), IsDel_DESC("`is_del` DESC"), MerchantName_ASC("`merchant_name` ASC"), MerchantName_DESC("`merchant_name` DESC"), Brand_ASC("`brand` ASC"), Brand_DESC("`brand` DESC"), BusinessId_ASC("`business_id` ASC"), BusinessId_DESC("`business_id` DESC"), ShopType_ASC("`shop_type` ASC"), ShopType_DESC("`shop_type` DESC"), ShopId_ASC("`shop_id` ASC"), ShopId_DESC("`shop_id` DESC"), Updatetime_ASC("`updatetime` ASC"), Updatetime_DESC("`updatetime` DESC"), Createtime_ASC("`createtime` ASC"), Createtime_DESC("`createtime` DESC");
private String value;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
index c5ec3dbdd..3b40aa046 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
@@ -145,11 +145,21 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
if (record.getId() == null) {
final IdWorker idWorker = IdWorker.get();
record.setId(idWorker.nextId());
+ //计租开始时间
Calendar instance = Calendar.getInstance();
instance.setTime(record.getRentalStartDate());
instance.add(Calendar.MONTH, record.getLease());
instance.add(Calendar.DAY_OF_MONTH, -1);
record.setRentalEndDate(instance.getTime());
+ //起租结束时间
+ if(!record.getStartDate().equals(record.getRentalStartDate())){
+ instance.clear();
+ instance.setTime(record.getRentalStartDate());
+ instance.add(Calendar.DAY_OF_MONTH, -1);
+ record.setEndDate(instance.getTime());
+ }else{
+ record.setEndDate(record.getStartDate());
+ }
Date date = new Date();
record.setCreatetime(date);
record.setUpdatetime(date);
@@ -187,6 +197,15 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
instance.add(Calendar.MONTH, record.getLease());
instance.add(Calendar.DAY_OF_MONTH, -1);
record.setRentalEndDate(instance.getTime());
+ //起租结束时间
+ if(!record.getStartDate().equals(record.getRentalStartDate())){
+ instance.clear();
+ instance.setTime(record.getRentalStartDate());
+ instance.add(Calendar.DAY_OF_MONTH, -1);
+ record.setEndDate(instance.getTime());
+ }else{
+ record.setEndDate(record.getStartDate());
+ }
record.setPrice(record.getPrice() != null ? record.getPrice() : 0);
record.setDeposit(record.getDeposit() != null ? record.getDeposit() : 0);
record.setUpdatetime(new Date());
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
index 8deebc787..4d018008c 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
@@ -118,11 +118,25 @@ public class WxRentContractServiceImpl implements WxRentContractService {
if (record.getId() == null) {
final IdWorker idWorker = IdWorker.get();
record.setId(idWorker.nextId());
+ if(record.getStartDate().after(record.getRentalStartDate())){
+ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"起租开始时间不能大于计租开始时间");
+ }
+ //计租开始时间
Calendar instance = Calendar.getInstance();
instance.setTime(record.getRentalStartDate());
instance.add(Calendar.MONTH, record.getLease());
instance.add(Calendar.DAY_OF_MONTH, -1);
record.setRentalEndDate(instance.getTime());
+ //起租结束时间
+ if(!record.getStartDate().equals(record.getRentalStartDate())){
+ instance.clear();
+ instance.setTime(record.getRentalStartDate());
+ instance.add(Calendar.DAY_OF_MONTH, -1);
+ record.setEndDate(instance.getTime());
+ }else{
+ record.setEndDate(record.getStartDate());
+ }
+
Date date = new Date();
record.setCreatetime(date);
record.setUpdatetime(date);
@@ -155,6 +169,16 @@ public class WxRentContractServiceImpl implements WxRentContractService {
instance.add(Calendar.DAY_OF_MONTH, -1);
record.setRentalEndDate(instance.getTime());
+ //起租结束时间
+ if(!record.getStartDate().equals(record.getRentalStartDate())){
+ instance.clear();
+ instance.setTime(record.getRentalStartDate());
+ instance.add(Calendar.DAY_OF_MONTH, -1);
+ record.setEndDate(instance.getTime());
+ }else{
+ record.setEndDate(record.getStartDate());
+ }
+
if (record.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) {
if (record.getRevenue() == null || record.getRevenue().intValue() == 0) {
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR, "营业额不能为空且大于0");
diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml
index 51d3bacbc..b2bbf70c3 100644
--- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml
@@ -30,10 +30,17 @@
+
+
- `id`,`merchant_id`,`price`,`rental_start_date`,`rental_end_date`,`sign_date`,`receive_period`,`tenant_id`,`filepath`,`status`,`contract_number`,`deposit`,`pay_date`,`is_del`,`merchant_name`,`brand`,`business_id`,`shop_type`,`shop_id`,`updatetime`,`createtime`,`rent_area`,`link_person`,`link_phone`,`pay_account`,`filename`,`lease`,`rent_contract_id`
+ `id`,`merchant_id`,`price`,`rental_start_date`,`rental_end_date`,
+ `sign_date`,`receive_period`,`tenant_id`,`filepath`,`status`,`contract_number`,
+ `deposit`,`pay_date`,`is_del`,`merchant_name`,`brand`,`business_id`,
+ `shop_type`,`shop_id`,`updatetime`,`createtime`,`rent_area`,
+ `link_person`,`link_phone`,`pay_account`,`filename`,`lease`,`rent_contract_id`,
+ `start_date`,`end_date`
@@ -66,6 +73,8 @@
and `filename` = #{filename}
and `lease` = #{lease}
and `rent_contract_id` = #{rentContractId}
+ and `start_date` = #{startDate}
+ and `end_date` = #{endDate}
and id in
@@ -84,10 +93,10 @@