Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/order/entity/api/pingan/utils/Base64Convert.java

@@ -1,67 +1,67 @@
-package com.ydtech.modules.order.entity.api.pingan.utils;
-
-import sun.misc.BASE64Decoder;
-import sun.misc.BASE64Encoder;
-
-import java.io.*;
-/**
- *  @version
- *  @author: hxl
- *  @Date: 2024/3/27 17:22
- *  @Description:  base64字符串处理工具类
- */
-public class Base64Convert {
-    /**
-     * 流转换为字符串
-     *
-     * @param in
-     * @return
-     * @throws IOException
-     */
-    public static String ioToBase64(InputStream in) throws IOException {
-        String strBase64 = null;
-        try {
-            // in.available()返回文件的字节长度
-            byte[] bytes = new byte[in.available()];
-            // 将文件中的内容读入到数组中
-            in.read(bytes);
-            strBase64 = new BASE64Encoder().encode(bytes);      //将字节流数组转换为字符串
-        } finally {
-            if (in != null) {
-                in.close();
-            }
-        }
-
-        return strBase64;
-    }
-
-    /**
-     * 流转换为字符串
-     *
-     * @param bytes
-     * @return
-     * @throws IOException
-     */
-    public static String byteToBase64(byte[] bytes)  {
-        String strBase64 = null;
-            // in.available()返回文件的字节长度
-            strBase64 = new BASE64Encoder().encode(bytes);      //将字节流数组转换为字符串
-        return strBase64;
-    }
-
-
-   
-
-    /**
-     * 将base64 转为字节
-     *
-     * @param strBase64
-     * @return
-     * @throws IOException
-     */
-    public static byte[] base64ToByte(String strBase64) throws IOException {
-        // 解码，然后将字节转换为文件
-        byte[] bytes = new BASE64Decoder().decodeBuffer(strBase64);   //将字符串转换为byte数组
-        return bytes;
-    }
-}
+//package com.ydtech.modules.order.entity.api.pingan.utils;
+//
+//import sun.misc.BASE64Decoder;
+//import sun.misc.BASE64Encoder;
+//
+//import java.io.*;
+///**
+// *  @version
+// *  @author: hxl
+// *  @Date: 2024/3/27 17:22
+// *  @Description:  base64字符串处理工具类
+// */
+//public class Base64Convert {
+//    /**
+//     * 流转换为字符串
+//     *
+//     * @param in
+//     * @return
+//     * @throws IOException
+//     */
+//    public static String ioToBase64(InputStream in) throws IOException {
+//        String strBase64 = null;
+//        try {
+//            // in.available()返回文件的字节长度
+//            byte[] bytes = new byte[in.available()];
+//            // 将文件中的内容读入到数组中
+//            in.read(bytes);
+//            strBase64 = new BASE64Encoder().encode(bytes);      //将字节流数组转换为字符串
+//        } finally {
+//            if (in != null) {
+//                in.close();
+//            }
+//        }
+//
+//        return strBase64;
+//    }
+//
+//    /**
+//     * 流转换为字符串
+//     *
+//     * @param bytes
+//     * @return
+//     * @throws IOException
+//     */
+//    public static String byteToBase64(byte[] bytes)  {
+//        String strBase64 = null;
+//            // in.available()返回文件的字节长度
+//            strBase64 = new BASE64Encoder().encode(bytes);      //将字节流数组转换为字符串
+//        return strBase64;
+//    }
+//
+//
+//
+//
+//    /**
+//     * 将base64 转为字节
+//     *
+//     * @param strBase64
+//     * @return
+//     * @throws IOException
+//     */
+//    public static byte[] base64ToByte(String strBase64) throws IOException {
+//        // 解码，然后将字节转换为文件
+//        byte[] bytes = new BASE64Decoder().decodeBuffer(strBase64);   //将字符串转换为byte数组
+//        return bytes;
+//    }
+//}

src/main/java/com/ydtech/modules/xxl/handler/QueryStatusHandler.java

