| @@ -162,8 +162,10 @@ public class WxBillProperty extends BaseEntity { | |||||
| @Excel(name = "商铺号", width = 20, orderNum = "1") | @Excel(name = "商铺号", width = 20, orderNum = "1") | ||||
| @Transient | @Transient | ||||
| private String shopNumber; | 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 | @Transient | ||||
| private Long deposit; | private Long deposit; | ||||
| @@ -166,7 +166,7 @@ public class WxBillRent extends BaseEntity { | |||||
| @Transient | @Transient | ||||
| private String shopNumber; | 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 | @Transient | ||||
| private Integer depositStatus; | private Integer depositStatus; | ||||
| @@ -316,6 +316,9 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { | |||||
| b.setLatePayPrice(divide.longValue()); | b.setLatePayPrice(divide.longValue()); | ||||
| } | } | ||||
| } | } | ||||
| if (b.getDepositStatus() == null) { | |||||
| b.setDepositStatus(0); | |||||
| } | |||||
| }); | }); | ||||
| Map<Long, List<WxBillProperty>> collect = billPropertyList.parallelStream() | Map<Long, List<WxBillProperty>> collect = billPropertyList.parallelStream() | ||||
| @@ -351,6 +351,9 @@ public class WxBillRentServiceImpl implements WxBillRentService { | |||||
| b.setLatePayPrice(divide.longValue()); | b.setLatePayPrice(divide.longValue()); | ||||
| } | } | ||||
| } | } | ||||
| if (b.getDepositStatus() == null) { | |||||
| b.setDepositStatus(0); | |||||
| } | |||||
| }); | }); | ||||
| Map<Long, List<WxBillRent>> collect = billRentList.parallelStream() | Map<Long, List<WxBillRent>> collect = billRentList.parallelStream() | ||||