外部订单配置修改

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

@@ -2671,7 +2671,6 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         entranceFeeList.add(noEntranceFee);
         //endregion
 
-
         //region 机构管理对象
 
         //交强
@@ -2683,6 +2682,9 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
                 insFeeOrderNew.getJqDeptProportionLevel5(), insFeeOrderNew.getJqDeptPremiumsLevel5(),
                 insFeeOrderNew.getJqProfitMarginPremiums(),
                 insFeeOrderNew.getJqExternalProportion(), insFeeOrderNew.getJqExternalPremiums());
+        jqDeptManagerFee.setExternalProportion(insFeeOrderNew.getJqExternalProportion());
+        jqDeptManagerFee.setExternalPremiums(insFeeOrderNew.getJqExternalPremiums());
+
         deptManagerFeeList.add(jqDeptManagerFee);
 
         //商业
@@ -2694,6 +2696,8 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
                 insFeeOrderNew.getSyDeptProportionLevel5(), insFeeOrderNew.getSyDeptPremiumsLevel5(),
                 insFeeOrderNew.getSyProfitMarginPremiums(),
                 insFeeOrderNew.getJqExternalProportion(), insFeeOrderNew.getJqExternalPremiums());
+        syDeptManagerFee.setExternalProportion(insFeeOrderNew.getSyExternalProportion());
+        syDeptManagerFee.setExternalPremiums(insFeeOrderNew.getSyExternalPremiums());
         deptManagerFeeList.add(syDeptManagerFee);
 
         //非车
@@ -2705,6 +2709,8 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
                 insFeeOrderNew.getNoDeptProportionLevel5(), insFeeOrderNew.getNoDeptPremiumsLevel5(),
                 insFeeOrderNew.getNoProfitMarginPremiums(),
                 insFeeOrderNew.getJqExternalProportion(), insFeeOrderNew.getJqExternalPremiums());
+        noDeptManagerFee.setExternalProportion(insFeeOrderNew.getNoExternalProportion());
+        noDeptManagerFee.setExternalPremiums(insFeeOrderNew.getNoExternalPremiums());
         deptManagerFeeList.add(noDeptManagerFee);
 
         //endregion

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

@@ -693,31 +693,37 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
         BigDecimal noThird = insFeeOrderNew.getNoPremium().multiply(insFeeOrderNew.getNoRetailProportionLevel3().divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_DOWN);
         BigDecimal noFenXiao = noFirst.add(noSecond).add(noThird);
 
