From 7bb4499dec67ae8d758ee34e7ddc20f7631184e8 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 31 Jul 2019 15:10:04 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=9F=E9=87=91=E7=89=A9=E4=B8=9A=E8=B4=A6?= =?UTF-8?q?=E5=8D=95][=E4=BF=AE=E6=94=B9][=E5=AF=BC=E5=87=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8A=BC=E9=87=91=E7=8A=B6=E6=80=81=E9=97=AE=E9=A2=98?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/domain/po/WxBillProperty.java | 6 ++++-- .../src/main/java/com/iformall/domain/po/WxBillRent.java | 2 +- .../iformall/service/impl/WxBillPropertyServiceImpl.java | 3 +++ .../com/iformall/service/impl/WxBillRentServiceImpl.java | 3 +++ 4 files changed, 11 insertions(+), 3 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 2f6d28522..dc1c949c1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java @@ -162,8 +162,10 @@ public class WxBillProperty extends BaseEntity { @Excel(name = "商铺号", width = 20, orderNum = "1") @Transient private String shopNumber; - @Transient - private Integer depositStatus; + + @Excel(name = "押金状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6", "无押金_0"}, width = 20, orderNum = "3") + @Transient + private Integer depositStatus; @Transient private Long deposit; 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 1f0120113..460af80d8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -166,7 +166,7 @@ public class WxBillRent extends BaseEntity { @Transient private String shopNumber; - @Excel(name = "押金状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6"}, width = 20, orderNum = "3") + @Excel(name = "押金状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6", "无押金_0"}, width = 20, orderNum = "3") @Transient private Integer depositStatus; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index 57e1d617c..d5ecaf773 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -316,6 +316,9 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { b.setLatePayPrice(divide.longValue()); } } + if (b.getDepositStatus() == null) { + b.setDepositStatus(0); + } }); Map> collect = billPropertyList.parallelStream() diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 5cdd76b6f..f5ff51333 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -351,6 +351,9 @@ public class WxBillRentServiceImpl implements WxBillRentService { b.setLatePayPrice(divide.longValue()); } } + if (b.getDepositStatus() == null) { + b.setDepositStatus(0); + } }); Map> collect = billRentList.parallelStream()