国任 添加空判断

永诚调整刷新状态

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/crawler/entity/request/GuoRenCrawlerGetCarPriceRequest.java

@@ -14,6 +14,7 @@ import lombok.NoArgsConstructor;
 import org.springframework.util.StringUtils;
 
 import java.util.List;
+import java.util.Objects;
 
 
 /**
@@ -710,7 +711,9 @@ public class GuoRenCrawlerGetCarPriceRequest {
         this.modelCodeOld = queryCarModelData.getBrandCode();
         this.vehicleModel = queryCarModelData.getVehiclefgwCode();
         this.seatCountlb = queryCarModelData.getSeatCountlb();
-        this.exhaustScalelb = Double.valueOf(queryCarModelData.getExHaustScale());
+        if(Objects.nonNull(queryCarModelData.getExHaustScale())){
+            this.exhaustScalelb = Double.valueOf(queryCarModelData.getExHaustScale());
+        }
         this.vehicleBrand = queryCarModelData.getBrandNameBC();
         this.powerLB = queryCarModelData.getExHaustScale() != null ? Double.valueOf(queryCarModelData.getExHaustScale()) : 0.0;
         this.newFuelModel = "0";

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

@@ -376,6 +376,27 @@ public class YongChengApiRequestImpl implements YongChengApiRequest {
         }
     }
 
+    private OrderStatusResultVo buildCallBackStatus(OrderStatusVo orderStatusVo, String status) {
+        OrderStatusResultVo orderStatusResultVo = new OrderStatusResultVo();
+        if (status.equals("9")) {
+            orderStatusVo.getInsOrders().setOrderStatus(InsOrderStatusEnum.PAY_PENDING.getCode());
+            // 刷新支付连接
+            PaymentLinkVo paymentLinkVo = new PaymentLinkVo();
+            paymentLinkVo.setOrder(orderStatusVo.getOrder());
+            PaymentLinkResultsVo paymentLink = getPaymentLink(paymentLinkVo);
+            String paymentLinkResult = paymentLink.getPaymentLink();
+            orderStatusResultVo.setOrderStatus(InsOrderStatusEnum.PAY_PENDING);
+            orderStatusResultVo.setPaymentLink(paymentLinkResult);
+        }
+        if (status.equals("3")) {
+            orderStatusResultVo.setOrderStatus(InsOrderStatusEnum.AUDIT_FAIL);
+        }
+        if (status.equals("1")) {
+            orderStatusResultVo.setOrderStatus(InsOrderStatusEnum.UNDERWRITED);
+        }
+        return orderStatusResultVo;
+    }
+
     @Override
     public OrderStatusResultVo queryOrderState(OrderStatusVo orderStatusVo) {
         OrderStatusResultVo orderStatusResultVo = new OrderStatusResultVo();
@@ -388,24 +409,21 @@ public class YongChengApiRequestImpl implements YongChengApiRequest {
             String cleanStr = ycRequestApiComponents.payCallback(callbackRequest,url);
             CallBackResponse response = CallBackResponse.buildCallBackParam(cleanStr);
             if (response.getResult().equals("0")) {
-                // 刷新支付连接
-                PaymentLinkVo paymentLinkVo = new PaymentLinkVo();
-                paymentLinkVo.setOrder(orderStatusVo.getOrder());
-                PaymentLinkResultsVo paymentLink = getPaymentLink(paymentLinkVo);
-                String paymentLinkResult = paymentLink.getPaymentLink();
-                orderStatusResultVo.setOrderStatus(InsOrderStatusEnum.PAY_PENDING);
-                orderStatusResultVo.setPaymentLink(paymentLinkResult);
-                if (StringUtils.isNotEmpty(response.getBizPolicyNo())) {
-                    orderStatusResultVo.setSyPolicyno(response.getBizPolicyNo());
-                }
-
-                if (StringUtils.isNotEmpty(response.getCiPolicyNo())) {
-                    orderStatusResultVo.setJqPolicyno(response.getCiPolicyNo());
-                }
-
-                if (StringUtils.isNotEmpty(response.getYwPolicyAppNo())) {
-                    orderStatusResultVo.setJyPolicyno(response.getYwPolicyNo());
-                    orderStatusResultVo.setJyApplyNo(response.getYwPolicyAppNo());
+                if(orderStatusVo.getInsOrders().getOrderStatus().equals(InsOrderStatusEnum.PAY_PENDING.getCode().toString())){
+                    orderStatusResultVo = buildCallBackStatus(orderStatusVo, response.getJqstatus());
+                    // 获取商业保单号
+                    if (StringUtils.isNotEmpty(response.getBizPolicyNo())) {
+                        orderStatusResultVo.setSyPolicyno(response.getBizPolicyNo());
+                    }
+                    // 获取交强保单号
+                    if (StringUtils.isNotEmpty(response.getCiPolicyNo())) {
+                        orderStatusResultVo.setJqPolicyno(response.getCiPolicyNo());
+                    }
+                    // 获取驾意保单号
+                    if (StringUtils.isNotEmpty(response.getYwPolicyAppNo())) {
+                        orderStatusResultVo.setJyPolicyno(response.getYwPolicyNo());
+                        orderStatusResultVo.setJyApplyNo(response.getYwPolicyAppNo());
+                    }
                 }
             } else {
                 //失败原因