-
-        BigDecimal jqDifference = jqEntranceFee.getTotalAmount().subtract(
+        BigDecimal jqDifference = jqEntranceFee.getTotalAmount()
+                .subtract(jqExportFee.getExternalPremiums())
+                .subtract(
                         (jqExportFee.getSuperviseCostsPremiums().add(jqExportFee.getOtherCostsPremiums())))
                 .subtract(
                         (jqDeptManagerFee.getDeptPremiumsLevelOne().add(jqDeptManagerFee.getDeptPremiumsLevelTwo().add(jqDeptManagerFee.getDeptPremiumsLevelThree()).add(jqDeptManagerFee.getDeptPremiumsLevelFoure()).add(jqDeptManagerFee.getDeptPremiumsLevelFive())))
                 )
-                .subtract(jqFenXiao).setScale(5, BigDecimal.ROUND_HALF_DOWN);
+                .subtract(jqFenXiao)
+                .setScale(5, BigDecimal.ROUND_HALF_DOWN);
         insFeeOrderNew.setJqProfitMarginPremiums(jqDifference);
 
-        BigDecimal syDifference = syEntranceFee.getTotalAmount().subtract(
+        BigDecimal syDifference = syEntranceFee.getTotalAmount()
+                .subtract(syExportFee.getExternalPremiums())
+                .subtract(
                         (syExportFee.getSuperviseCostsPremiums().add(syExportFee.getOtherCostsPremiums())))
                 .subtract(
                         (syDeptManagerFee.getDeptPremiumsLevelOne().add(syDeptManagerFee.getDeptPremiumsLevelTwo().add(syDeptManagerFee.getDeptPremiumsLevelThree()).add(syDeptManagerFee.getDeptPremiumsLevelFoure()).add(syDeptManagerFee.getDeptPremiumsLevelFive())))
                 )
-                .subtract(syFenXiao).setScale(5, BigDecimal.ROUND_HALF_DOWN);
+                .subtract(syFenXiao)
+                .setScale(5, BigDecimal.ROUND_HALF_DOWN);
         insFeeOrderNew.setSyProfitMarginPremiums(syDifference);
 
-
-        BigDecimal noDifference = noEntranceFee.getTotalAmount().subtract(
+        BigDecimal noDifference = noEntranceFee.getTotalAmount()
+                .subtract(noExportFee.getExternalPremiums())
+                .subtract(
                         (noExportFee.getSuperviseCostsPremiums().add(noExportFee.getOtherCostsPremiums())))
                 .subtract(
                         (noDeptManagerFee.getDeptPremiumsLevelOne().add(noDeptManagerFee.getDeptPremiumsLevelTwo().add(noDeptManagerFee.getDeptPremiumsLevelThree()).add(noDeptManagerFee.getDeptPremiumsLevelFoure()).add(noDeptManagerFee.getDeptPremiumsLevelFive())))
                 )
-                .subtract(noFenXiao).setScale(5, BigDecimal.ROUND_HALF_DOWN);
-
+                .subtract(noFenXiao)
+                .setScale(5, BigDecimal.ROUND_HALF_DOWN);
         insFeeOrderNew.setNoProfitMarginPremiums(noDifference);
 
         //endregion
@@ -1454,8 +1460,9 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
         BigDecimal noThird = insFeeOrderNew.getNoPremium().multiply(insFeeOrderNew.getThirdDetailProportion().divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_DOWN);
         BigDecimal noFenXiao = noFirst.add(noSecond).add(noThird);
 
-
-        BigDecimal jqDifference = jqEntranceFee.getTotalAmount().subtract(
+        BigDecimal jqDifference = jqEntranceFee.getTotalAmount()
+                .subtract(jqExportFee.getExternalPremiums())
+                .subtract(
                         (jqExportFee.getSuperviseCostsPremiums().add(jqExportFee.getOtherCostsPremiums())))
                 .subtract(
                         (jqDeptManagerFee.getDeptPremiumsLevelOne().add(jqDeptManagerFee.getDeptPremiumsLevelTwo().add(jqDeptManagerFee.getDeptPremiumsLevelThree()).add(jqDeptManagerFee.getDeptPremiumsLevelFoure()).add(jqDeptManagerFee.getDeptPremiumsLevelFive())))
@@ -1463,7 +1470,9 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
                 .subtract(jqFenXiao).setScale(5, BigDecimal.ROUND_HALF_DOWN);
         insFeeOrderNew.setJqProfitMarginPremiums(jqDifference);
 
-        BigDecimal syDifference = syEntranceFee.getTotalAmount().subtract(
+        BigDecimal syDifference = syEntranceFee.getTotalAmount()
+                .subtract(syExportFee.getExternalPremiums())
+                .subtract(
                         (syExportFee.getSuperviseCostsPremiums().add(syExportFee.getOtherCostsPremiums())))
                 .subtract(
                         (syDeptManagerFee.getDeptPremiumsLevelOne().add(syDeptManagerFee.getDeptPremiumsLevelTwo().add(syDeptManagerFee.getDeptPremiumsLevelThree()).add(syDeptManagerFee.getDeptPremiumsLevelFoure()).add(syDeptManagerFee.getDeptPremiumsLevelFive())))
@@ -1471,8 +1480,9 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
                 .subtract(syFenXiao).setScale(5, BigDecimal.ROUND_HALF_DOWN);
         insFeeOrderNew.setSyProfitMarginPremiums(syDifference);
 
-
-        BigDecimal noDifference = noEntranceFee.getTotalAmount().subtract(
+        BigDecimal noDifference = noEntranceFee.getTotalAmount()
+                .subtract(noExportFee.getExternalPremiums())
+                .subtract(
                         (noExportFee.getSuperviseCostsPremiums().add(noExportFee.getOtherCostsPremiums())))
                 .subtract(
                         (noDeptManagerFee.getDeptPremiumsLevelOne().add(noDeptManagerFee.getDeptPremiumsLevelTwo().add(noDeptManagerFee.getDeptPremiumsLevelThree()).add(noDeptManagerFee.getDeptPremiumsLevelFoure()).add(noDeptManagerFee.getDeptPremiumsLevelFive())))

src/main/java/com/ydtech/modules/order/entity/vo/FeeOrderNewVo.java

@@ -122,9 +122,9 @@ public class FeeOrderNewVo implements Serializable {
         @ApiModelProperty("利润差值")
         private BigDecimal profitMarginPremiums;
 
-        @ApiModelProperty("外部比例")
+        @ApiModelProperty("代课录单扣减比例")
         private BigDecimal externalProportion;
-        @ApiModelProperty("外部金额")
+        @ApiModelProperty("代课录单扣减金额")
         private BigDecimal externalPremiums;
 
 

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

@@ -1708,7 +1708,9 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         BigDecimal noFenXiao = noFirst.add(noSecond).add(noThird);
 
 
-        BigDecimal jqDifference = jqEntranceFee.getTotalAmount().subtract(
+        BigDecimal jqDifference = jqEntranceFee.getTotalAmount()
+                .subtract(jqExportFee.getExternalPremiums())
+                .subtract(
                         (jqExportFee.getSuperviseCostsPremiums().add(jqExportFee.getOtherCostsPremiums())))
                 .subtract(
                         (jqDeptManagerFee.getDeptPremiumsLevelOne().add(jqDeptManagerFee.getDeptPremiumsLevelTwo().add(jqDeptManagerFee.getDeptPremiumsLevelThree()).add(jqDeptManagerFee.getDeptPremiumsLevelFoure()).add(jqDeptManagerFee.getDeptPremiumsLevelFive())))
@@ -1717,7 +1719,9 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         insFeeOrderNew.setJqProfitMarginPremiums(jqDifference);
         deptManagerFeeList.get(0).setProfitMarginPremiums(jqDifference);
 
-        BigDecimal syDifference = syEntranceFee.getTotalAmount().subtract(
+        BigDecimal syDifference = syEntranceFee.getTotalAmount()
+                .subtract(syExportFee.getExternalPremiums())
+                .subtract(
                         (syExportFee.getSuperviseCostsPremiums().add(syExportFee.getOtherCostsPremiums())))
                 .subtract(
                         (syDeptManagerFee.getDeptPremiumsLevelOne().add(syDeptManagerFee.getDeptPremiumsLevelTwo().add(syDeptManagerFee.getDeptPremiumsLevelThree()).add(syDeptManagerFee.getDeptPremiumsLevelFoure()).add(syDeptManagerFee.getDeptPremiumsLevelFive())))
@@ -1726,8 +1730,9 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         insFeeOrderNew.setSyProfitMarginPremiums(syDifference);
         deptManagerFeeList.get(1).setProfitMarginPremiums(syDifference);
 
-
-        BigDecimal noDifference = noEntranceFee.getTotalAmount().subtract(
+        BigDecimal noDifference = noEntranceFee.getTotalAmount()
+                .subtract(noExportFee.getExternalPremiums())
+                .subtract(
                         (noExportFee.getSuperviseCostsPremiums().add(noExportFee.getOtherCostsPremiums())))
                 .subtract(
                         (noDeptManagerFee.getDeptPremiumsLevelOne().add(noDeptManagerFee.getDeptPremiumsLevelTwo().add(noDeptManagerFee.getDeptPremiumsLevelThree()).add(noDeptManagerFee.getDeptPremiumsLevelFoure()).add(noDeptManagerFee.getDeptPremiumsLevelFive())))