|
@@ -89,19 +89,17 @@ public class QuoteVerificationAspect {
|
|
|
try {
|
|
try {
|
|
|
feeRuleSchemeNewService.verificationCostFactor(insAreaCompany, insOrders);
|
|
feeRuleSchemeNewService.verificationCostFactor(insAreaCompany, insOrders);
|
|
|
InsFeeOrderNew insFeeOrderNew = insFeeOrderNewService.getInsFeeOrderNewByCompanyId(insAreaCompany.getId());
|
|
InsFeeOrderNew insFeeOrderNew = insFeeOrderNewService.getInsFeeOrderNewByCompanyId(insAreaCompany.getId());
|
|
|
- if (insFeeOrderNew == null) {
|
|
|
|
|
- throw new RuntimeException("费用因子匹配失败");
|
|
|
|
|
|
|
+ if (insFeeOrderNew != null) {
|
|
|
|
|
+ //出口
|
|
|
|
|
+ SubOrderExportFeeVo subOrderExportFeeVo = costsCalcService.getExportFee(insFeeOrderNew);
|
|
|
|
|
+
|
|
|
|
|
+ result.getData().setJqExportFee(subOrderExportFeeVo.getJqExportCosts());
|
|
|
|
|
+ result.getData().setSyExportFee(subOrderExportFeeVo.getSyExportCosts());
|
|
|
|
|
+ result.getData().setNoExportFee(subOrderExportFeeVo.getNoExportCosts());
|
|
|
|
|
+ result.getData().setSumExportFee(subOrderExportFeeVo.getJqExportCosts()
|
|
|
|
|
+ .add(subOrderExportFeeVo.getSyExportCosts())
|
|
|
|
|
+ .add(subOrderExportFeeVo.getNoExportCosts()));
|
|
|
}
|
|
}
|
|
|
- //出口
|
|
|
|
|
- SubOrderExportFeeVo subOrderExportFeeVo = costsCalcService.getExportFee(insFeeOrderNew);
|
|
|
|
|
-
|
|
|
|
|
- result.getData().setJqExportFee(subOrderExportFeeVo.getJqExportCosts());
|
|
|
|
|
- result.getData().setSyExportFee(subOrderExportFeeVo.getSyExportCosts());
|
|
|
|
|
- result.getData().setNoExportFee(subOrderExportFeeVo.getNoExportCosts());
|
|
|
|
|
- result.getData().setSumExportFee(subOrderExportFeeVo.getJqExportCosts()
|
|
|
|
|
- .add(subOrderExportFeeVo.getSyExportCosts())
|
|
|
|
|
- .add(subOrderExportFeeVo.getNoExportCosts()));
|
|
|
|
|
-
|
|
|
|
|
} catch (Exception ignored) {
|
|
} catch (Exception ignored) {
|
|
|
System.out.printf("费用因子匹配失败:" + ignored.getMessage());
|
|
System.out.printf("费用因子匹配失败:" + ignored.getMessage());
|
|
|
}
|
|
}
|