费用计算修改调整

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

@@ -2645,17 +2645,23 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
                 .add(insFeeOrderNew.getJqDeptPremiumsLevel3())
                 .add(insFeeOrderNew.getJqDeptPremiumsLevel4())
                 .add(insFeeOrderNew.getJqDeptPremiumsLevel5());
-        BigDecimal jqProportion = insFeeOrderNew.getJqPremium().divide(sumJqDeptPremiums);
+        BigDecimal jqProportion = insFeeOrderNew.getJqDeptProportionLevel1()
+                .add(insFeeOrderNew.getJqDeptProportionLevel2())
+                .add(insFeeOrderNew.getJqDeptProportionLevel3())
+                .add(insFeeOrderNew.getJqDeptProportionLevel4())
+                .add(insFeeOrderNew.getJqDeptProportionLevel5());
         jqExportFee.setTotalAmount(sumJqDeptPremiums);
         jqExportFee.setTotalProportion(jqProportion);
         if(sumJqDeptPremiums.compareTo(new BigDecimal(4)) > 0) {
             jqExportFee.setSuperviseCosts(new BigDecimal(4));
-            jqExportFee.setSuperviseCostsPremiums(sumJqDeptPremiums.multiply(new BigDecimal(4).divide(new BigDecimal(100))));
+            jqExportFee.setSuperviseCostsPremiums(insFeeOrderNew.getJqPremium().multiply(new BigDecimal(4).divide(new BigDecimal(100))));
             jqExportFee.setOtherCostsProportion(jqProportion.subtract(new BigDecimal(4)));
             jqExportFee.setOtherCostsPremiums(sumJqDeptPremiums.subtract(jqExportFee.getSuperviseCostsPremiums()));
         }else{
             jqExportFee.setSuperviseCosts(jqProportion);
             jqExportFee.setSuperviseCostsPremiums(sumJqDeptPremiums);
+            jqExportFee.setOtherCostsProportion(new BigDecimal(0));
+            jqExportFee.setOtherCostsPremiums(new BigDecimal(0));
         }
         exportFeeList.add(jqExportFee);
 
@@ -2697,12 +2703,14 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         syExportFee.setTotalProportion(syProportion);
         if(sumSyDeptPremiums.compareTo(new BigDecimal(4)) > 0) {
             syExportFee.setSuperviseCosts(new BigDecimal(4));
-            syExportFee.setSuperviseCostsPremiums(sumSyDeptPremiums.multiply(new BigDecimal(4)));
+            syExportFee.setSuperviseCostsPremiums(insFeeOrderNew.getSyPremium().multiply(new BigDecimal(4).divide(new BigDecimal(100))));
             syExportFee.setOtherCostsProportion(syProportion.subtract(new BigDecimal(4)));
             syExportFee.setOtherCostsPremiums(sumSyDeptPremiums.subtract(syExportFee.getSuperviseCostsPremiums()));
         }else{
             syExportFee.setSuperviseCosts(syProportion);
             syExportFee.setSuperviseCostsPremiums(sumSyDeptPremiums);
+            syExportFee.setOtherCostsProportion(syProportion.subtract(new BigDecimal(0)));
+            syExportFee.setOtherCostsPremiums(sumSyDeptPremiums.subtract(new BigDecimal(0)));
         }
         exportFeeList.add(syExportFee);
 
@@ -2745,12 +2753,14 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         nonExportFee.setTotalProportion(nonProportion);
         if(sumNonDeptPremiums.compareTo(new BigDecimal(4)) > 0) {
             nonExportFee.setSuperviseCosts(new BigDecimal(4));
-            nonExportFee.setSuperviseCostsPremiums(sumNonDeptPremiums.multiply(new BigDecimal(4)));
+            nonExportFee.setSuperviseCostsPremiums(insFeeOrderNew.getNoPremium().multiply(new BigDecimal(4).divide(new BigDecimal(100))));
             nonExportFee.setOtherCostsProportion(nonProportion.subtract(new BigDecimal(4)));
             nonExportFee.setOtherCostsPremiums(sumNonDeptPremiums.subtract(nonExportFee.getSuperviseCostsPremiums()));
         }else{
             nonExportFee.setSuperviseCosts(nonProportion);
             nonExportFee.setSuperviseCostsPremiums(sumNonDeptPremiums);
+            nonExportFee.setOtherCostsProportion(new BigDecimal(0));
+            nonExportFee.setOtherCostsPremiums(new BigDecimal(0));
         }
         exportFeeList.add(nonExportFee);