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 ef682723e..33bcf9ac2 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java
@@ -128,6 +128,17 @@ public class WxBillProperty implements Serializable {
@io.swagger.annotations.ApiModelProperty(value = "滞纳金状态", name = "latePayStatus")
private Integer latePayStatus;
+ @io.swagger.annotations.ApiModelProperty(value = "备注", name = "comments")
+ private String comments;
+
+ public String getComments() {
+ return comments;
+ }
+
+ public void setComments(String comments) {
+ this.comments = comments;
+ }
+
public Integer getLatePayStatus() {
return latePayStatus;
}
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java
index 5042c9101..d907de37c 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java
@@ -131,6 +131,17 @@ public class WxBillRent implements Serializable {
@io.swagger.annotations.ApiModelProperty(value = "滞纳金状态", name = "latePayStatus")
private Integer latePayStatus;
+ @io.swagger.annotations.ApiModelProperty(value = "备注", name = "comments")
+ private String comments;
+
+ public String getComments() {
+ return comments;
+ }
+
+ public void setComments(String comments) {
+ this.comments = comments;
+ }
+
public Integer getLatePayStatus() {
return latePayStatus;
}
diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
index 5410dd626..7e3200772 100644
--- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
@@ -29,6 +29,7 @@
+
@@ -37,7 +38,7 @@
`createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`,
`merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,
`revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`,
- `pay_way`,`late_pay_status`
+ `pay_way`,`late_pay_status`,`comments`
@@ -90,7 +91,8 @@
else FLOOR(DATEDIFF(now(),br.late_pay_time)*br.late_pay_ratio/10000*br.owe)end)
else br.late_pay_price end latePayPrice,
(select max(period) from wx_bill_property where property_contract_id=br.property_contract_id)
- allPeriod,d.`status` depositStatus,br.`shop_info` shopInfo,br.pay_way payWay,br.late_pay_status latePayStatus
+ allPeriod,d.`status` depositStatus,br.`shop_info` shopInfo,br.pay_way payWay,br.late_pay_status latePayStatus,
+ br.`comments`
from wx_bill_property br left join wx_merchant m on br.merchant_id=m.id
left join wx_shop s on br.shop_id=s.id
left join wx_bill_property_deposit d on br.property_contract_id=d.property_contract_id
@@ -156,6 +158,7 @@
update wx_bill_property set updatetime = now()
,receive_pay = #{receivePay},owe=#{receivePay}
+ ,comments = #{comments}
where id = #{id}
diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml
index 8843a1d27..cf17dc361 100644
--- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml
@@ -29,6 +29,7 @@
+
@@ -37,7 +38,7 @@
`createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`,
`merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,
`revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`,
- `pay_way`,`late_pay_status`
+ `pay_way`,`late_pay_status`,`comments`
@@ -93,7 +94,8 @@
else FLOOR(DATEDIFF(now(),br.late_pay_time)*br.late_pay_ratio/10000*br.owe)end)
else br.late_pay_price end latePayPrice,
(select max(period) from wx_bill_rent where rent_contract_id=br.rent_contract_id) allPeriod,d.`status`
- depositStatus,br.shop_info shopInfo,br.pay_way payWay,br.late_pay_status latePayStatus
+ depositStatus,br.shop_info shopInfo,br.pay_way payWay,br.late_pay_status latePayStatus,
+ br.`comments`
from wx_bill_rent br left join wx_merchant m on br.merchant_id=m.id
left join wx_shop s on br.shop_id=s.id
left join wx_rent_contract r on br.rent_contract_id=r.id
@@ -154,6 +156,7 @@
update wx_bill_rent set updatetime = now()
,receive_pay = #{receivePay},owe=#{receivePay}
+ ,comments = #{comments}
where id = #{id}