|
|
@@ -1121,20 +1121,36 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
|
|
|
|
|
|
|
|
|
|
|
|
+// FeeOrderNewVo.ExportFee jqExportFeeConv = new FeeOrderNewVo.ExportFee();
|
|
|
+// BeanUtils.copyProperties(jqExportFee,jqExportFeeConv);
|
|
|
+// exportFeeList.add(jqExportFeeConv);
|
|
|
+//
|
|
|
+// FeeOrderNewVo.ExportFee syExportFeeConv = new FeeOrderNewVo.ExportFee();
|
|
|
+// BeanUtils.copyProperties(syExportFee,syExportFeeConv);
|
|
|
+// exportFeeList.add(syExportFeeConv);
|
|
|
+//
|
|
|
+// FeeOrderNewVo.ExportFee noExportFeeConv = new FeeOrderNewVo.ExportFee();
|
|
|
+// BeanUtils.copyProperties(noExportFee,noExportFeeConv);
|
|
|
+// exportFeeList.add(noExportFeeConv);
|
|
|
+//
|
|
|
+// resultFeeOrderNewVo.setExportFee(exportFeeList);
|
|
|
+
|
|
|
+ feeOrderNewVo.getExportFee().clear();
|
|
|
+
|
|
|
FeeOrderNewVo.ExportFee jqExportFeeConv = new FeeOrderNewVo.ExportFee();
|
|
|
BeanUtils.copyProperties(jqExportFee,jqExportFeeConv);
|
|
|
- exportFeeList.add(jqExportFeeConv);
|
|
|
+ jqExportFeeConv.setInsuranceType("交强险");
|
|
|
+ feeOrderNewVo.getExportFee().add(jqExportFeeConv);
|
|
|
|
|
|
FeeOrderNewVo.ExportFee syExportFeeConv = new FeeOrderNewVo.ExportFee();
|
|
|
BeanUtils.copyProperties(syExportFee,syExportFeeConv);
|
|
|
- exportFeeList.add(syExportFeeConv);
|
|
|
+ syExportFeeConv.setInsuranceType("商业险");
|
|
|
+ feeOrderNewVo.getExportFee().add(syExportFeeConv);
|
|
|
|
|
|
FeeOrderNewVo.ExportFee noExportFeeConv = new FeeOrderNewVo.ExportFee();
|
|
|
BeanUtils.copyProperties(noExportFee,noExportFeeConv);
|
|
|
- exportFeeList.add(noExportFeeConv);
|
|
|
-
|
|
|
- resultFeeOrderNewVo.setExportFee(exportFeeList);
|
|
|
-
|
|
|
+ noExportFeeConv.setInsuranceType("非车险");
|
|
|
+ feeOrderNewVo.getExportFee().add(noExportFeeConv);
|
|
|
|
|
|
|
|
|
//入口
|
|
|
@@ -1303,6 +1319,33 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
|
|
|
feeOrderNewVo.getDeptManagerFee().get(2).setDeptPremiumsLevelFoure(noDeptManagerFee.getDeptPremiumsLevelFoure());
|
|
|
feeOrderNewVo.getDeptManagerFee().get(2).setDeptPremiumsLevelFive(noDeptManagerFee.getDeptPremiumsLevelFive());
|
|
|
|
|
|
+ //处理交强一级机构管理费
|
|
|
+ feeOrderNewVo.getDeptManagerFee().get(0).setDeptPremiumsLevelOne(feeOrderNewVo.getEntranceFee().get(0).getTotalAmount().subtract(
|
|
|
+ feeOrderNewVo.getExportFee().get(0).getTotalAmount().add(feeOrderNewVo.getDeptManagerFee().get(0).getDeptPremiumsLevelTwo())
|
|
|
+ .add(feeOrderNewVo.getDeptManagerFee().get(0).getDeptPremiumsLevelThree())
|
|
|
+ .add(feeOrderNewVo.getDeptManagerFee().get(0).getDeptPremiumsLevelFoure())
|
|
|
+ .add(feeOrderNewVo.getDeptManagerFee().get(0).getDeptPremiumsLevelFive())
|
|
|
+ ));
|
|
|
+
|
|
|
+ //处理商业一级机构管理费
|
|
|
+ feeOrderNewVo.getDeptManagerFee().get(1).setDeptPremiumsLevelOne(feeOrderNewVo.getEntranceFee().get(1).getTotalAmount().subtract(
|
|
|
+ feeOrderNewVo.getExportFee().get(1).getTotalAmount().add(feeOrderNewVo.getDeptManagerFee().get(1).getDeptPremiumsLevelTwo())
|
|
|
+ .add(feeOrderNewVo.getDeptManagerFee().get(1).getDeptPremiumsLevelThree())
|
|
|
+ .add(feeOrderNewVo.getDeptManagerFee().get(1).getDeptPremiumsLevelFoure())
|
|
|
+ .add(feeOrderNewVo.getDeptManagerFee().get(1).getDeptPremiumsLevelFive())
|
|
|
+ ));
|
|
|
+
|
|
|
+ //处理非车一级机构管理费
|
|
|
+ feeOrderNewVo.getDeptManagerFee().get(2).setDeptPremiumsLevelOne(feeOrderNewVo.getEntranceFee().get(2).getTotalAmount().subtract(
|
|
|
+ feeOrderNewVo.getExportFee().get(2).getTotalAmount().add(feeOrderNewVo.getDeptManagerFee().get(2).getDeptPremiumsLevelTwo())
|
|
|
+ .add(feeOrderNewVo.getDeptManagerFee().get(2).getDeptPremiumsLevelThree())
|
|
|
+ .add(feeOrderNewVo.getDeptManagerFee().get(2).getDeptPremiumsLevelFoure())
|
|
|
+ .add(feeOrderNewVo.getDeptManagerFee().get(2).getDeptPremiumsLevelFive())
|
|
|
+ ));
|
|
|
+
|
|
|
+ insFeeOrderNew.setJqDeptPremiumsLevel1(feeOrderNewVo.getDeptManagerFee().get(0).getDeptPremiumsLevelOne());
|
|
|
+ insFeeOrderNew.setSyDeptPremiumsLevel1(feeOrderNewVo.getDeptManagerFee().get(1).getDeptPremiumsLevelOne());
|
|
|
+ insFeeOrderNew.setNoDeptPremiumsLevel1(feeOrderNewVo.getDeptManagerFee().get(2).getDeptPremiumsLevelOne());
|
|
|
|
|
|
//保存新的比例
|
|
|
insFeeOrderNewService.updateById(insFeeOrderNew);
|