|
|
@@ -68,7 +68,7 @@ public class AuditVerificationAspect {
|
|
|
InsOrders insOrders = insOrdersService.getById(insAreaCompany.getOrderno());
|
|
|
//查找费用 找不到则抛出异常
|
|
|
InsFeeOrderNew insFeeOrderNewByCompanyId = insFeeOrderNewService.getInsFeeOrderNewByCompanyId(companyId);
|
|
|
- if(insFeeOrderNewByCompanyId == null){
|
|
|
+ if(insFeeOrderNewByCompanyId == null && insFeeOrderNewByCompanyId.getCostsId() == null){
|
|
|
throw new SystemException("费用信息不匹配");
|
|
|
}
|
|
|
PtlAgreementProductCostsNew costsNew = ptlAgreementProductCostsNewService.getById(insFeeOrderNewByCompanyId.getCostsId());
|
|
|
@@ -81,14 +81,8 @@ public class AuditVerificationAspect {
|
|
|
throw new SystemException("费用信息异常");
|
|
|
}
|
|
|
|
|
|
- //再进行费用因子判断
|
|
|
- try {
|
|
|
- //先进行承保规则判断
|
|
|
- feeRuleSchemeNewService.verificationRuleFactor(insAreaCompany, insOrders);
|
|
|
-// feeRuleSchemeNewService.verificationCostFactor(insAreaCompany, insOrders);
|
|
|
- } catch (Exception ignored) {
|
|
|
- System.out.printf("费用因子匹配失败:" + ignored.getMessage());
|
|
|
- }
|
|
|
+ //先进行承保规则判断
|
|
|
+ feeRuleSchemeNewService.verificationRuleFactor(insAreaCompany, insOrders);
|
|
|
}
|
|
|
}
|
|
|
|