|
|
|
@@ -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()); |
|
|
|
|