浏览代码

费用修改bug

785834757 2 年之前
父节点
当前提交
7e745a83ed
共有 1 个文件被更改,包括 8 次插入3 次删除
  1. 8 3
      src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceImpl.java

+ 8 - 3
src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceImpl.java

@@ -2729,8 +2729,10 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
                 .add(insFeeOrderNew.getSyDeptProportionLevel5());
 
         //商业总出口费比例
-        BigDecimal syExportTotalProportion = syEntranceFee.getTotalProportion().subtract(sumSyDeptProportion).subtract(sumRetail);
-
+        BigDecimal syExportTotalProportion = new BigDecimal(0);
+        if(syEntranceFee.getTotalProportion().compareTo(new BigDecimal(0)) > 0) {
+            syExportTotalProportion = syEntranceFee.getTotalProportion().subtract(sumSyDeptProportion).subtract(sumRetail);
+        }
         //商业出口手续费比例
         BigDecimal syExportSuperviseCosts =
                 syExportTotalProportion.compareTo(syEntranceFee.getSuperviseCosts()) > 0 ? syEntranceFee.getSuperviseCosts() : syExportTotalProportion;
@@ -2785,7 +2787,10 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
                 .add(insFeeOrderNew.getNoDeptProportionLevel5());
 
         //非车总出口费比例
-        BigDecimal nonExportTotalProportion = nonEntranceFee.getTotalProportion().subtract(sumNonDeptProportion).subtract(sumRetail);
+        BigDecimal nonExportTotalProportion = new BigDecimal(0);
+        if(nonEntranceFee.getTotalProportion().compareTo(new BigDecimal(0)) > 0) {
+            nonExportTotalProportion = nonEntranceFee.getTotalProportion().subtract(sumSyDeptProportion).subtract(sumRetail);
+        }
 
         //非车出口手续费比例
         BigDecimal nonExportSuperviseCosts =