修改问题

src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceImpl.java

@@ -2900,8 +2900,7 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
 
         // 外部
         exportFee.setExternalProportion(enterProportion);
-        exportFee.setExternalPremiums(premium.multiply(enterProportion.divide(new BigDecimal(100))).setScale(2,
-                BigDecimal.ROUND_DOWN));
+        exportFee.setExternalPremiums(premium.multiply(enterProportion.divide(new BigDecimal(100), 2, RoundingMode.DOWN)).setScale(2,  RoundingMode.DOWN));
 
         if (exportTotalProportion.compareTo(BigDecimal.ZERO) < 0 && premium.compareTo(BigDecimal.ZERO) == 0) {
             //出口比例为负数了

src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceNewImpl.java

@@ -663,13 +663,13 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
 
         // 外部费用
         insFeeOrderNew.setJqExternalProportion(jqExportFee.getExternalProportion());
-        insFeeOrderNew.setJqExportOtherCostsPremiums(jqExportFee.getExternalPremiums());
+        insFeeOrderNew.setJqExternalPremiums(jqExportFee.getExternalPremiums());
 
         insFeeOrderNew.setSyExternalProportion(syExportFee.getExternalProportion());
-        insFeeOrderNew.setSyExportOtherCostsPremiums(syExportFee.getExternalPremiums());
+        insFeeOrderNew.setSyExternalPremiums(syExportFee.getExternalPremiums());
 
         insFeeOrderNew.setNoExternalProportion(noExportFee.getExternalProportion());
-        insFeeOrderNew.setNoExportOtherCostsPremiums(noExportFee.getExternalPremiums());
+        insFeeOrderNew.setNoExternalPremiums(noExportFee.getExternalPremiums());
 
         //endregion
 
@@ -1430,13 +1430,13 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
 
         // 外部订单费用
         insFeeOrderNew.setJqExternalProportion(jqExportFee.getExternalProportion());
-        insFeeOrderNew.setJqExportOtherCostsPremiums(jqExportFee.getExternalPremiums());
+        insFeeOrderNew.setJqExternalPremiums(jqExportFee.getExternalPremiums());
 
         insFeeOrderNew.setSyExternalProportion(syExportFee.getExternalProportion());
-        insFeeOrderNew.setSyExportOtherCostsPremiums(syExportFee.getExternalPremiums());
+        insFeeOrderNew.setSyExternalPremiums(syExportFee.getExternalPremiums());
 
         insFeeOrderNew.setNoExternalProportion(noExportFee.getExternalProportion());
-        insFeeOrderNew.setNoExportOtherCostsPremiums(noExportFee.getExternalPremiums());
+        insFeeOrderNew.setNoExternalPremiums(noExportFee.getExternalPremiums());
 
         //endregion
 

src/main/java/com/ydtech/modules/fee/service/impl/InsFeeOrderConfigServiceImpl.java

@@ -12,6 +12,7 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 
 /**
  * @author Administrator
@@ -28,10 +29,10 @@ public class InsFeeOrderConfigServiceImpl extends ServiceImpl<InsFeeOrderConfigM
             return new BigDecimal(0);
         }
 
-        CostAllocation costAllocation = CostAllocation.CA_03;
+        CostAllocation costAllocation = CostAllocation.CA_04;
         InsFeeOrderConfig insFeeOrderConfig = lambdaQuery().eq(InsFeeOrderConfig::getKeyword, costAllocation).one();
 
-        if(ObjectUtils.isNotEmpty(insFeeOrderConfig)){
+        if (ObjectUtils.isNotEmpty(insFeeOrderConfig)) {
             return insFeeOrderConfig.getVal();
         }
 

src/main/java/com/ydtech/modules/protocols/service/impl/PtlAgreementProductCostsNewServiceImpl.java

@@ -1559,13 +1559,13 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
 
         // 外部订单
         insFeeOrderNew.setJqExternalProportion(jqExportFee.getExternalProportion());
-        insFeeOrderNew.setJqExportOtherCostsPremiums(jqExportFee.getExternalPremiums());
+        insFeeOrderNew.setJqExternalPremiums(jqExportFee.getExternalPremiums());
 
         insFeeOrderNew.setSyExternalProportion(syExportFee.getExternalProportion());
-        insFeeOrderNew.setSyExportOtherCostsPremiums(syExportFee.getExternalPremiums());
+        insFeeOrderNew.setSyExternalPremiums(syExportFee.getExternalPremiums());
 
         insFeeOrderNew.setNoExternalProportion(noExportFee.getExternalProportion());
-        insFeeOrderNew.setNoExportOtherCostsPremiums(noExportFee.getExternalPremiums());
+        insFeeOrderNew.setNoExternalPremiums(noExportFee.getExternalPremiums());
 
         FeeOrderNewVo resultFeeOrderNewVo = new FeeOrderNewVo();
         resultFeeOrderNewVo.setEntranceFee(entranceFeeList);