From ca1a7897c4fb8800b51ab629e45ec5c7f9475317 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 23 Oct 2019 17:13:20 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E5=8D=95][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxBillAllServiceImpl.java | 5 ++--- .../com/iformall/service/impl/WxBillDailyServiceImpl.java | 3 +++ .../iformall/service/impl/WxBillOtherDepositServiceImpl.java | 3 +++ .../com/iformall/service/impl/WxBillOtherServiceImpl.java | 3 +++ .../com/iformall/service/impl/WxBillPropertyServiceImpl.java | 3 +++ .../com/iformall/service/impl/WxBillRentServiceImpl.java | 3 +++ 6 files changed, 17 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index bb1a5e6d2..6d3da94d4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -169,10 +169,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { Long realReceivePay = servicePay.longValue() + e.getLatePayPrice() + e.getReceivePay(); e.setRealReceivePay(realReceivePay); e.setServiceChargePay(servicePay.intValue()); - if (e.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { - e.setRealReceivePay(e.getPay()); + if (!e.getStatus().equals(EnumBillRentStatus.NOT_PAID.getCode())) { + e.setOwe(0L); } - e.setOwe(realReceivePay - e.getPay()); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index c3d469ca4..e7889159b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -83,6 +83,9 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { Long realReceivePay = servicePay.longValue() + e.getReceivePay(); e.setRealReceivePay(realReceivePay); e.setServiceChargePay(servicePay.intValue()); + if (!e.getStatus().equals(EnumBillRentStatus.NOT_PAID.getCode())) { + e.setOwe(0L); + } } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java index 1655a9564..18f3416aa 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -78,6 +78,9 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService Long realReceivePay = servicePay.longValue() + e.getReceivePay(); e.setRealReceivePay(realReceivePay); e.setServiceChargePay(servicePay.intValue()); + if (!e.getStatus().equals(EnumBillRentStatus.NOT_PAID.getCode())) { + e.setOwe(0L); + } } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java index cdf5e674a..1ece26969 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java @@ -78,6 +78,9 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { Long realReceivePay = servicePay.longValue() + e.getReceivePay(); e.setRealReceivePay(realReceivePay); e.setServiceChargePay(servicePay.intValue()); + if (!e.getStatus().equals(EnumBillRentStatus.NOT_PAID.getCode())) { + e.setOwe(0L); + } } } 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 8a86abc4e..f64a20240 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -85,6 +85,9 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { Long realReceivePay = servicePay.longValue() + e.getLatePayPrice() + e.getReceivePay(); e.setRealReceivePay(realReceivePay); e.setServiceChargePay(servicePay.intValue()); + if (!e.getStatus().equals(EnumBillRentStatus.NOT_PAID.getCode())) { + e.setOwe(0L); + } } } 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 17ebe6ea5..6dc653cc6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -87,6 +87,9 @@ public class WxBillRentServiceImpl implements WxBillRentService { Long realReceivePay = servicePay.longValue() + rent.getLatePayPrice() + rent.getReceivePay(); rent.setRealReceivePay(realReceivePay); rent.setServiceChargePay(servicePay.intValue()); + if (!rent.getStatus().equals(EnumBillRentStatus.NOT_PAID.getCode())) { + rent.setOwe(0L); + } } }