From 331d8c5b702a55395dd543186cd54df14f556a19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 25 Apr 2022 02:45:43 +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

---
 .../service/XmTaskSbillDetailService.java     | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 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 cb6fe9db..23854900 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
@@ -66,17 +66,18 @@ public class XmTaskSbillDetailService extends BaseService {
      */
     public void preCalcSamt(XmTaskSbillDetail detail) {
         if(detail.getQuoteAt()!=null){
-            detail.setSamt(detail.getQuoteAt());
-        }else if(detail.getBudgetAt()==null && detail.getQuoteAt()==null){
-            detail.setSamt(BigDecimal.ZERO);
-        }else if(detail.getBudgetAt()!=null){
-            detail.setSamt(detail.getBudgetAt());
+            detail.setAmt(detail.getQuoteAt());
+        }else{
+            detail.setAmt(BigDecimal.ZERO);
         }
-        if("1".equals(detail.getOshare())){
-            if(detail.getShareFee()!=null && detail.getShareFee().compareTo(BigDecimal.ZERO)>0){
-                if(detail.getSamt()!=null){
-                    detail.setSamt(detail.getSamt().subtract(detail.getShareFee()));
-                }
+        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)));
             }
         }