From 3b54cf17d7266294efb6eea6f79c99bd46e93cd1 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 25 Oct 2018 10:09:06 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=89=A9=E4=B8=9A=E8=B4=A6=E5=8D=95][?= =?UTF-8?q?=E7=89=A9=E4=B8=9A=E6=8A=BC=E9=87=91][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=AD=97=E6=AE=B5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/domain/po/WxBillProperty.java | 20 ++++++++++++------- .../domain/po/WxBillPropertyDeposit.java | 18 +++++++++++------ .../mapper/WxBillPropertyDepositMapper.xml | 10 +++++----- .../resources/mapper/WxBillPropertyMapper.xml | 10 +++++----- 4 files changed, 35 insertions(+), 23 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java index 6d947434d..c1a1d3c87 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java @@ -8,6 +8,9 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +/** + * @author gongbiao + */ @Table(name = "wx_bill_property") public class WxBillProperty implements Serializable { private static final long serialVersionUID = 1L; @@ -41,8 +44,8 @@ public class WxBillProperty implements Serializable { private String merchantName; /*租金合同ID**/ - @io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="rentContractId") - private Long rentContractId; + @io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="propertyContractId") + private Long propertyContractId; /*实际应收金额**/ @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") private Integer receivePay; @@ -88,12 +91,15 @@ public class WxBillProperty implements Serializable { /*更新时间**/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") private Date updatetime; - public Long getRentContractId() { - return rentContractId; + + public Long getPropertyContractId() { + return propertyContractId; } - public void setRentContractId(Long _rentContractId) { - rentContractId = _rentContractId; + + public void setPropertyContractId(Long propertyContractId) { + this.propertyContractId = propertyContractId; } + public Integer getReceivePay() { return receivePay; } @@ -196,7 +202,7 @@ public class WxBillProperty implements Serializable { public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,RentContractId_ASC("`rentContractId` ASC"),RentContractId_DESC("`rentContractId` DESC") + ,RentContractId_ASC("`propertyContractId` ASC"),RentContractId_DESC("`propertyContractId` DESC") ,ReceivePay_ASC("`receivePay` ASC"),ReceivePay_DESC("`receivePay` DESC") ,Pay_ASC("`pay` ASC"),Pay_DESC("`pay` DESC") ,ReceiveDate_ASC("`receiveDate` ASC"),ReceiveDate_DESC("`receiveDate` DESC") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java index a7d3574ee..0824069e7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java @@ -8,6 +8,9 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +/** + * @author gongbiao + */ @Table(name = "wx_bill_property_deposit") public class WxBillPropertyDeposit implements Serializable { private static final long serialVersionUID = 1L; @@ -41,8 +44,8 @@ public class WxBillPropertyDeposit implements Serializable { private String merchantName; /*租金合同ID**/ - @io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="rentContractId") - private Long rentContractId; + @io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="propertyContractId") + private Long propertyContractId; /*实际应收金额**/ @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") private Integer receivePay; @@ -88,12 +91,15 @@ public class WxBillPropertyDeposit implements Serializable { /*更新时间**/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") private Date updatetime; - public Long getRentContractId() { - return rentContractId; + + public Long getPropertyContractId() { + return propertyContractId; } - public void setRentContractId(Long _rentContractId) { - rentContractId = _rentContractId; + + public void setPropertyContractId(Long propertyContractId) { + this.propertyContractId = propertyContractId; } + public Integer getReceivePay() { return receivePay; } diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml index db8c02a0c..fe2ea8515 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml @@ -3,7 +3,7 @@ - + @@ -22,13 +22,13 @@ - `id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`,`merchant_id`,`user_id`,`shop_id`,`updatetime` + `id`,`property_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`,`merchant_id`,`user_id`,`shop_id`,`updatetime` where 1 = 1 and `id` = #{id} - and `rent_contract_id` = #{rentContractId} + and `property_contract_id` = #{propertyContractId} and `receive_pay` = #{receivePay} and `pay` = #{pay} and `receive_date` = #{receiveDate} @@ -90,8 +90,8 @@ update wx_bill_property_deposit set status=#{waitPay} where id in( - select a.id from (select br.id,rc.receive_period,br.rent_contract_id,br.receive_date from wx_bill_property_deposit br - left join wx_rent_contract rc on br.rent_contract_id=rc.id + select a.id from (select br.id,rc.receive_period,br.property_contract_id,br.receive_date from wx_bill_property_deposit br + left join wx_property_contract rc on br.property_contract_id=rc.id where br.tenant_id=#{tenantId} and br.status!=#{paid} and now() < br.receive_date and DATE_ADD(now(),INTERVAL 1 MONTH)>br.receive_date) a) diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index 167e099f9..457b4ba8b 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -3,7 +3,7 @@ - + @@ -22,13 +22,13 @@ - `id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`,`merchant_id`,`user_id`,`shop_id`,`updatetime` + `id`,`property_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`,`merchant_id`,`user_id`,`shop_id`,`updatetime` where 1 = 1 and `id` = #{id} - and `rent_contract_id` = #{rentContractId} + and `property_contract_id` = #{propertyContractId} and `receive_pay` = #{receivePay} and `pay` = #{pay} and `receive_date` = #{receiveDate} @@ -90,8 +90,8 @@ update wx_bill_property set status=#{waitPay} where id in( - select a.id from (select br.id,rc.receive_period,br.rent_contract_id,br.receive_date from wx_bill_property br - left join wx_rent_contract rc on br.rent_contract_id=rc.id + select a.id from (select br.id,rc.receive_period,br.property_contract_id,br.receive_date from wx_bill_property br + left join wx_property_contract rc on br.property_contract_id=rc.id where br.tenant_id=#{tenantId} and br.status!=#{paid} and now() < br.receive_date and DATE_ADD(now(),INTERVAL 1 MONTH)>br.receive_date) a)