Merge remote-tracking branch 'origin/test' into test

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

@@ -2609,80 +2609,170 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         return result.toString();
     }
 
-    public List<FeeOrderNewVo> newConvertOrderFeeVoData(InsFeeOrderNew insFeeOrderNew) {
-        ArrayList<FeeOrderNewVo> returnList = new ArrayList<>();
-        FeeOrderNewVo jqfeeOrderNewVo = new FeeOrderNewVo();
-
-        jqfeeOrderNewVo.setInsuranceType("交强险");  // 险种
-        jqfeeOrderNewVo.setPremium(insFeeOrderNew.getJqPremium());  //保费
-        jqfeeOrderNewVo.setTotalAmount(insFeeOrderNew.getJqCostsPremiums());   //总费用
-        jqfeeOrderNewVo.setTotalProportion(insFeeOrderNew.getJqCostsProportion()); //总保费
-        jqfeeOrderNewVo.setSySuperviseCostsPremiums(insFeeOrderNew.getJqSuperviseCostsPremiums());   //手续费
-        jqfeeOrderNewVo.setOtherCostsProportion(insFeeOrderNew.getJqOtherCostsProportion());   // 跟单比例
-        jqfeeOrderNewVo.setOtherCostsPremiums(insFeeOrderNew.getJqOtherCostsPremiums());      // 跟单费
-        jqfeeOrderNewVo.setSuperviseCosts(insFeeOrderNew.getJqSuperviseCostsProportion());  // 手续费比例
-        // 五级管理费
-        jqfeeOrderNewVo.setDeptProportionLevelOne(insFeeOrderNew.getJqDeptProportionLevel1());
-        jqfeeOrderNewVo.setDeptPremiumsLevelOne(insFeeOrderNew.getJqDeptPremiumsLevel1());
-        jqfeeOrderNewVo.setDeptProportionLevelTwo(insFeeOrderNew.getJqDeptProportionLevel2());
-        jqfeeOrderNewVo.setDeptPremiumsLevelTwo(insFeeOrderNew.getJqDeptPremiumsLevel2());
-        jqfeeOrderNewVo.setDeptProportionLevelThree(insFeeOrderNew.getJqDeptProportionLevel3());
-        jqfeeOrderNewVo.setDeptPremiumsLevelThree(insFeeOrderNew.getJqDeptPremiumsLevel3());
-        jqfeeOrderNewVo.setDeptProportionLevelFoure(insFeeOrderNew.getJqDeptProportionLevel4());
-        jqfeeOrderNewVo.setDeptPremiumsLevelFoure(insFeeOrderNew.getJqDeptPremiumsLevel4());
-        jqfeeOrderNewVo.setDeptProportionLevelFive(insFeeOrderNew.getJqDeptProportionLevel5());
-        jqfeeOrderNewVo.setDeptPremiumsLevelFive(insFeeOrderNew.getJqDeptPremiumsLevel5());
-        returnList.add(jqfeeOrderNewVo);
-
-        FeeOrderNewVo syfeeOrderNewVo = new FeeOrderNewVo();
-
-        syfeeOrderNewVo.setInsuranceType("商业险");  // 险种
-        syfeeOrderNewVo.setPremium(insFeeOrderNew.getSyPremium());  //保费
-        syfeeOrderNewVo.setTotalProportion(insFeeOrderNew.getSyCostsProportion()); //总保费
-        syfeeOrderNewVo.setTotalAmount(insFeeOrderNew.getSyCostsPremiums());   //总费用
-        syfeeOrderNewVo.setSySuperviseCostsPremiums(insFeeOrderNew.getSySuperviseCostsPremiums());   //手续费
-        syfeeOrderNewVo.setOtherCostsProportion(insFeeOrderNew.getSyOtherCostsProportion());   // 跟单比例
-        syfeeOrderNewVo.setOtherCostsPremiums(insFeeOrderNew.getSyOtherCostsPremiums());      // 跟单费
-        syfeeOrderNewVo.setSuperviseCosts(insFeeOrderNew.getSySuperviseCostsProportion());  // 手续费比例
-
-        // 五级管理费
-        syfeeOrderNewVo.setDeptProportionLevelOne(insFeeOrderNew.getSyDeptProportionLevel1());
-        syfeeOrderNewVo.setDeptPremiumsLevelOne(insFeeOrderNew.getSyDeptPremiumsLevel1());
-        syfeeOrderNewVo.setDeptProportionLevelTwo(insFeeOrderNew.getSyDeptProportionLevel2());
-        syfeeOrderNewVo.setDeptPremiumsLevelTwo(insFeeOrderNew.getSyDeptPremiumsLevel2());
-        syfeeOrderNewVo.setDeptProportionLevelThree(insFeeOrderNew.getSyDeptProportionLevel3());
-        syfeeOrderNewVo.setDeptPremiumsLevelThree(insFeeOrderNew.getSyDeptPremiumsLevel3());
-        syfeeOrderNewVo.setDeptProportionLevelFoure(insFeeOrderNew.getSyDeptProportionLevel4());
-        syfeeOrderNewVo.setDeptPremiumsLevelFoure(insFeeOrderNew.getSyDeptPremiumsLevel4());
-        syfeeOrderNewVo.setDeptProportionLevelFive(insFeeOrderNew.getSyDeptProportionLevel5());
-        syfeeOrderNewVo.setDeptPremiumsLevelFive(insFeeOrderNew.getSyDeptPremiumsLevel5());
-        returnList.add(syfeeOrderNewVo);
-
-
-        FeeOrderNewVo nofeeOrderNewVo = new FeeOrderNewVo();
-
-        nofeeOrderNewVo.setInsuranceType("非车险");  // 险种
-        nofeeOrderNewVo.setPremium(insFeeOrderNew.getNoPremium());  //保费
-        nofeeOrderNewVo.setTotalProportion(insFeeOrderNew.getNoCostsProportion()); //总保费
-        nofeeOrderNewVo.setTotalAmount(insFeeOrderNew.getNoCostsPremiums());   //总费用
-        nofeeOrderNewVo.setSySuperviseCostsPremiums(insFeeOrderNew.getNoSuperviseCostsPremiums());   //手续费
-        nofeeOrderNewVo.setOtherCostsProportion(insFeeOrderNew.getNoOtherCostsProportion());   // 跟单比例
-        nofeeOrderNewVo.setOtherCostsPremiums(insFeeOrderNew.getNoOtherCostsPremiums());      // 跟单费
-        nofeeOrderNewVo.setSuperviseCosts(insFeeOrderNew.getNoSuperviseCostsProportion());  // 手续费比例
+    public FeeOrderNewVo newConvertOrderFeeVoData(InsFeeOrderNew insFeeOrderNew) {
+        FeeOrderNewVo feeOrderNewVo = new FeeOrderNewVo();
+        List<FeeOrderNewVo.EntranceFee> entranceFeeList = new ArrayList<>();
+        List<FeeOrderNewVo.ExportFee> exportFeeList = new ArrayList<>();
+        List<FeeOrderNewVo.DeptManagerFee> deptManagerFeeList = new ArrayList<>();
+
+        FeeOrderNewVo.EntranceFee jqEntranceFee = new FeeOrderNewVo.EntranceFee();
+        FeeOrderNewVo.ExportFee jqExportFee = new  FeeOrderNewVo.ExportFee();
+        FeeOrderNewVo.DeptManagerFee jqDeptManagerFee = new FeeOrderNewVo.DeptManagerFee();
+
+        FeeOrderNewVo.EntranceFee syEntranceFee = new FeeOrderNewVo.EntranceFee();
+        FeeOrderNewVo.ExportFee syExportFee = new  FeeOrderNewVo.ExportFee();
+        FeeOrderNewVo.DeptManagerFee syDeptManagerFee = new FeeOrderNewVo.DeptManagerFee();
+
+        FeeOrderNewVo.EntranceFee nonEntranceFee = new FeeOrderNewVo.EntranceFee();
+        FeeOrderNewVo.ExportFee nonExportFee = new  FeeOrderNewVo.ExportFee();
+        FeeOrderNewVo.DeptManagerFee nonDeptManagerFee = new FeeOrderNewVo.DeptManagerFee();
+
+        //入口费用
+        jqEntranceFee.setInsuranceType("交强险");  // 险种
+        jqEntranceFee.setPremium(insFeeOrderNew.getJqPremium());  //保费
+        jqEntranceFee.setTotalAmount(insFeeOrderNew.getJqCostsPremiums());   //总费用
+        jqEntranceFee.setTotalProportion(insFeeOrderNew.getJqCostsProportion()); //总保费
+        jqEntranceFee.setSySuperviseCostsPremiums(insFeeOrderNew.getJqSuperviseCostsPremiums());   //手续费
+        jqEntranceFee.setOtherCostsProportion(insFeeOrderNew.getJqOtherCostsProportion());   // 跟单比例
+        jqEntranceFee.setOtherCostsPremiums(insFeeOrderNew.getJqOtherCostsPremiums());      // 跟单费
+        jqEntranceFee.setSuperviseCosts(insFeeOrderNew.getJqSuperviseCostsProportion());  // 手续费比例
+        entranceFeeList.add(jqEntranceFee);
+
+        //出口费用
+        jqExportFee.setInsuranceType("交强险");  // 险种
+        BigDecimal sumJqDeptPremiums = insFeeOrderNew.getJqDeptPremiumsLevel1()
+                .add(insFeeOrderNew.getJqDeptPremiumsLevel2())
+                .add(insFeeOrderNew.getJqDeptPremiumsLevel3())
+                .add(insFeeOrderNew.getJqDeptPremiumsLevel4())
+                .add(insFeeOrderNew.getJqDeptPremiumsLevel5());
+        BigDecimal jqProportion = insFeeOrderNew.getJqPremium().divide(sumJqDeptPremiums);
+        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.setOtherCostsProportion(jqProportion.subtract(new BigDecimal(4)));
+            jqExportFee.setOtherCostsPremiums(sumJqDeptPremiums.subtract(jqExportFee.getSuperviseCostsPremiums()));
+        }else{
+            jqExportFee.setSuperviseCosts(jqProportion);
+            jqExportFee.setSuperviseCostsPremiums(sumJqDeptPremiums);
+        }
+        exportFeeList.add(jqExportFee);
+
+        // 机构管理费
+        jqDeptManagerFee.setInsuranceType("交强险");
+        jqDeptManagerFee.setDeptProportionLevelOne(insFeeOrderNew.getJqDeptProportionLevel1());
+        jqDeptManagerFee.setDeptPremiumsLevelOne(insFeeOrderNew.getJqDeptPremiumsLevel1());
+        jqDeptManagerFee.setDeptProportionLevelTwo(insFeeOrderNew.getJqDeptProportionLevel2());
+        jqDeptManagerFee.setDeptPremiumsLevelTwo(insFeeOrderNew.getJqDeptPremiumsLevel2());
+        jqDeptManagerFee.setDeptProportionLevelThree(insFeeOrderNew.getJqDeptProportionLevel3());
+        jqDeptManagerFee.setDeptPremiumsLevelThree(insFeeOrderNew.getJqDeptPremiumsLevel3());
+        jqDeptManagerFee.setDeptProportionLevelFoure(insFeeOrderNew.getJqDeptProportionLevel4());
+        jqDeptManagerFee.setDeptPremiumsLevelFoure(insFeeOrderNew.getJqDeptPremiumsLevel4());
+        jqDeptManagerFee.setDeptProportionLevelFive(insFeeOrderNew.getJqDeptProportionLevel5());
+        jqDeptManagerFee.setDeptPremiumsLevelFive(insFeeOrderNew.getJqDeptPremiumsLevel5());
+        deptManagerFeeList.add(jqDeptManagerFee);
+
+
+        //商业入口
+        syEntranceFee.setInsuranceType("商业险");  // 险种
+        syEntranceFee.setPremium(insFeeOrderNew.getSyPremium());  //保费
+        syEntranceFee.setTotalProportion(insFeeOrderNew.getSyCostsProportion()); //总保费
+        syEntranceFee.setTotalAmount(insFeeOrderNew.getSyCostsPremiums());   //总费用
+        syEntranceFee.setSySuperviseCostsPremiums(insFeeOrderNew.getSySuperviseCostsPremiums());   //手续费
+        syEntranceFee.setOtherCostsProportion(insFeeOrderNew.getSyOtherCostsProportion());   // 跟单比例
+        syEntranceFee.setOtherCostsPremiums(insFeeOrderNew.getSyOtherCostsPremiums());      // 跟单费
+        syEntranceFee.setSuperviseCosts(insFeeOrderNew.getSySuperviseCostsProportion());  // 手续费比例
+        entranceFeeList.add(syEntranceFee);
+
+        //商业出口
+        syExportFee.setInsuranceType("商业险");  // 险种
+        BigDecimal sumSyDeptPremiums = insFeeOrderNew.getSyDeptPremiumsLevel1()
+                .add(insFeeOrderNew.getSyDeptPremiumsLevel2())
+                .add(insFeeOrderNew.getSyDeptPremiumsLevel3())
+                .add(insFeeOrderNew.getSyDeptPremiumsLevel4())
+                .add(insFeeOrderNew.getSyDeptPremiumsLevel5());
+        BigDecimal syProportion = insFeeOrderNew.getSyPremium().multiply(sumSyDeptPremiums);
+        syExportFee.setTotalAmount(sumSyDeptPremiums);
+        syExportFee.setTotalProportion(syProportion);
+        if(sumSyDeptPremiums.compareTo(new BigDecimal(4)) > 0) {
+            syExportFee.setSuperviseCosts(new BigDecimal(4));
+            syExportFee.setSuperviseCostsPremiums(sumSyDeptPremiums.multiply(new BigDecimal(4)));
+            syExportFee.setOtherCostsProportion(syProportion.subtract(new BigDecimal(4)));
+            syExportFee.setOtherCostsPremiums(sumSyDeptPremiums.subtract(syExportFee.getSuperviseCostsPremiums()));
+        }else{
+            syExportFee.setSuperviseCosts(syProportion);
+            syExportFee.setSuperviseCostsPremiums(sumSyDeptPremiums);
+        }
+        exportFeeList.add(syExportFee);
+
+
+        // 商业管理费
+        syDeptManagerFee.setInsuranceType("商业险");
+        syDeptManagerFee.setDeptProportionLevelOne(insFeeOrderNew.getSyDeptProportionLevel1());
+        syDeptManagerFee.setDeptPremiumsLevelOne(insFeeOrderNew.getSyDeptPremiumsLevel1());
+        syDeptManagerFee.setDeptProportionLevelTwo(insFeeOrderNew.getSyDeptProportionLevel2());
+        syDeptManagerFee.setDeptPremiumsLevelTwo(insFeeOrderNew.getSyDeptPremiumsLevel2());
+        syDeptManagerFee.setDeptProportionLevelThree(insFeeOrderNew.getSyDeptProportionLevel3());
+        syDeptManagerFee.setDeptPremiumsLevelThree(insFeeOrderNew.getSyDeptPremiumsLevel3());
+        syDeptManagerFee.setDeptProportionLevelFoure(insFeeOrderNew.getSyDeptProportionLevel4());
+        syDeptManagerFee.setDeptPremiumsLevelFoure(insFeeOrderNew.getSyDeptPremiumsLevel4());
+        syDeptManagerFee.setDeptProportionLevelFive(insFeeOrderNew.getSyDeptProportionLevel5());
+        syDeptManagerFee.setDeptPremiumsLevelFive(insFeeOrderNew.getSyDeptPremiumsLevel5());
+        deptManagerFeeList.add(syDeptManagerFee);
+
+
+        //非车入口
+        nonEntranceFee.setInsuranceType("非车险");  // 险种
+        nonEntranceFee.setPremium(insFeeOrderNew.getNoPremium());  //保费
+        nonEntranceFee.setTotalProportion(insFeeOrderNew.getNoCostsProportion()); //总保费
+        nonEntranceFee.setTotalAmount(insFeeOrderNew.getNoCostsPremiums());   //总费用
+        nonEntranceFee.setSySuperviseCostsPremiums(insFeeOrderNew.getNoSuperviseCostsPremiums());   //手续费
+        nonEntranceFee.setOtherCostsProportion(insFeeOrderNew.getNoOtherCostsProportion());   // 跟单比例
+        nonEntranceFee.setOtherCostsPremiums(insFeeOrderNew.getNoOtherCostsPremiums());      // 跟单费
+        nonEntranceFee.setSuperviseCosts(insFeeOrderNew.getNoSuperviseCostsProportion());  // 手续费比例
+        entranceFeeList.add(nonEntranceFee);
+
+        //非车出口
+        nonExportFee.setInsuranceType("非车险");  // 险种
+        BigDecimal sumNonDeptPremiums = insFeeOrderNew.getNoDeptPremiumsLevel1()
+                .add(insFeeOrderNew.getNoDeptPremiumsLevel2())
+                .add(insFeeOrderNew.getNoDeptPremiumsLevel3())
+                .add(insFeeOrderNew.getNoDeptPremiumsLevel4())
+                .add(insFeeOrderNew.getNoDeptPremiumsLevel5());
+        BigDecimal nonProportion = insFeeOrderNew.getNoPremium().multiply(sumNonDeptPremiums);
+        nonExportFee.setTotalAmount(sumNonDeptPremiums);
+        nonExportFee.setTotalProportion(nonProportion);
+        if(sumNonDeptPremiums.compareTo(new BigDecimal(4)) > 0) {
+            nonExportFee.setSuperviseCosts(new BigDecimal(4));
+            nonExportFee.setSuperviseCostsPremiums(sumNonDeptPremiums.multiply(new BigDecimal(4)));
+            nonExportFee.setOtherCostsProportion(nonProportion.subtract(new BigDecimal(4)));
+            nonExportFee.setOtherCostsPremiums(sumNonDeptPremiums.subtract(nonExportFee.getSuperviseCostsPremiums()));
+        }else{
+            nonExportFee.setSuperviseCosts(nonProportion);
+            nonExportFee.setSuperviseCostsPremiums(sumNonDeptPremiums);
+        }
+        exportFeeList.add(nonExportFee);
 
         // 五级管理费
-        nofeeOrderNewVo.setDeptProportionLevelOne(insFeeOrderNew.getNoDeptProportionLevel1());
-        nofeeOrderNewVo.setDeptPremiumsLevelOne(insFeeOrderNew.getNoDeptPremiumsLevel1());
-        nofeeOrderNewVo.setDeptProportionLevelTwo(insFeeOrderNew.getNoDeptProportionLevel2());
-        nofeeOrderNewVo.setDeptPremiumsLevelTwo(insFeeOrderNew.getNoDeptPremiumsLevel2());
-        nofeeOrderNewVo.setDeptProportionLevelThree(insFeeOrderNew.getNoDeptProportionLevel3());
-        nofeeOrderNewVo.setDeptPremiumsLevelThree(insFeeOrderNew.getNoDeptPremiumsLevel3());
-        nofeeOrderNewVo.setDeptProportionLevelFoure(insFeeOrderNew.getNoDeptProportionLevel4());
-        nofeeOrderNewVo.setDeptPremiumsLevelFoure(insFeeOrderNew.getNoDeptPremiumsLevel4());
-        nofeeOrderNewVo.setDeptProportionLevelFive(insFeeOrderNew.getNoDeptProportionLevel5());
-        nofeeOrderNewVo.setDeptPremiumsLevelFive(insFeeOrderNew.getNoDeptPremiumsLevel5());
-        returnList.add(nofeeOrderNewVo);
-        return returnList;
+        nonDeptManagerFee.setInsuranceType("非车险");
+        nonDeptManagerFee.setDeptProportionLevelOne(insFeeOrderNew.getNoDeptProportionLevel1());
+        nonDeptManagerFee.setDeptPremiumsLevelOne(insFeeOrderNew.getNoDeptPremiumsLevel1());
+        nonDeptManagerFee.setDeptProportionLevelTwo(insFeeOrderNew.getNoDeptProportionLevel2());
+        nonDeptManagerFee.setDeptPremiumsLevelTwo(insFeeOrderNew.getNoDeptPremiumsLevel2());
+        nonDeptManagerFee.setDeptProportionLevelThree(insFeeOrderNew.getNoDeptProportionLevel3());
+        nonDeptManagerFee.setDeptPremiumsLevelThree(insFeeOrderNew.getNoDeptPremiumsLevel3());
+        nonDeptManagerFee.setDeptProportionLevelFoure(insFeeOrderNew.getNoDeptProportionLevel4());
+        nonDeptManagerFee.setDeptPremiumsLevelFoure(insFeeOrderNew.getNoDeptPremiumsLevel4());
+        nonDeptManagerFee.setDeptProportionLevelFive(insFeeOrderNew.getNoDeptProportionLevel5());
+        nonDeptManagerFee.setDeptPremiumsLevelFive(insFeeOrderNew.getNoDeptPremiumsLevel5());
+        deptManagerFeeList.add(nonDeptManagerFee);
+
+
+        feeOrderNewVo.setEntranceFee(entranceFeeList);
+        feeOrderNewVo.setExportFee(exportFeeList);
+        feeOrderNewVo.setDeptManagerFee(deptManagerFeeList);
+        return feeOrderNewVo;
     }
 
     public List<DistributionLevelVo> converDistrbutionData(InsFeeOrderNew insFeeOrderNew) {
@@ -2719,7 +2809,7 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         if(StringUtils.isNotEmpty(firstLevelUserId)){
             SysUser sysUser = sysUserService.getBaseMapper().selectById(firstLevelUserId);
             if(ObjectUtils.isNotEmpty(sysUser)){
-                return sysUser.getName();
+                return sysUser.getName() + "(" + sysUser.getId() + ")";
             }
         }
         return null;

src/main/java/com/ydtech/modules/fnc/service/impl/InsFeeAuditServiceImpl.java

@@ -110,7 +110,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
 
 
         InsOrders order=insOrdersMapper.selectById(orderNo);
-        InsFeeOrder insFeeOrder=insFeeOrderService.getByInsOrderNo(insFeeAudit.getInsOrderNo());
+        InsFeeOrderNew insFeeOrder=insFeeOrderNewService.getInsFeeOrderNewByCompanyId(insFeeAudit.getInsOrderNo());
         InsAreaCompany insAreaCompany=insAreaCompanyMapper.selectById(insFeeAudit.getInsOrderNo());
 
         //获取该订单的费用
@@ -133,13 +133,13 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
         //bigdecimal为null时设置为0
 //        handleBigdecimal(insFeeOrder);
         //生成保司费用（应收费用）
-        gene_orderIncome( order, insFeeOrder,insAreaCompany);
+        gene_orderIncome( order, insFeeOrderNew,insAreaCompany);
         //生成机构费用
-        gene_deptfee( order, insFeeOrder,insAreaCompany);
+        gene_deptfee( order, insFeeOrderNew,insAreaCompany);
         //生成分销费用
-        saveRetail(order,insFeeOrder,insAreaCompany);
+//        saveRetail(order,insFeeOrderNew,insAreaCompany);
         //个代费用生成
-        saveInsCompanyFee(order,insFeeOrder,insAreaCompany);
+//        saveInsCompanyFee(order,insFeeOrderNew,insAreaCompany);
 
 
 //      生成  用户账户表  数据
@@ -284,7 +284,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
      * @param insFeeOrder
      * @throws Exception
      */
-    private void gene_orderIncome( InsOrders order, InsFeeOrder insFeeOrder,InsAreaCompany plyDto) throws Exception{
+    private void gene_orderIncome( InsOrders order, InsFeeOrderNew insFeeOrder,InsAreaCompany plyDto) throws Exception{
 
         InsPlyIncome insPlyIncome =new InsPlyIncome();
         insPlyIncome.setOrderno(order.getOrderno());
@@ -331,7 +331,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
      * @param insFeeOrder
      * @throws Exception
      */
-    private void gene_deptfee( InsOrders order, InsFeeOrder insFeeOrder,InsAreaCompany plyDto) throws Exception{
+    private void gene_deptfee( InsOrders order, InsFeeOrderNew insFeeOrder,InsAreaCompany plyDto) throws Exception{
         InsDeptFee deptFee = new InsDeptFee();
         deptFee.setOrderno(order.getOrderno());
         if(!ObjectUtils.isEmpty(insFeeOrder)){
@@ -349,40 +349,70 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
             deptFee.setPolicyno(plyDto.getJqpolicyno());
             deptFee.setRiskcode("交强");
             deptFee.setLicenseno(order.getLicenseno());
-            geneInsDeptFee(order, insFeeOrder, deptFee);
+            geneJqInsDeptFee(order, insFeeOrder, deptFee);
         }
         if(StringUtils.isNotEmpty(plyDto.getSypolicyno())){
             deptFee.setPolicyno(plyDto.getSypolicyno());
             deptFee.setRiskcode("商业");
             deptFee.setLicenseno(order.getLicenseno());
-            geneInsDeptFee(order, insFeeOrder, deptFee);
+            geneSyInsDeptFee(order, insFeeOrder, deptFee);
         }
 
     }
 
-    private void geneInsDeptFee(InsOrders order, InsFeeOrder insFeeOrder, InsDeptFee deptFee) {
+    private void geneJqInsDeptFee(InsOrders order, InsFeeOrderNew insFeeOrder, InsDeptFee deptFee) {
         if(!ObjectUtils.isEmpty(insFeeOrder)){
-            if (insFeeOrder.getFirstDeptPremiums().doubleValue() > 0) {
+            if (insFeeOrder.getJqDeptPremiumsLevel1().doubleValue() > 0) {
                 deptFee.setComcode(order.getDeptid().substring(0, 2));  //99140302M01D01
                 deptFee.setComlevel("一级");
                 insDeptFeeService.insert(deptFee);
             }
-            if (insFeeOrder.getSecondDeptPremiums().doubleValue() > 0) {
+            if (insFeeOrder.getJqDeptPremiumsLevel2().doubleValue() > 0) {
                 deptFee.setComcode(order.getDeptid().substring(0, 4));  //99140302M01D01
                 deptFee.setComlevel("二级");
                 insDeptFeeService.insert(deptFee);
             }
-            if (insFeeOrder.getThirdDeptPremiums().doubleValue() > 0) {
+            if (insFeeOrder.getJqDeptPremiumsLevel3().doubleValue() > 0) {
                 deptFee.setComcode(order.getDeptid().substring(0, 6));  //99140302M01D01
                 deptFee.setComlevel("三级");
                 insDeptFeeService.insert(deptFee);
             }
-            if (insFeeOrder.getForthDeptPremiums().doubleValue() > 0) {
+            if (insFeeOrder.getJqDeptPremiumsLevel4().doubleValue() > 0) {
                 deptFee.setComcode(order.getDeptid().substring(0, 8));  //99140302M01D01
                 deptFee.setComlevel("四级");
                 insDeptFeeService.insert(deptFee);
             }
-            if (insFeeOrder.getFifthDeptPremiums().doubleValue() > 0) {
+            if (insFeeOrder.getJqDeptPremiumsLevel5().doubleValue() > 0) {
+                deptFee.setComcode(order.getDeptid().substring(0, 11));  //99140302M01D01
+                deptFee.setComlevel("五级");
+                insDeptFeeService.insert(deptFee);
+            }
+        }
+    }
+
+    private void geneSyInsDeptFee(InsOrders order, InsFeeOrderNew insFeeOrder, InsDeptFee deptFee) {
+        if(!ObjectUtils.isEmpty(insFeeOrder)){
+            if (insFeeOrder.getSyDeptPremiumsLevel1().doubleValue() > 0) {
+                deptFee.setComcode(order.getDeptid().substring(0, 2));  //99140302M01D01
+                deptFee.setComlevel("一级");
+                insDeptFeeService.insert(deptFee);
+            }
+            if (insFeeOrder.getSyDeptPremiumsLevel2().doubleValue() > 0) {
+                deptFee.setComcode(order.getDeptid().substring(0, 4));  //99140302M01D01
+                deptFee.setComlevel("二级");
+                insDeptFeeService.insert(deptFee);
+            }
+            if (insFeeOrder.getSyDeptPremiumsLevel3().doubleValue() > 0) {
+                deptFee.setComcode(order.getDeptid().substring(0, 6));  //99140302M01D01
+                deptFee.setComlevel("三级");
+                insDeptFeeService.insert(deptFee);
+            }
+            if (insFeeOrder.getSyDeptPremiumsLevel4().doubleValue() > 0) {
+                deptFee.setComcode(order.getDeptid().substring(0, 8));  //99140302M01D01
+                deptFee.setComlevel("四级");
+                insDeptFeeService.insert(deptFee);
+            }
+            if (insFeeOrder.getSyDeptPremiumsLevel5().doubleValue() > 0) {
                 deptFee.setComcode(order.getDeptid().substring(0, 11));  //99140302M01D01
                 deptFee.setComlevel("五级");
                 insDeptFeeService.insert(deptFee);

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

@@ -1,6 +1,7 @@
 package com.ydtech.modules.order.entity.vo;
 
 
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,44 +10,91 @@ import org.apache.poi.hpsf.Decimal;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
+
 @ApiModel(description = "费用明细")
 @Data
 public class FeeOrderNewVo implements Serializable {
-    @ApiModelProperty("险种")
-    private  String insuranceType;
-    @ApiModelProperty("保费")
-    private BigDecimal premium ;
-    @ApiModelProperty("总比例")
-    private BigDecimal totalProportion;
-    @ApiModelProperty("总费用")
-    private BigDecimal totalAmount;
-    @ApiModelProperty("手续费比例")
-    private BigDecimal superviseCosts;
-    @ApiModelProperty("手续费")
-    private  BigDecimal  sySuperviseCostsPremiums;
-    @ApiModelProperty("跟单比例")
-    private  BigDecimal otherCostsProportion;
-    @ApiModelProperty("跟单费")
-    private  BigDecimal otherCostsPremiums;
-    @ApiModelProperty("一级管理费比例")
-    private BigDecimal deptProportionLevelOne;
-    @ApiModelProperty("一级管理费")
-    private BigDecimal deptPremiumsLevelOne;
-    @ApiModelProperty("二级管理费比例")
-    private BigDecimal deptProportionLevelTwo;
-    @ApiModelProperty("二级管理费")
-    private BigDecimal deptPremiumsLevelTwo;
-    @ApiModelProperty("三级管理费比例")
-    private BigDecimal deptProportionLevelThree;
-    @ApiModelProperty("三级管理费")
-    private BigDecimal deptPremiumsLevelThree;
-    @ApiModelProperty("四级管理费比例")
-    private BigDecimal deptProportionLevelFoure;
-    @ApiModelProperty("四级管理费")
-    private BigDecimal deptPremiumsLevelFoure;
-    @ApiModelProperty("五级管理费比例")
-    private BigDecimal deptProportionLevelFive;
-    @ApiModelProperty("五级管理费")
-    private BigDecimal deptPremiumsLevelFive;
 
+
+    @ApiModelProperty("入口费用")
+    private List<EntranceFee> entranceFee;
+
+    @ApiModelProperty("出口费用")
+    private List<ExportFee> exportFee;
+
+    @ApiModelProperty("部门管理费用")
+    private List<DeptManagerFee> deptManagerFee;
+
+    /**
+     * 入口费用
+     */
+    @ApiModel(description = "入口费用")
+    @Data
+    public static class EntranceFee {
+        @ApiModelProperty("险种")
+        private String insuranceType;
+        @ApiModelProperty("保费")
+        private BigDecimal premium;
+        @ApiModelProperty("总比例")
+        private BigDecimal totalProportion;
+        @ApiModelProperty("总费用")
+        private BigDecimal totalAmount;
+        @ApiModelProperty("手续费比例")
+        private BigDecimal superviseCosts;
+        @ApiModelProperty("手续费")
+        private BigDecimal sySuperviseCostsPremiums;
+        @ApiModelProperty("跟单比例")
+        private BigDecimal otherCostsProportion;
+        @ApiModelProperty("跟单费")
+        private BigDecimal otherCostsPremiums;
+    }
+
+    /**
+     * 出口费用
+     */
+    @ApiModel(description = "出口费用")
+    @Data
+    public static class ExportFee {
+        @ApiModelProperty("险种")
+        private String insuranceType;
+        @ApiModelProperty("总比例")
+        private BigDecimal totalProportion;
+        @ApiModelProperty("总费用")
+        private BigDecimal totalAmount;
+        @ApiModelProperty("手续费比例")
+        private BigDecimal superviseCosts;
+        @ApiModelProperty("手续费")
+        private BigDecimal superviseCostsPremiums;
+        @ApiModelProperty("跟单比例")
+        private BigDecimal otherCostsProportion;
+        @ApiModelProperty("跟单费")
+        private BigDecimal otherCostsPremiums;
+    }
+
+    @ApiModel(description = "部门管理费用")
+    @Data
+    public static class DeptManagerFee {
+        @ApiModelProperty("险种")
+        private String insuranceType;
+        @ApiModelProperty("一级管理费比例")
+        private BigDecimal deptProportionLevelOne;
+        @ApiModelProperty("一级管理费")
+        private BigDecimal deptPremiumsLevelOne;
+        @ApiModelProperty("二级管理费比例")
+        private BigDecimal deptProportionLevelTwo;
+        @ApiModelProperty("二级管理费")
+        private BigDecimal deptPremiumsLevelTwo;
+        @ApiModelProperty("三级管理费比例")
+        private BigDecimal deptProportionLevelThree;
+        @ApiModelProperty("三级管理费")
+        private BigDecimal deptPremiumsLevelThree;
+        @ApiModelProperty("四级管理费比例")
+        private BigDecimal deptProportionLevelFoure;
+        @ApiModelProperty("四级管理费")
+        private BigDecimal deptPremiumsLevelFoure;
+        @ApiModelProperty("五级管理费比例")
+        private BigDecimal deptProportionLevelFive;
+        @ApiModelProperty("五级管理费")
+        private BigDecimal deptPremiumsLevelFive;
+    }
 }

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

@@ -353,7 +353,7 @@ public class OrderVo implements Serializable {
     /**
      * 费用信息
      */
-    private List<FeeOrderNewVo> feeOrderNewVoList;
+    private FeeOrderNewVo feeOrderNewVo;
 
     /**
      * 分销明细

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -611,8 +611,10 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         if (!Objects.isNull(insFeeOrderNew)) {
             List<QueryOrderFeeResultVo> orderFeeVoList = feeRuleSchemeService.convertOrderFeeVoData(insFeeOrderNew);
             orderAndAreaCompany.setOrderFeeResult(orderFeeVoList);
-            List<FeeOrderNewVo> feeOrderNewVoList = feeRuleSchemeService.newConvertOrderFeeVoData(insFeeOrderNew);
-            orderAndAreaCompany.setFeeOrderNewVoList(feeOrderNewVoList);
+//            List<FeeOrderNewVo> feeOrderNewVoList = feeRuleSchemeService.newConvertOrderFeeVoData(insFeeOrderNew);
+//            orderAndAreaCompany.setFeeOrderNewVoList(feeOrderNewVoList);
+            FeeOrderNewVo  feeOrderNewVo =   feeRuleSchemeService.newConvertOrderFeeVoData(insFeeOrderNew);
+            orderAndAreaCompany.setFeeOrderNewVo(feeOrderNewVo);
             List<DistributionLevelVo> distributionLevelVoList = feeRuleSchemeService.converDistrbutionData(insFeeOrderNew);
             orderAndAreaCompany.setDistributionLevelVoList(distributionLevelVoList);
         }

src/main/java/com/ydtech/modules/protocols/entity/po/InsFeeOrderNew.java

@@ -324,14 +324,26 @@ public class InsFeeOrderNew {
     @TableField(value = "first_level_user_id")
     private String firstLevelUserId;
 
+    @ApiModelProperty(value = "一级分销用户信息")
+    @TableField(exist = false)
+    private String firstLevelUserInfo;
+
     @ApiModelProperty(value = "二级分销用户id")
     @TableField(value = "two_level_user_id")
     private String twoLevelUserId;
 
+    @ApiModelProperty(value = "二级分销用户信息")
+    @TableField(exist = false)
+    private String twoLevelUserInfo;
+
     @ApiModelProperty(value = "三级分销用户id")
     @TableField(value = "three_level_user_id")
     private String threeLevelUserId;
 
+    @ApiModelProperty(value = "三级分销用户信息")
+    @TableField(exist = false)
+    private String threeLevelUserInfo;
+
     @ApiModelProperty(value = "分销等级")
     @TableField(value = "distribution_status")
     private String distributionStatus;