From aebbb75d308e3577c32dafda496cc2b24d456336 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:53:53 +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 --- .../com/xm/core/service/XmTaskSbillDetailService.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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 23854900..ea360b84 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 @@ -70,16 +70,19 @@ public class XmTaskSbillDetailService extends BaseService { }else{ detail.setAmt(BigDecimal.ZERO); } + if("1".equals(detail.getOshare()) && detail.getShareFee()!=null && detail.getShareFee().compareTo(BigDecimal.ZERO)>0 ){ + + }else{ + detail.setShareFee(BigDecimal.ZERO); + } if(detail.getSfeeRate()!=null && detail.getSfeeRate()>0){ if(detail.getAmt()!=null){ detail.setSfee(detail.getAmt().multiply(BigDecimal.valueOf(detail.getSfeeRate()/100))); }else{ detail.setSfee(BigDecimal.ZERO); } - if(detail.getSamt()!=null){ - detail.setSfee(detail.getSamt().multiply(BigDecimal.valueOf(detail.getSfeeRate()/100))); - } } + detail.setSamt(detail.getAmt().subtract(detail.getShareFee()).subtract(detail.getSfee())); } }