diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904151140__UPDATE_BILL_RENT.sql b/mallinkAdmin/src/main/resources/db/migration/V201904151140__UPDATE_BILL_RENT.sql
new file mode 100644
index 000000000..403ced5d2
--- /dev/null
+++ b/mallinkAdmin/src/main/resources/db/migration/V201904151140__UPDATE_BILL_RENT.sql
@@ -0,0 +1,5 @@
+alter table wx_bill_rent
+add column `late_pay_status` smallint(2) default 2 COMMENT '滞纳金状态(使用账单的状态)';
+
+alter table wx_bill_property
+add column `late_pay_status` smallint(2) default 2 COMMENT '滞纳金状态(使用账单的状态)';
\ No newline at end of file
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 55ac3abd2..ef682723e 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java
@@ -125,6 +125,17 @@ public class WxBillProperty implements Serializable {
@io.swagger.annotations.ApiModelProperty(value = "支付方式:见枚举EnumBillPayWay", name = "payWay")
private Integer payWay;
+ @io.swagger.annotations.ApiModelProperty(value = "滞纳金状态", name = "latePayStatus")
+ private Integer latePayStatus;
+
+ public Integer getLatePayStatus() {
+ return latePayStatus;
+ }
+
+ public void setLatePayStatus(Integer latePayStatus) {
+ this.latePayStatus = latePayStatus;
+ }
+
public Integer getPayWay() {
return payWay;
}
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 54d9781ed..5042c9101 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java
@@ -127,6 +127,18 @@ public class WxBillRent implements Serializable {
@io.swagger.annotations.ApiModelProperty(value = "支付方式:见枚举EnumBillPayWay", name = "payWay")
private Integer payWay;
+
+ @io.swagger.annotations.ApiModelProperty(value = "滞纳金状态", name = "latePayStatus")
+ private Integer latePayStatus;
+
+ public Integer getLatePayStatus() {
+ return latePayStatus;
+ }
+
+ public void setLatePayStatus(Integer latePayStatus) {
+ this.latePayStatus = latePayStatus;
+ }
+
public Integer getPayWay() {
return payWay;
}
diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
index 303faa46c..2925b32a7 100644
--- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
@@ -28,6 +28,7 @@
+
@@ -36,7 +37,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`
+ `pay_way`,`late_pay_status`
@@ -62,6 +63,7 @@
and is_preview = 0
and is_preview = #{isPreview}
and `pay_way` = #{payWay}
+ and `late_pay_status` = #{latePayStatus}
and id in
@@ -87,7 +89,7 @@
else
FLOOR(DATEDIFF(now(),br.late_pay_time)*br.late_pay_ratio/10000*br.owe) 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
+ allPeriod,d.`status` depositStatus,br.`shop_info` shopInfo,br.pay_way payWay,br.late_pay_status latePayStatus
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
@@ -103,6 +105,7 @@
and br.`rent_shop_type` = #{rentShopType}
and br.`property_contract_id` = #{propertyContractId}
and br.`pay_way` = #{payWay}
+ and br.`late_pay_status` = #{latePayStatus}
order by br.${sortColumns}
diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml
index d8f9240e6..48fcaef68 100644
--- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml
@@ -28,6 +28,7 @@
+
@@ -36,7 +37,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`
+ `pay_way`,`late_pay_status`
@@ -62,6 +63,7 @@
and is_preview = 0
and is_preview = #{isPreview}
and `pay_way` = #{payWay}
+ and `late_pay_status` = #{latePayStatus}
and id in
@@ -89,7 +91,7 @@
br.`rent_contract_id` rentContractId,d.receive_pay deposit,case when br.late_pay_time is null then 0 else
FLOOR(DATEDIFF(now(),br.late_pay_time)*br.late_pay_ratio/10000*br.owe) 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
+ depositStatus,br.shop_info shopInfo,br.pay_way payWay,br.late_pay_status latePayStatus
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
@@ -106,6 +108,7 @@
and br.`rent_shop_type` = #{rentShopType}
and br.`rent_contract_id` = #{rentContractId}
and br.`pay_way` = #{payWay}
+ and br.`late_pay_status` = #{latePayStatus}
order by br.${sortColumns}