From 30d71126da5cd11a07db033443b863e9de7e7e06 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 1 Aug 2019 15:26:10 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E5=8D=95=E5=AF=BC=E5=85=A5][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=85=B6=E4=BB=96=E6=8A=BC=E9=87=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxBillAllServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 51ed72e10..564e0f634 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -1194,7 +1194,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { otherDepositQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); WxBillOtherDeposit otherDeposit = wxBillOtherDepositMapper.selectOne(otherDepositQuery); if (otherDeposit != null) { - if (!otherDeposit.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { + if (!otherDeposit.getStatus().equals(EnumBillRentStatus.PAID.getCode()) && !otherDeposit.getStatus().equals(EnumBillRentStatus.RETURN.getCode())) { long allPay = new BigDecimal(otherDeposit.getPay()).add(new BigDecimal(pay)).longValueExact(); if (allPay >= receivePay) { otherDeposit.setStatus(EnumBillRentStatus.PAID.getCode());