Merge remote-tracking branch 'origin/master'

commons/src/main/java/com/jzg/commons/constants/quote/enums/base/ExpenseRequestUrl.java

@@ -14,6 +14,7 @@ import lombok.Getter;
 public enum ExpenseRequestUrl {
 
     CAPTCHA_IDENTIFY("/identify/captcha", "验证码识别"),
+    CAPTCHA_CALCULATE("/calculate/captcha", "计算验证码识别"),
     REINSURANCE_CAPTCHA_IDENTIFY("/reinsurance/captcha", "转保验证码识别"),
     SLIDER_IDENTIFY("/identify/slider", "滑块验证"),
     SLIDER_MATCH("/identify/slide-match", "滑块验证"),

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/service/ExteriorUtilsRequest.java

@@ -17,15 +17,23 @@ public interface ExteriorUtilsRequest {
     /**
      * 验证码识别
      *
-     * @param base64 base64信息
+     * @param base64String base64信息
      * @return 识别出来的验证码
      */
     String captchaIdentify(String base64String);
 
+    /**
+     * 计算验证码失败
+     *
+     * @param base64String base64 图片信息
+     * @return 计算之后的数字
+     */
+    String captchaCalculate(String base64String);
+
     /**
      * 转保验证码识别
      *
-     * @param base64String
+     * @param reinsuranceCaptchaVo
      * @return 转保验证码结果
      */
     ReinsuranceCaptchaVo reinsuranceCaptchaIdentify(ReinsuranceCaptchaVo reinsuranceCaptchaVo);

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/service/impl/ExteriorUtilsRequestImpl.java

@@ -1,11 +1,11 @@
 package com.jzg.quotation.commons.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.jzg.quotation.commons.component.RequestComponent;
 import com.jzg.commons.constants.quote.enums.base.ExpenseRequestUrl;
 import com.jzg.commons.entity.quote.vo.base.R;
 import com.jzg.commons.entity.quote.vo.identify.ReinsuranceCaptchaVo;
 import com.jzg.commons.entity.quote.vo.identify.SliderCaptchaVo;
+import com.jzg.quotation.commons.component.RequestComponent;
 import com.jzg.quotation.commons.properties.CaptchaRecognitionProperties;
 import com.jzg.quotation.commons.service.ExteriorUtilsRequest;
 import lombok.RequiredArgsConstructor;
@@ -37,9 +37,17 @@ public class ExteriorUtilsRequestImpl implements ExteriorUtilsRequest {
 
     @Override
     public String captchaIdentify(String base64String) {
+        return request(base64String, ExpenseRequestUrl.CAPTCHA_IDENTIFY);
+    }
+
+    @Override
+    public String captchaCalculate(String base64String) {
+        return request(base64String, ExpenseRequestUrl.CAPTCHA_CALCULATE);
+    }
+
+    private String request(String base64String, ExpenseRequestUrl expenseRequestUrl) {
         base64String = prefixToRemove(base64String);
-        ExpenseRequestUrl captcha = ExpenseRequestUrl.CAPTCHA_IDENTIFY;
-        String url = ExpenseRequestUrl.getUrl(captchaRecognitionProperties.getUrl(), captcha.getUri());
+        String url = ExpenseRequestUrl.getUrl(captchaRecognitionProperties.getUrl(), expenseRequestUrl.getUri());
         Mono<R> response = requestComponent.postGbk(url, JSON.toJSONString(Map.of("captcha", base64String)), R.class, new HttpHeaders());
         return response.block().getData().toString();
     }
@@ -62,5 +70,4 @@ public class ExteriorUtilsRequestImpl implements ExteriorUtilsRequest {
     }
 
 
-
 }

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/api/service/Impl/GuoRenApiRequestImpl.java

@@ -337,13 +337,17 @@ public class GuoRenApiRequestImpl implements GuoRenApiRequest {
      */
     @Override
     public OrderStatusResultVo queryOrderState(OrderStatusVo orderBase) {
+        GuoRenApiOrder guoRenApiOrder = guoRenApiOrderService.findByOrdersNo(orderBase.getOrder().getOrdersNo());
+
         //查询投保单信息
         InsOrdersPolicy insOrdersPolicy = orderBase.getInsOrdersPolicy();
+        insOrdersPolicy.setJqApplyNo(guoRenApiOrder.getJqApplyNo());
+        insOrdersPolicy.setSyApplyNo(guoRenApiOrder.getSyApplyNo());
+
         InsOrders insOrders = orderBase.getInsOrders();
         String url = getApiUrl(orderBase.getOrder().getInsuranceCompanyId());
         // 获取保司订单状态
         OrderStateResponse orderStateResponse = insOrderStatus(insOrdersPolicy, url);
-        GuoRenApiOrder guoRenApiOrder = guoRenApiOrderService.findByOrdersNo(orderBase.getOrder().getOrdersNo());
         OrderStatusResultVo orderStatusResultVo = new OrderStatusResultVo();
         if (null != orderStateResponse && CollUtil.isNotEmpty(orderStateResponse.getData())) {
             OrderStateResponse.DataDTO jqDataDTO =
@@ -687,7 +691,7 @@ public class GuoRenApiRequestImpl implements GuoRenApiRequest {
 
                     // 获取文件流
                     String imgUrl = minioUtils.getPresignedObjectUrl(uploadFile.getBucketName(), fileName);
-                    logger.info("国任影像上传，获取文件预签名URL，imageId：{}", imgUrl);
+                    logger.info("国任影像上传，获取文件预签名URL，imgUrl：{}", imgUrl);
                     InputStream inputStream = minioUtils.getObject(uploadFile.getBucketName(), fileName);
                     if (inputStream == null) {
                         logger.error("国任上传影像失败，获取文件预签名URL失败，imageId：{}", imageDTO.getImageId());