|
@@ -1282,11 +1282,15 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
|
|
|
jqOrderFeeVo = packageOrderFeeInfoOne(insFeeOrder);
|
|
jqOrderFeeVo = packageOrderFeeInfoOne(insFeeOrder);
|
|
|
jqOrderFeeVo.setCostsPremiums(convertToString(insFeeOrder.getJqCostsPremiums()));
|
|
jqOrderFeeVo.setCostsPremiums(convertToString(insFeeOrder.getJqCostsPremiums()));
|
|
|
jqOrderFeeVo.setCostsProportion(convertToString(insFeeOrder.getJqCostsProportion()));
|
|
jqOrderFeeVo.setCostsProportion(convertToString(insFeeOrder.getJqCostsProportion()));
|
|
|
|
|
+ jqOrderFeeVo.setCostsPremiumsAll(convertToString(insFeeOrder.getJqSuperviseCostsPremiums())+"元 / "+convertToString(insFeeOrder.getJqCostsPremiums().subtract(insFeeOrder.getJqSuperviseCostsPremiums()))+"元 / "+convertToString(insFeeOrder.getJqCostsPremiums())+"元");
|
|
|
|
|
+ jqOrderFeeVo.setCostsProportionAll(convertToString(insFeeOrder.getJqSuperviseCostsProportion())+" / "+convertToString(insFeeOrder.getJqCostsProportion().subtract(insFeeOrder.getJqSuperviseCostsProportion()))+" / "+convertToString(insFeeOrder.getJqCostsProportion()));
|
|
|
jqFeePremium = insFeeOrder.getJqCostsPremiums();
|
|
jqFeePremium = insFeeOrder.getJqCostsPremiums();
|
|
|
}else if(insFeeOrder.getSyPremium()!=null && insFeeOrder.getSyPremium().doubleValue()>0 && insFeeOrder.getJqPremium()!=null && insFeeOrder.getJqPremium().doubleValue()==0){//当为单商业务时
|
|
}else if(insFeeOrder.getSyPremium()!=null && insFeeOrder.getSyPremium().doubleValue()>0 && insFeeOrder.getJqPremium()!=null && insFeeOrder.getJqPremium().doubleValue()==0){//当为单商业务时
|
|
|
syOrderFeeVo = packageOrderFeeInfoOne(insFeeOrder);
|
|
syOrderFeeVo = packageOrderFeeInfoOne(insFeeOrder);
|
|
|
syOrderFeeVo.setCostsPremiums(convertToString(insFeeOrder.getSyCostsPremiums()));
|
|
syOrderFeeVo.setCostsPremiums(convertToString(insFeeOrder.getSyCostsPremiums()));
|
|
|
syOrderFeeVo.setCostsProportion(convertToString(insFeeOrder.getSyCostsProportion()));
|
|
syOrderFeeVo.setCostsProportion(convertToString(insFeeOrder.getSyCostsProportion()));
|
|
|
|
|
+ syOrderFeeVo.setCostsPremiumsAll(convertToString(insFeeOrder.getSySuperviseCostsPremiums())+"元 / "+convertToString(insFeeOrder.getSyCostsPremiums().subtract(insFeeOrder.getSySuperviseCostsPremiums()))+"元 / "+convertToString(insFeeOrder.getSyCostsPremiums())+"元");
|
|
|
|
|
+ syOrderFeeVo.setCostsProportionAll(convertToString(insFeeOrder.getSySuperviseCostsProportion())+" / "+convertToString(insFeeOrder.getSyCostsProportion().subtract(insFeeOrder.getSySuperviseCostsProportion()))+" / "+convertToString(insFeeOrder.getSyCostsProportion()));
|
|
|
syFeePremium = insFeeOrder.getSyCostsPremiums();
|
|
syFeePremium = insFeeOrder.getSyCostsPremiums();
|
|
|
}else if(insFeeOrder.getJqPremium()!=null && insFeeOrder.getJqPremium().doubleValue()>0 && insFeeOrder.getSyPremium()!=null && insFeeOrder.getSyPremium().doubleValue()>0){//当为交商业务时
|
|
}else if(insFeeOrder.getJqPremium()!=null && insFeeOrder.getJqPremium().doubleValue()>0 && insFeeOrder.getSyPremium()!=null && insFeeOrder.getSyPremium().doubleValue()>0){//当为交商业务时
|
|
|
QueryOrderFeeVo queryOrderFeeVoTemp = packageOrderFeeInfoAll(insFeeOrder);
|
|
QueryOrderFeeVo queryOrderFeeVoTemp = packageOrderFeeInfoAll(insFeeOrder);
|
|
@@ -1294,11 +1298,15 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
|
|
|
jqOrderFeeVo = queryOrderFeeVoTemp.getJqCoderFeeVo();
|
|
jqOrderFeeVo = queryOrderFeeVoTemp.getJqCoderFeeVo();
|
|
|
jqOrderFeeVo.setCostsPremiums(convertToString(insFeeOrder.getJqCostsPremiums()));
|
|
jqOrderFeeVo.setCostsPremiums(convertToString(insFeeOrder.getJqCostsPremiums()));
|
|
|
jqOrderFeeVo.setCostsProportion(convertToString(insFeeOrder.getJqCostsProportion()));
|
|
jqOrderFeeVo.setCostsProportion(convertToString(insFeeOrder.getJqCostsProportion()));
|
|
|
|
|
+ jqOrderFeeVo.setCostsPremiumsAll(convertToString(insFeeOrder.getJqSuperviseCostsPremiums())+"元 / "+convertToString(insFeeOrder.getJqCostsPremiums().subtract(insFeeOrder.getJqSuperviseCostsPremiums()))+"元 / "+convertToString(insFeeOrder.getJqCostsPremiums())+"元");
|
|
|
|
|
+ jqOrderFeeVo.setCostsProportionAll(convertToString(insFeeOrder.getJqSuperviseCostsProportion())+" / "+convertToString(insFeeOrder.getJqCostsProportion().subtract(insFeeOrder.getJqSuperviseCostsProportion()))+" / "+convertToString(insFeeOrder.getJqCostsProportion()));
|
|
|
jqFeePremium = insFeeOrder.getJqCostsPremiums();
|
|
jqFeePremium = insFeeOrder.getJqCostsPremiums();
|
|
|
//获取商业险费用明细
|
|
//获取商业险费用明细
|
|
|
syOrderFeeVo = queryOrderFeeVoTemp.getSyCoderFeeVo();
|
|
syOrderFeeVo = queryOrderFeeVoTemp.getSyCoderFeeVo();
|
|
|
syOrderFeeVo.setCostsPremiums(convertToString(insFeeOrder.getSyCostsPremiums()));
|
|
syOrderFeeVo.setCostsPremiums(convertToString(insFeeOrder.getSyCostsPremiums()));
|
|
|
syOrderFeeVo.setCostsProportion(convertToString(insFeeOrder.getSyCostsProportion()));
|
|
syOrderFeeVo.setCostsProportion(convertToString(insFeeOrder.getSyCostsProportion()));
|
|
|
|
|
+ syOrderFeeVo.setCostsPremiumsAll(convertToString(insFeeOrder.getSySuperviseCostsPremiums())+"元 / "+convertToString(insFeeOrder.getSyCostsPremiums().subtract(insFeeOrder.getSySuperviseCostsPremiums()))+"元 / "+convertToString(insFeeOrder.getSyCostsPremiums())+"元");
|
|
|
|
|
+ syOrderFeeVo.setCostsProportionAll(convertToString(insFeeOrder.getSySuperviseCostsProportion())+" / "+convertToString(insFeeOrder.getSyCostsProportion().subtract(insFeeOrder.getSySuperviseCostsProportion()))+" / "+convertToString(insFeeOrder.getSyCostsProportion()));
|
|
|
syFeePremium = insFeeOrder.getSyCostsPremiums();
|
|
syFeePremium = insFeeOrder.getSyCostsPremiums();
|
|
|
|
|
|
|
|
}
|
|
}
|
|
@@ -1328,6 +1336,12 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
|
|
|
feeResultVo1.setSyFeeAmount(syOrderFeeVo!=null&&syOrderFeeVo.getCostsPremiums()!=null?syOrderFeeVo.getCostsPremiums():"-");
|
|
feeResultVo1.setSyFeeAmount(syOrderFeeVo!=null&&syOrderFeeVo.getCostsPremiums()!=null?syOrderFeeVo.getCostsPremiums():"-");
|
|
|
feeResultVo1.setFcFeeRate(fcOrderFeeVo!=null&&fcOrderFeeVo.getCostsProportion()!=null?fcOrderFeeVo.getCostsProportion():"-");
|
|
feeResultVo1.setFcFeeRate(fcOrderFeeVo!=null&&fcOrderFeeVo.getCostsProportion()!=null?fcOrderFeeVo.getCostsProportion():"-");
|
|
|
feeResultVo1.setFcFeeAmount(fcOrderFeeVo!=null&&fcOrderFeeVo.getCostsPremiums()!=null?fcOrderFeeVo.getCostsPremiums():"-");
|
|
feeResultVo1.setFcFeeAmount(fcOrderFeeVo!=null&&fcOrderFeeVo.getCostsPremiums()!=null?fcOrderFeeVo.getCostsPremiums():"-");
|
|
|
|
|
+ feeResultVo1.setJqFeeRateAll(jqOrderFeeVo!=null&&jqOrderFeeVo.getCostsProportionAll()!=null?jqOrderFeeVo.getCostsProportionAll():"-");
|
|
|
|
|
+ feeResultVo1.setJqFeeAmountAll(jqOrderFeeVo!=null&&jqOrderFeeVo.getCostsPremiumsAll()!=null?jqOrderFeeVo.getCostsPremiumsAll():"-");
|
|
|
|
|
+ feeResultVo1.setSyFeeRateAll(syOrderFeeVo!=null&&syOrderFeeVo.getCostsProportionAll()!=null?syOrderFeeVo.getCostsProportionAll():"-");
|
|
|
|
|
+ feeResultVo1.setSyFeeAmountAll(syOrderFeeVo!=null&&syOrderFeeVo.getCostsPremiumsAll()!=null?syOrderFeeVo.getCostsPremiumsAll():"-");
|
|
|
|
|
+ feeResultVo1.setFcFeeRateAll(fcOrderFeeVo!=null&&fcOrderFeeVo.getCostsProportionAll()!=null?fcOrderFeeVo.getCostsProportionAll():"-");
|
|
|
|
|
+ feeResultVo1.setFcFeeAmountAll(fcOrderFeeVo!=null&&fcOrderFeeVo.getCostsPremiumsAll()!=null?fcOrderFeeVo.getCostsPremiumsAll():"-");
|
|
|
resultList.add(feeResultVo1);
|
|
resultList.add(feeResultVo1);
|
|
|
//一级管理费用
|
|
//一级管理费用
|
|
|
QueryOrderFeeResultVo feeResultVo2=new QueryOrderFeeResultVo();
|
|
QueryOrderFeeResultVo feeResultVo2=new QueryOrderFeeResultVo();
|
|
@@ -1339,6 +1353,12 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
|
|
|
feeResultVo2.setSyFeeAmount(syOrderFeeVo!=null&&syOrderFeeVo.getFirstDeptPremiums()!=null?syOrderFeeVo.getFirstDeptPremiums():"-");
|
|
feeResultVo2.setSyFeeAmount(syOrderFeeVo!=null&&syOrderFeeVo.getFirstDeptPremiums()!=null?syOrderFeeVo.getFirstDeptPremiums():"-");
|
|
|
feeResultVo2.setFcFeeRate(fcOrderFeeVo!=null&&fcOrderFeeVo.getFirstDeptProportion()!=null?fcOrderFeeVo.getFirstDeptProportion():"-");
|
|
feeResultVo2.setFcFeeRate(fcOrderFeeVo!=null&&fcOrderFeeVo.getFirstDeptProportion()!=null?fcOrderFeeVo.getFirstDeptProportion():"-");
|
|
|
feeResultVo2.setFcFeeAmount(fcOrderFeeVo!=null&&fcOrderFeeVo.getFirstDeptPremiums()!=null?fcOrderFeeVo.getFirstDeptPremiums():"-");
|
|
feeResultVo2.setFcFeeAmount(fcOrderFeeVo!=null&&fcOrderFeeVo.getFirstDeptPremiums()!=null?fcOrderFeeVo.getFirstDeptPremiums():"-");
|
|
|
|
|
+ feeResultVo2.setJqFeeRateAll(feeResultVo2.getJqFeeRate());
|
|
|
|
|
+ feeResultVo2.setJqFeeAmountAll(feeResultVo2.getJqFeeAmount());
|
|
|
|
|
+ feeResultVo2.setSyFeeRateAll(feeResultVo2.getSyFeeRate());
|
|
|
|
|
+ feeResultVo2.setSyFeeAmountAll(feeResultVo2.getSyFeeAmount());
|
|
|
|
|
+ feeResultVo2.setFcFeeRateAll(feeResultVo2.getFcFeeRate());
|
|
|
|
|
+ feeResultVo2.setFcFeeAmountAll(feeResultVo2.getFcFeeAmount());
|
|
|
resultList.add(feeResultVo2);
|
|
resultList.add(feeResultVo2);
|
|
|
//二级管理费用
|
|
//二级管理费用
|
|
|
QueryOrderFeeResultVo feeResultVo3=new QueryOrderFeeResultVo();
|
|
QueryOrderFeeResultVo feeResultVo3=new QueryOrderFeeResultVo();
|
|
@@ -1350,6 +1370,12 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
|
|
|
feeResultVo3.setSyFeeAmount(syOrderFeeVo!=null&&syOrderFeeVo.getSecondDeptPremiums()!=null?syOrderFeeVo.getSecondDeptPremiums():"-");
|
|
feeResultVo3.setSyFeeAmount(syOrderFeeVo!=null&&syOrderFeeVo.getSecondDeptPremiums()!=null?syOrderFeeVo.getSecondDeptPremiums():"-");
|
|
|
feeResultVo3.setFcFeeRate(fcOrderFeeVo!=null&&fcOrderFeeVo.getSecondDeptProportion()!=null?fcOrderFeeVo.getSecondDeptProportion():"-");
|
|
feeResultVo3.setFcFeeRate(fcOrderFeeVo!=null&&fcOrderFeeVo.getSecondDeptProportion()!=null?fcOrderFeeVo.getSecondDeptProportion():"-");
|
|
|
feeResultVo3.setFcFeeAmount(fcOrderFeeVo!=null&&fcOrderFeeVo.getSecondDeptPremiums()!=null?fcOrderFeeVo.getSecondDeptPremiums():"-");
|
|
feeResultVo3.setFcFeeAmount(fcOrderFeeVo!=null&&fcOrderFeeVo.getSecondDeptPremiums()!=null?fcOrderFeeVo.getSecondDeptPremiums():"-");
|
|
|
|
|
+ feeResultVo3.setJqFeeRateAll(feeResultVo3.getJqFeeRate());
|
|
|
|
|
+ feeResultVo3.setJqFeeAmountAll(feeResultVo3.getJqFeeAmount());
|
|
|
|
|
+ feeResultVo3.setSyFeeRateAll(feeResultVo3.getSyFeeRate());
|
|
|
|
|
+ feeResultVo3.setSyFeeAmountAll(feeResultVo3.getSyFeeAmount());
|
|
|
|
|
+ feeResultVo3.setFcFeeRateAll(feeResultVo3.getFcFeeRate());
|
|
|
|
|
+ feeResultVo3.setFcFeeAmountAll(feeResultVo3.getFcFeeAmount());
|
|
|
resultList.add(feeResultVo3);
|
|
resultList.add(feeResultVo3);
|
|
|
//三级管理费用
|
|
//三级管理费用
|
|
|
QueryOrderFeeResultVo feeResultVo4=new QueryOrderFeeResultVo();
|
|
QueryOrderFeeResultVo feeResultVo4=new QueryOrderFeeResultVo();
|
|
@@ -1361,6 +1387,12 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
|
|
|
feeResultVo4.setSyFeeAmount(syOrderFeeVo!=null&&syOrderFeeVo.getThirdDeptPremiums()!=null?syOrderFeeVo.getThirdDeptPremiums():"-");
|
|
feeResultVo4.setSyFeeAmount(syOrderFeeVo!=null&&syOrderFeeVo.getThirdDeptPremiums()!=null?syOrderFeeVo.getThirdDeptPremiums():"-");
|
|
|
feeResultVo4.setFcFeeRate(fcOrderFeeVo!=null&&fcOrderFeeVo.getThirdDeptProportion()!=null?fcOrderFeeVo.getThirdDeptProportion():"-");
|
|
feeResultVo4.setFcFeeRate(fcOrderFeeVo!=null&&fcOrderFeeVo.getThirdDeptProportion()!=null?fcOrderFeeVo.getThirdDeptProportion():"-");
|
|
|
feeResultVo4.setFcFeeAmount(fcOrderFeeVo!=null&&fcOrderFeeVo.getThirdDeptPremiums()!=null?fcOrderFeeVo.getThirdDeptPremiums():"-");
|
|
feeResultVo4.setFcFeeAmount(fcOrderFeeVo!=null&&fcOrderFeeVo.getThirdDeptPremiums()!=null?fcOrderFeeVo.getThirdDeptPremiums():"-");
|
|
|
|
|
+ feeResultVo4.setJqFeeRateAll(feeResultVo4.getJqFeeRate());
|
|
|
|
|
+ feeResultVo4.setJqFeeAmountAll(feeResultVo4.getJqFeeAmount());
|
|
|
|
|
+ feeResultVo4.setSyFeeRateAll(feeResultVo4.getSyFeeRate());
|
|
|
|
|
+ feeResultVo4.setSyFeeAmountAll(feeResultVo4.getSyFeeAmount());
|
|
|
|
|
+ feeResultVo4.setFcFeeRateAll(feeResultVo4.getFcFeeRate());
|
|
|
|
|
+ feeResultVo4.setFcFeeAmountAll(feeResultVo4.getFcFeeAmount());
|
|
|
resultList.add(feeResultVo4);
|
|
resultList.add(feeResultVo4);
|
|
|
//四级管理费用
|
|
//四级管理费用
|
|
|
QueryOrderFeeResultVo feeResultVo5=new QueryOrderFeeResultVo();
|
|
QueryOrderFeeResultVo feeResultVo5=new QueryOrderFeeResultVo();
|
|
@@ -1372,6 +1404,12 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
|
|
|
feeResultVo5.setSyFeeAmount(syOrderFeeVo!=null&&syOrderFeeVo.getForthDeptPremiums()!=null?syOrderFeeVo.getForthDeptPremiums():"-");
|
|
feeResultVo5.setSyFeeAmount(syOrderFeeVo!=null&&syOrderFeeVo.getForthDeptPremiums()!=null?syOrderFeeVo.getForthDeptPremiums():"-");
|
|
|
feeResultVo5.setFcFeeRate(fcOrderFeeVo!=null&&fcOrderFeeVo.getForthDeptProportion()!=null?fcOrderFeeVo.getForthDeptProportion():"-");
|
|
feeResultVo5.setFcFeeRate(fcOrderFeeVo!=null&&fcOrderFeeVo.getForthDeptProportion()!=null?fcOrderFeeVo.getForthDeptProportion():"-");
|
|
|
feeResultVo5.setFcFeeAmount(fcOrderFeeVo!=null&&fcOrderFeeVo.getForthDeptPremiums()!=null?fcOrderFeeVo.getForthDeptPremiums():"-");
|
|
feeResultVo5.setFcFeeAmount(fcOrderFeeVo!=null&&fcOrderFeeVo.getForthDeptPremiums()!=null?fcOrderFeeVo.getForthDeptPremiums():"-");
|
|
|
|
|
+ feeResultVo5.setJqFeeRateAll(feeResultVo5.getJqFeeRate());
|
|
|
|
|
+ feeResultVo5.setJqFeeAmountAll(feeResultVo5.getJqFeeAmount());
|
|
|
|
|
+ feeResultVo5.setSyFeeRateAll(feeResultVo5.getSyFeeRate());
|
|
|
|
|
+ feeResultVo5.setSyFeeAmountAll(feeResultVo5.getSyFeeAmount());
|
|
|
|
|
+ feeResultVo5.setFcFeeRateAll(feeResultVo5.getFcFeeRate());
|
|
|
|
|
+ feeResultVo5.setFcFeeAmountAll(feeResultVo5.getFcFeeAmount());
|
|
|
resultList.add(feeResultVo5);
|
|
resultList.add(feeResultVo5);
|
|
|
//五级管理费用
|
|
//五级管理费用
|
|
|
QueryOrderFeeResultVo feeResultVo6=new QueryOrderFeeResultVo();
|
|
QueryOrderFeeResultVo feeResultVo6=new QueryOrderFeeResultVo();
|
|
@@ -1383,6 +1421,12 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
|
|
|
feeResultVo6.setSyFeeAmount(syOrderFeeVo!=null&&syOrderFeeVo.getFifthDeptPremiums()!=null?syOrderFeeVo.getFifthDeptPremiums():"-");
|
|
feeResultVo6.setSyFeeAmount(syOrderFeeVo!=null&&syOrderFeeVo.getFifthDeptPremiums()!=null?syOrderFeeVo.getFifthDeptPremiums():"-");
|
|
|
feeResultVo6.setFcFeeRate(fcOrderFeeVo!=null&&fcOrderFeeVo.getFifthDeptProportion()!=null?fcOrderFeeVo.getFifthDeptProportion():"-");
|
|
feeResultVo6.setFcFeeRate(fcOrderFeeVo!=null&&fcOrderFeeVo.getFifthDeptProportion()!=null?fcOrderFeeVo.getFifthDeptProportion():"-");
|
|
|
feeResultVo6.setFcFeeAmount(fcOrderFeeVo!=null&&fcOrderFeeVo.getFifthDeptPremiums()!=null?fcOrderFeeVo.getFifthDeptPremiums():"-");
|
|
feeResultVo6.setFcFeeAmount(fcOrderFeeVo!=null&&fcOrderFeeVo.getFifthDeptPremiums()!=null?fcOrderFeeVo.getFifthDeptPremiums():"-");
|
|
|
|
|
+ feeResultVo6.setJqFeeRateAll(feeResultVo6.getJqFeeRate());
|
|
|
|
|
+ feeResultVo6.setJqFeeAmountAll(feeResultVo6.getJqFeeAmount());
|
|
|
|
|
+ feeResultVo6.setSyFeeRateAll(feeResultVo6.getSyFeeRate());
|
|
|
|
|
+ feeResultVo6.setSyFeeAmountAll(feeResultVo6.getSyFeeAmount());
|
|
|
|
|
+ feeResultVo6.setFcFeeRateAll(feeResultVo6.getFcFeeRate());
|
|
|
|
|
+ feeResultVo6.setFcFeeAmountAll(feeResultVo6.getFcFeeAmount());
|
|
|
resultList.add(feeResultVo6);
|
|
resultList.add(feeResultVo6);
|
|
|
//一级分销费
|
|
//一级分销费
|
|
|
QueryOrderFeeResultVo feeResultVo7=new QueryOrderFeeResultVo();
|
|
QueryOrderFeeResultVo feeResultVo7=new QueryOrderFeeResultVo();
|