永诚修改

查询特约全部返回200

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/UnifyOrderManager.java

@@ -891,18 +891,12 @@ public class UnifyOrderManager {
         HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findById(insOrders.getCompanyId());
         String systemCode = getSystemCode();
 
-        //先默认第一个协议
-        List<PtlAgreement> byCompanyId = agreementCacheService.getByCompanyId(insOrders.getCompanyId(), systemCode);
-        if (CollUtil.isEmpty(byCompanyId)) {
-            AssertionUtils.isFail(true, "保司未配置协议");
-        }
-
         // 获取特约列表
         CompanyClauseVo companyClauseVo = new CompanyClauseVo();
         companyClauseVo.setCompanyId(insOrders.getCompanyId());
         HttpResult<List<InsCompanyClauseVo>> clauseDataResult = platformClient.queryClauseData(companyClauseVo);
         if (clauseDataResult.getData().isEmpty()) {
-            AssertionUtils.isFail(true, "保司未配置特约");
+            return HttpResult.ok("保司未配置协议");
         }
         clauseDataVo.setJqPremium(costs.getJqPremium());
         clauseDataVo.setSyPremium(costs.getSyPremium());
@@ -920,7 +914,7 @@ public class UnifyOrderManager {
         clauseDataVo.getOrder().setInsuranceCompanyId(esmInsCompanyHttpResult.getData().getId());
         clauseDataVo.getOrder().setInsuranceCompanyCode(esmInsCompanyHttpResult.getData().getCompanyCode());
         clauseDataVo.getOrder().setApiType(Integer.parseInt(insOrders.getApiType()));
-        clauseDataVo.getOrder().setAgreementId(byCompanyId.get(0).getId());
+        clauseDataVo.getOrder().setAgreementId(insOrders.getAgreementId());
         QuotationBaseService quoteService = companyFactory.getClauseDataService(clauseDataVo);
         quoteService.queryClauseData(clauseDataVo);
 

tenant/insurance/quotation-yongcheng/src/main/java/com/jzg/quotation/yongcheng/api/service/impl/YongChengApiRequestImpl.java

@@ -420,13 +420,13 @@ public class YongChengApiRequestImpl implements YongChengApiRequest {
             if (response.getResult().equals("0")) {
                 //判断人工处理和核保退回
                 if(orderStatusVo.getInsOrders().getOrderStatus().equals(InsOrderStatusEnum.STAFF_PROCESS.getCode().toString())){
-                    if(response.getJqstatus().equals("9") || response.getSystatus().equals("9")){
-                        orderStatusResultVo.setOrderStatus(InsOrderStatusEnum.PAY_PENDING);
-                    }else if(response.getJqstatus().equals("0") || response.getSystatus().equals("0")){
+                    if(response.getJqstatus().equals("0") || response.getSystatus().equals("0")) {
                         orderStatusResultVo.setOrderStatus(InsOrderStatusEnum.STAFF_PROCESS);
-                    }else if(response.getJqstatus().equals(3)){
+                    }else if(response.getJqstatus().equals("3") || response.getSystatus().equals("3")){
                         orderStatusResultVo.setOrderStatus(InsOrderStatusEnum.AUDIT_FAIL);
                         orderStatusResultVo.setErrorMsg(response.getJqmessage());
+                    }else if(response.getJqstatus().equals("9") || response.getSystatus().equals("9")){
+                        orderStatusResultVo.setOrderStatus(InsOrderStatusEnum.PAY_PENDING);
                     }
                 }
                 if(orderStatusVo.getInsOrders().getOrderStatus().equals(InsOrderStatusEnum.PAY_PENDING.getCode().toString())){