From eb5558b14a2370203c58fce2b585e5d287846351 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 2 Jul 2019 18:12:57 +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=85=A5=E6=95=B0=E6=8D=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxBillAllServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 054080e02..048f2b469 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -968,7 +968,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { } rentQuery.setIsPreview(EnumIsPreview.NO.getCode()); WxBillRent rent = wxBillRentMapper.selectOne(rentQuery); - if (rent != null) { + if (rent != null && !rent.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { long pay = new BigDecimal(bill.getPayStr()).multiply(new BigDecimal(100)).longValueExact(); if (rent.getOwe() <= pay) { rent.setStatus(EnumBillRentStatus.PAID.getCode()); @@ -993,7 +993,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { } propertyQuery.setIsPreview(EnumIsPreview.NO.getCode()); WxBillProperty property = wxBillPropertyMapper.selectOne(propertyQuery); - if (property != null) { + if (property != null && !property.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { long pay = new BigDecimal(bill.getPayStr()).multiply(new BigDecimal(100)).longValueExact(); if (property.getOwe() <= pay) { property.setStatus(EnumBillRentStatus.PAID.getCode()); @@ -1023,7 +1023,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { dailyQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); WxBillDaily daily = wxBillDailyMapper.selectOne(dailyQuery); long pay = new BigDecimal(bill.getPayStr()).multiply(new BigDecimal(100)).longValueExact(); - if (daily != null) { + if (daily != null && !daily.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { if (daily.getOwe() <= pay) { daily.setStatus(EnumBillRentStatus.PAID.getCode()); } @@ -1070,7 +1070,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { otherQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); WxBillOther other = wxBillOtherMapper.selectOne(otherQuery); long pay = new BigDecimal(bill.getPayStr()).multiply(new BigDecimal(100)).longValueExact(); - if (other != null) { + if (other != null && !other.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { if (other.getOwe() <= pay) { other.setStatus(EnumBillRentStatus.PAID.getCode()); } @@ -1118,7 +1118,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { otherDepositQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); WxBillOtherDeposit otherDeposit = wxBillOtherDepositMapper.selectOne(otherDepositQuery); long pay = new BigDecimal(bill.getPayStr()).multiply(new BigDecimal(100)).longValueExact(); - if (otherDeposit != null) { + if (otherDeposit != null && !otherDeposit.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { if (otherDeposit.getOwe() <= pay) { otherDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); }