From 2c05a49106f977b46689d122060b51f45ecbbf82 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Fri, 29 Nov 2024 23:01:49 +0800 Subject: [PATCH] fix --- .../iformall/controller/market/WxFinanceController.java | 1 + .../com/iformall/service/impl/WxAllBillServiceImpl.java | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java index 429c77e1b..70e2fd837 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -545,6 +545,7 @@ public class WxFinanceController extends BaseController { if (StringUtils.isNotBlank(record.getRemark())) { receive.setRemark(record.getRemark()); } + //TODO 如果此笔单据里面有预冲的,如果此预冲的费用被别的单据抵扣了,则不能作废。 wxFinanceService.invalidReceive(receive, getUser(),"收款单作废"); return new ResultData(); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java index 9d131cfdf..1a6a11548 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java @@ -412,16 +412,16 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill BigDecimal pay = new BigDecimal(dto.getAddpay()); if (latePayLastMoney.compareTo(pay) >= 0 ) { if (pay.compareTo(new BigDecimal(0)) > 0 ) { - wxBillRent.setPay(opay.toPlainString()); - sb.append(";已付金额增加").append(new BigDecimal(dto.getAddpay()).toPlainString()); + wxBillRent.setPay(opay.subtract(remainSetoff).toPlainString()); + sb.append(";实付金额增加").append(new BigDecimal(dto.getAddpay()).toPlainString()); //实际应收的抵扣 //remainSetoff = remainSetoff.subtract(latePayLastMoney.subtract(new BigDecimal(dto.getAddpay()))); } }else { if (pay.compareTo(new BigDecimal(0)) > 0 ) { - BigDecimal remainPay = new BigDecimal(dto.getAddpay()).subtract(latePayLastMoney); + BigDecimal remainPay = new BigDecimal(dto.getAddpay()).subtract(latePayLastMoney).subtract(remainSetoff); wxBillRent.setPay(remainPay.toPlainString()); - sb.append(";已付金额增加").append(remainPay.toPlainString()); + sb.append(";实付金额增加").append(remainPay.toPlainString()); } } }