@@ -85,11 +85,13 @@ public class QueryStatusHandler {
         //获取24小时内未支付的订单
         List<InsAreaCompany> noPayList = insAreaCompanyMapper.getNoPayList(time.get("startTime"), time.get("endTime"));
         noPayList.forEach(insAreaCompany -> {
+            //协议id不为空的数据
             if (insAreaCompany.getAgreementId() != null) {
                 //实例化
                 try {
                     //添加延迟
                     Thread.sleep((random.nextInt(5) + 1) * 1000);
+                    //根据保险公司编号id获取对应的承保接口的service
                     BaseQueryStatusService queryStatusService = QueryStatusFactory.getQueryStatusService(components, insAreaCompany.getCompanyId());
                     if (queryStatusService != null) {
                         QueryStatusResult queryStatusResult = queryStatusService.queryStatus(insAreaCompany);
@@ -103,9 +105,14 @@ public class QueryStatusHandler {
                             insAreaCompany.setPayDate(dateTime);
                             //设置状态为已承保
                             insAreaCompany.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
+                            //更新外部表接口
                             insAreaCompanyMapper.updateInsideOrder(insAreaCompany);
+                            //add by  hxl   更新内部装状态
+                            insAreaCompanyMapper.updateInsideOrderNew(insAreaCompany);
+
+                            //查询订单更新为已承保状态
                             InsOrders insOrders = insOrdersMapper.selectOne(new LambdaQueryWrapper<InsOrders>().eq(InsOrders::getOrderno, insAreaCompany.getOrderno()));
-                            //设置主订单为已承保
+                            //设置主订单为已承保 保险订单表
                             insOrders.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
                             insOrdersMapper.updateStatus(insOrders.getOrderno(),InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
 

src/main/java/com/ydtech/modules/xxl/mapper/XxlInsAreaCompanyMapper.java

@@ -12,6 +12,18 @@ public interface XxlInsAreaCompanyMapper extends BaseMapper<InsAreaCompany> {
     List<InsAreaCompany> getNoPayList(String startTime, String endTime);
 
     List<InsAreaCompany> getNoSyncList(String startTime,String endTime);
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/3/28 15:03
+     *  @Description: 更新外部状态
+     */
     boolean updateInsideOrder(InsAreaCompany insAreaCompany);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/3/28 15:03
+     *  @Description: 更新内部状态
+     */
+    boolean updateInsideOrderNew(InsAreaCompany insAreaCompany);
 }

src/main/java/com/ydtech/modules/xxl/service/impl/DaJiaQueryStatusService.java

@@ -11,14 +11,16 @@ import com.ydtech.modules.xxl.model.InsAreaCompany;
 import com.ydtech.modules.xxl.model.QueryStatusResult;
 import com.ydtech.modules.xxl.service.BaseQueryStatusService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 
-
 import java.util.List;
 import java.util.stream.Collectors;
-
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2024/3/28 11:33
+ *  @Description:  大家财险
+ */
 @Service
 @RequiredArgsConstructor
 public class DaJiaQueryStatusService implements BaseQueryStatusService {

src/main/java/com/ydtech/modules/xxl/service/impl/GuoRenQueryStatusService.java

@@ -1,32 +1,27 @@
 package com.ydtech.modules.xxl.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
-import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.ins.model.guoren.InsOrderStatusResp;
 import com.ydtech.modules.order.components.ConfigureParametersComponents;
-import com.ydtech.modules.order.components.dajia.DaJiaRequestApiComponents;
 import com.ydtech.modules.order.components.gouren.GuorenRequestApiComponent;
-import com.ydtech.modules.order.entity.api.dajia.DaJiaConfigureParameters;
-import com.ydtech.modules.order.entity.api.dajia.request.ODR2010Request;
-import com.ydtech.modules.order.entity.api.dajia.response.ODR2010Response;
 import com.ydtech.modules.order.entity.api.guoren.constants.PlatformInterfaceCode;
 import com.ydtech.modules.order.entity.api.guoren.request.ApplicationDetailsRequest;
-import com.ydtech.modules.order.entity.api.guoren.response.SignatureResponse;
 import com.ydtech.modules.protocol.service.PtlAgreementAttributionService;
 import com.ydtech.modules.xxl.model.InsAreaCompany;
 import com.ydtech.modules.xxl.model.QueryStatusResult;
 import com.ydtech.modules.xxl.service.BaseQueryStatusService;
 import com.ydtech.utils.StringUtils;
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.List;
-import java.util.stream.Collectors;
-
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2024/3/28 11:34
+ *  @Description: 国任财险
+ */
 @Service
 @RequiredArgsConstructor
 public class GuoRenQueryStatusService implements BaseQueryStatusService {

src/main/java/com/ydtech/modules/xxl/service/impl/HuaTaiQueryStatusService.java

@@ -1,16 +1,8 @@
 package com.ydtech.modules.xxl.service.impl;
 
-import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
-import com.ydtech.core.page.HttpResult;
-import com.ydtech.modules.ins.model.InsOrder;
-import com.ydtech.modules.ins.model.guoren.InsOrderStatusResp;
 import com.ydtech.modules.order.components.ConfigureParametersComponents;
-import com.ydtech.modules.order.components.gouren.GuorenRequestApiComponent;
 import com.ydtech.modules.order.components.huatai.HuaTaiRequestApiComponents;
-import com.ydtech.modules.order.entity.api.guoren.constants.PlatformInterfaceCode;
-import com.ydtech.modules.order.entity.api.guoren.request.ApplicationDetailsRequest;
 import com.ydtech.modules.order.entity.api.huatai.HuaTaiBaseRequestHead;
 import com.ydtech.modules.order.entity.api.huatai.constants.HuaTaiSubmitCommon;
 import com.ydtech.modules.order.entity.api.huatai.request.HuaTaiSubmitStatusQueryRequest;
@@ -23,12 +15,16 @@ import com.ydtech.modules.xxl.model.QueryStatusResult;
 import com.ydtech.modules.xxl.service.BaseQueryStatusService;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2024/3/28 11:34
+ *  @Description: 华泰财险
+ */
 @Service
 @RequiredArgsConstructor
 public class HuaTaiQueryStatusService implements BaseQueryStatusService {

src/main/java/com/ydtech/modules/xxl/service/impl/ReptileQueryStatusService.java

@@ -1,14 +1,7 @@
 package com.ydtech.modules.xxl.service.impl;
 
-import com.alibaba.fastjson.JSON;
-import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
-import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.order.components.ConfigureParametersComponents;
 import com.ydtech.modules.order.components.InsCrawlerOrderComponents;
-import com.ydtech.modules.order.components.zijin.ZijinRequestApiComponents;
-import com.ydtech.modules.order.entity.api.zijin.constants.enums.OrderStatusEnum;
-import com.ydtech.modules.order.entity.api.zijin.request.OrderNoRequest;
-import com.ydtech.modules.order.entity.api.zijin.response.QueryOrderDetailResponse;
 import com.ydtech.modules.order.entity.crawler.constants.CrawlerVerifyPaymentConstants;
 import com.ydtech.modules.order.entity.crawler.request.CrawlerBaseRequest;
 import com.ydtech.modules.order.entity.crawler.response.CrawlerVerifyPaymentResponse;
@@ -18,12 +11,10 @@ import com.ydtech.modules.xxl.model.InsAreaCompany;
 import com.ydtech.modules.xxl.model.QueryStatusResult;
 import com.ydtech.modules.xxl.service.BaseQueryStatusService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.List;
 
 @Service
 @RequiredArgsConstructor

src/main/java/com/ydtech/modules/xxl/service/impl/YongChengQueryStatusService.java

@@ -1,22 +1,16 @@
 package com.ydtech.modules.xxl.service.impl;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
-import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.ins.model.yc.AuthorityDataXml;
 import com.ydtech.modules.ins.model.yc.CallBackRequest;
 import com.ydtech.modules.ins.model.yc.YcConfigureParameters;
 import com.ydtech.modules.ins.model.yc.callbackAnOrder.CallbackAnOrder;
 import com.ydtech.modules.order.components.ConfigureParametersComponents;
-import com.ydtech.modules.order.components.dajia.DaJiaRequestApiComponents;
 import com.ydtech.modules.order.components.yongcheng.YongchengRequestApiComponents;
 import com.ydtech.modules.order.entity.api.yongcheng.constants.MessageStatusCode;
 import com.ydtech.modules.order.entity.api.yongcheng.request.AccidentUnderwritingRequest;
 import com.ydtech.modules.order.entity.api.yongcheng.response.AccidentUnderwritingResponse;
-import com.ydtech.modules.order.entity.dto.DrivingInsuranceDto;
 import com.ydtech.modules.protocol.entity.po.PtlAgreementAttribution;
 import com.ydtech.modules.protocol.service.PtlAgreementAttributionService;
 import com.ydtech.modules.xxl.model.InsAreaCompany;
@@ -24,14 +18,17 @@ import com.ydtech.modules.xxl.model.QueryStatusResult;
 import com.ydtech.modules.xxl.service.BaseQueryStatusService;
 import com.ydtech.utils.StringUtils;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2024/3/28 11:35
+ *  @Description:  永诚财险
+ */
 @Service
 @RequiredArgsConstructor
 public class YongChengQueryStatusService implements BaseQueryStatusService {

src/main/java/com/ydtech/modules/xxl/service/impl/ZhongMeiQueryStatusService.java

@@ -1,13 +1,7 @@
 package com.ydtech.modules.xxl.service.impl;
 
-import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
-import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.order.components.ConfigureParametersComponents;
 import com.ydtech.modules.order.components.ZhongmeiRequestApiComponents;
-import com.ydtech.modules.order.components.dajia.DaJiaRequestApiComponents;
-import com.ydtech.modules.order.entity.api.dajia.DaJiaConfigureParameters;
-import com.ydtech.modules.order.entity.api.dajia.request.ODR2010Request;
-import com.ydtech.modules.order.entity.api.dajia.response.ODR2010Response;
 import com.ydtech.modules.order.entity.api.zhongmei.BaseRequestHead;
 import com.ydtech.modules.order.entity.api.zhongmei.constants.enums.PaymentStatusEnum;
 import com.ydtech.modules.order.entity.api.zhongmei.request.OrderStatusRequest;
@@ -20,14 +14,13 @@ import com.ydtech.modules.xxl.model.QueryStatusResult;
 import com.ydtech.modules.xxl.service.BaseQueryStatusService;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
-
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.List;
-import java.util.stream.Collectors;
-
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2024/3/28 11:36
+ *  @Description:  中煤
+ */
 @Service
 @RequiredArgsConstructor
 public class ZhongMeiQueryStatusService implements BaseQueryStatusService {

src/main/java/com/ydtech/modules/xxl/service/impl/ZijinQueryStatusService.java

@@ -1,34 +1,23 @@
 package com.ydtech.modules.xxl.service.impl;
 
-import com.alibaba.fastjson.JSON;
-import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
-import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.order.components.ConfigureParametersComponents;
-import com.ydtech.modules.order.components.ZhongmeiRequestApiComponents;
 import com.ydtech.modules.order.components.zijin.ZijinRequestApiComponents;
-import com.ydtech.modules.order.entity.api.zhongmei.BaseRequestHead;
-import com.ydtech.modules.order.entity.api.zhongmei.constants.enums.PaymentStatusEnum;
-import com.ydtech.modules.order.entity.api.zhongmei.request.OrderStatusRequest;
-import com.ydtech.modules.order.entity.api.zhongmei.response.OrderStatusResponse;
 import com.ydtech.modules.order.entity.api.zijin.constants.enums.OrderStatusEnum;
 import com.ydtech.modules.order.entity.api.zijin.request.OrderNoRequest;
 import com.ydtech.modules.order.entity.api.zijin.response.QueryOrderDetailResponse;
-import com.ydtech.modules.order.entity.config.ZmConfigureParameters;
-import com.ydtech.modules.order.entity.dto.DrivingInsuranceDto;
-import com.ydtech.modules.protocol.entity.po.PtlAgreementAttribution;
 import com.ydtech.modules.protocol.service.PtlAgreementAttributionService;
 import com.ydtech.modules.xxl.model.InsAreaCompany;
 import com.ydtech.modules.xxl.model.QueryStatusResult;
 import com.ydtech.modules.xxl.service.BaseQueryStatusService;
-import com.ydtech.utils.StringUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Service;
-
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.List;
-
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2024/3/28 11:36
+ *  @Description:  紫金财险
+ */
 @Service
 @RequiredArgsConstructor
 public class ZijinQueryStatusService implements BaseQueryStatusService {

src/main/resources/mapper/modules/xxl/XxlInsAreaCompanyMapper.xml

@@ -132,4 +132,10 @@
         WHERE id = #{id}
     </update>
 
+    <update id="updateInsideOrderNew" parameterType="com.ydtech.modules.xxl.model.InsAreaCompany">
+        UPDATE ins_area_company
+        SET order_status = #{orderstatus},
+            pay_date = #{payDate}
+        WHERE id = #{id}
+    </update>
 </mapper>