|
@@ -2729,8 +2729,10 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
|
|
|
.add(insFeeOrderNew.getSyDeptProportionLevel5());
|
|
.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 =
|
|
BigDecimal syExportSuperviseCosts =
|
|
|
syExportTotalProportion.compareTo(syEntranceFee.getSuperviseCosts()) > 0 ? syEntranceFee.getSuperviseCosts() : syExportTotalProportion;
|
|
syExportTotalProportion.compareTo(syEntranceFee.getSuperviseCosts()) > 0 ? syEntranceFee.getSuperviseCosts() : syExportTotalProportion;
|
|
@@ -2785,7 +2787,10 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
|
|
|
.add(insFeeOrderNew.getNoDeptProportionLevel5());
|
|
.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 =
|
|
BigDecimal nonExportSuperviseCosts =
|