From 4a0b3aa3d10ec5d39ce5acc69bf303f69b06209e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Mon, 25 Apr 2022 02:57:31 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90=E5=B7=A5?= =?UTF-8?q?=E6=97=B6=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xm/core/service/XmTaskSbillDetailService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskSbillDetailService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskSbillDetailService.java index ea360b84..e8dd6480 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskSbillDetailService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskSbillDetailService.java @@ -82,7 +82,12 @@ public class XmTaskSbillDetailService extends BaseService { detail.setSfee(BigDecimal.ZERO); } } - detail.setSamt(detail.getAmt().subtract(detail.getShareFee()).subtract(detail.getSfee())); + if(detail.getOthFee()==null){ + detail.setOthFee(BigDecimal.ZERO); + }else if(detail.getOthFee().compareTo(BigDecimal.ZERO)<0){ + detail.setOthFee(BigDecimal.ZERO); + } + detail.setSamt(detail.getAmt().subtract(detail.getShareFee()).subtract(detail.getSfee()).subtract(detail.getOthFee())); } }