Merge remote-tracking branch 'origin/master'

tenant/insurance/quotation-renbaonew/src/main/java/com/jzg/quotation/renbaonew/crawler/component/RenBaoNewCrawlerRequestComponent.java

@@ -1006,6 +1006,70 @@ public class RenBaoNewCrawlerRequestComponent {
         return requestComponent.formData(url, parts, String.class, headers);
     }
 
+    /**
+     * 获取滑块验证信息
+     *
+     * <p>对应Python的get_spilder方法，获取滑块拼图图片和验证参数</p>
+     *
+     * @param headers 请求头
+     * @return 滑块信息（包含jigsawImageBase64、originalImageBase64、secretKey、token）
+     */
+    public Map<String, Object> getSpilder(HttpHeaders headers) {
+        String url = buildUrl(RequestUrl.SPILDER_GET.getUrl());
+
+        Map<String, Object> requestData = new HashMap<>();
+        requestData.put("captchaType", "blockPuzzle");
+        requestData.put("clientUid", "slider-" + java.util.UUID.randomUUID().toString());
+        requestData.put("ts", System.currentTimeMillis());
+
+        log.info("获取滑块验证信息");
+        ResponseEntity<String> responseEntity = requestComponent.stringPost(url, requestData, String.class, headers);
+        return JSON.parseObject(responseEntity.getBody(), new TypeReference<Map<String, Object>>() {});
+    }
+
+    /**
+     * 校验滑块验证
+     *
+     * <p>对应Python的check_spilder方法，提交滑块验证结果</p>
+     *
+     * @param data 滑块验证数据（包含captchaType、pointJson、token）
+     * @param headers 请求头
+     * @return 校验结果
+     */
+    public Map<String, Object> checkSpilder(Map<String, Object> data, HttpHeaders headers) {
+        String url = buildUrl(RequestUrl.SPILDER_CHECK.getUrl());
+
+        log.info("提交滑块验证结果");
+        ResponseEntity<String> responseEntity = requestComponent.stringPost(url, data, String.class, headers);
+        return JSON.parseObject(responseEntity.getBody(), new TypeReference<Map<String, Object>>() {});
+    }
+
+    /**
+     * 滑块二次验证接口
+     *
+     * <p>对应Python的verify_spilder方法，滑块初步验证通过后需要二次验证</p>
+     *
+     * @param data 验证数据（包含captchaVerification）
+     * @param validate0 来自报价响应的statusText
+     * @param validate1 触发滑块的接口路径
+     * @param headers 请求头
+     * @return 验证结果
+     */
+    public Map<String, Object> verifySpilder(Map<String, Object> data, String validate0, String validate1,
+                                            HttpHeaders headers) {
+        String url = buildUrl(RequestUrl.SPILDER_VERIFY.getUrl());
+
+        // 对应Python: headers2 = self.headers.copy(); headers2['validate0'] = validate0; headers2['validate1'] = validate1
+        HttpHeaders verifyHeaders = new HttpHeaders();
+        verifyHeaders.addAll(headers);
+        verifyHeaders.set("validate0", validate0);
+        verifyHeaders.set("validate1", validate1);
+
+        log.info("滑块二次验证: validate0={}, validate1={}", validate0, validate1);
+        ResponseEntity<String> responseEntity = requestComponent.stringPost(url, data, String.class, verifyHeaders);
+        return JSON.parseObject(responseEntity.getBody(), new TypeReference<Map<String, Object>>() {});
+    }
+
     /**
      * 查询投保单信息（获取评分）
      *

tenant/insurance/quotation-renbaonew/src/main/java/com/jzg/quotation/renbaonew/crawler/constant/enums/RequestUrl.java

@@ -135,7 +135,22 @@ public enum RequestUrl {
     /**
      * 查询投保单信息接口（获取评分）
      */
-    QUERY_PROPOSAL_INFO("/front/019K0000003/ipdi/queryProposalInfo");
+    QUERY_PROPOSAL_INFO("/front/019K0000003/ipdi/queryProposalInfo"),
+
+    /**
+     * 获取滑块验证信息接口
+     */
+    SPILDER_GET("/front/019K0000003/spilder/get"),
+
+    /**
+     * 滑块验证校验接口
+     */
+    SPILDER_CHECK("/front/019K0000003/spilder/check"),
+
+    /**
+     * 滑块验证二次校验接口
+     */
+    SPILDER_VERIFY("/front/019K0000003/spilder/verify");
 
     /**
      * 接口URL路径

tenant/insurance/quotation-renbaonew/src/main/java/com/jzg/quotation/renbaonew/crawler/service/impl/RenBaoNewCrawlerRequestBuilder.java

@@ -3102,10 +3102,10 @@ public class RenBaoNewCrawlerRequestBuilder {
         carShipTax.put("prePolicyEndDate", "");
 
         // ========== 税款金额 ==========
-        carShipTax.put("thisPayTax", "");
-        carShipTax.put("prePayTax", "");
-        carShipTax.put("delayPayTax", "");
-        carShipTax.put("sumPayTax", "");
+        carShipTax.put("thisPayTax", "300.00");
+        carShipTax.put("prePayTax", "0.00");
+        carShipTax.put("delayPayTax", "0.00");
+        carShipTax.put("sumPayTax", "300.00");
         carShipTax.put("sumRefundTax", "");
         carShipTax.put("taxUnitAmount", "");
         carShipTax.put("taxUnit", "");
@@ -3114,9 +3114,9 @@ public class RenBaoNewCrawlerRequestBuilder {
         carShipTax.put("payEndDate", "");
 
         // ========== 禁用标志 - req2.json 为空字符串 ==========
-        carShipTax.put("disableThisPayTax", "");
-        carShipTax.put("disablePrePayTax", "");
-        carShipTax.put("disableDelayPayTax", "");
+        carShipTax.put("disableThisPayTax", true);
+        carShipTax.put("disablePrePayTax", true);
+        carShipTax.put("disableDelayPayTax", true);
 
         // ========== 显示标志 ==========
         carShipTax.put("jeShow", false);

tenant/insurance/quotation-renbaonew/src/main/java/com/jzg/quotation/renbaonew/crawler/service/impl/RenBaoNewCrawlerRequestImpl.java

@@ -7,6 +7,7 @@ import com.jzg.commons.entity.quote.vo.aggregated.*;
 import com.jzg.commons.entity.quote.vo.base.LoginBase;
 import com.jzg.commons.entity.quote.vo.image.InsuranceImageVo;
 import com.jzg.commons.exception.SystemException;
+import com.jzg.commons.util.AESUtils;
 import com.jzg.quotation.commons.annotation.QuoteCrawlerService;
 import com.jzg.quotation.commons.constant.InsuranceCode;
 import com.jzg.quotation.commons.entity.DetectLoginRequest;
@@ -30,13 +31,18 @@ import org.redisson.api.RMap;
 import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Service;
 
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.UUID;
 
 /**
  * 人保车险爬虫服务实现 * 
@@ -149,9 +155,36 @@ public class RenBaoNewCrawlerRequestImpl implements RenBaoNewCrawlerRequest {
                                                         LoginInfoBO loginInfo, String username) {
         int modelCodeRetryCount = 0;
         int duplicateInsuranceRetryCount = 0;
+        int hkcs = 0; // 滑块风控重试计数器
         for (int retry = 0; retry < 6; retry++) {
             RenBaoNewCrawlerQuoteResponse response = requestComponent.quote(request, headers);
 
+            // 判断触发滑块风控
+            if (response.getStatus() != null && response.getStatus() == -2) {
+                boolean passSpilderMainRes = false;
+                // 对应Python: validate0 = caculatePremium_res['statusText']; validate1 = '/bizSave/caculatePremium'
+                String validate0 = response.getStatusText();
+                String validate1 = "/bizSave/caculatePremium";
+                log.error("检测到滑块: statusText={}, {}", validate0, JSONUtil.toJsonStr(response));
+                if (hkcs < 2) {
+                    while (hkcs < 2) {
+                        hkcs++;
+                        passSpilderMainRes = passSpilderMain(headers, username, validate0, validate1);
+                        if (passSpilderMainRes) {
+                            break;
+                        }
+                    }
+                    if (passSpilderMainRes) {
+                        log.info("滑块验证通过，重新发起报价");
+                        continue;
+                    } else {
+                        throw new SystemException("触发滑块风控,未通过,请稍后报价");
+                    }
+                } else {
+                    throw new SystemException("触发滑块风控,未通过,请稍后报价");
+                }
+            }
+
             if (isSuccess(response)) {
                 return response;
             }
@@ -463,6 +496,221 @@ public class RenBaoNewCrawlerRequestImpl implements RenBaoNewCrawlerRequest {
         return "未知错误";
     }
 
+    /**
+     * 滑块验证主程序（对应Python的pass_spilder_main方法）
+     *
+     * <p>获取滑块图片、计算滑块位置、提交验证，通过后还需二次验证</p>
+     *
+     * @param headers   请求头
+     * @param username  用户名
+     * @param validate0 来自报价响应的statusText（对应Python: caculatePremium_res['statusText']）
+     * @param validate1 触发滑块的接口路径（对应Python: '/bizSave/caculatePremium'）
+     * @return true-滑块通过，false-未通过
+     */
+    private boolean passSpilderMain(HttpHeaders headers, String username, String validate0, String validate1) {
+        try {
+            // 1. 获取滑块验证信息（对应Python的get_spilder）
+            Map<String, Object> spilderInfo = requestComponent.getSpilder(headers);
+
+            // 检查响应是否有效
+            if (spilderInfo == null || !spilderInfo.containsKey("repData")) {
+                log.error("获取滑块信息失败: {}", JSONUtil.toJsonStr(spilderInfo));
+                return false;
+            }
+
+            @SuppressWarnings("unchecked")
+            Map<String, Object> repData = (Map<String, Object>) spilderInfo.get("repData");
+            if (repData == null) {
+                log.error("滑块信息repData为空");
+                return false;
+            }
+
+            String jigsawImageBase64 = (String) repData.get("jigsawImageBase64");
+            String originalImageBase64 = (String) repData.get("originalImageBase64");
+            String secretKey = (String) repData.get("secretKey");
+            String token = (String) repData.get("token");
+
+            if (jigsawImageBase64 == null || originalImageBase64 == null
+                    || secretKey == null || token == null) {
+                log.error("滑块信息不完整: jigsaw={}, original={}, secretKey={}, token={}",
+                        jigsawImageBase64 != null, originalImageBase64 != null,
+                        secretKey != null, token != null);
+                return false;
+            }
+
+            // 2. 解码图片
+            byte[] targetBytes = Base64.getDecoder().decode(jigsawImageBase64);
+            byte[] backgroundBytes = Base64.getDecoder().decode(originalImageBase64);
+
+            // 3. 获取背景图宽度
+            BufferedImage backgroundImage = ImageIO.read(new ByteArrayInputStream(backgroundBytes));
+            if (backgroundImage == null) {
+                log.error("无法解码背景图");
+                return false;
+            }
+            int width = backgroundImage.getWidth();
+
+            // 4. 计算滑块X位置（对应Python的get_X）
+            int X = getX(targetBytes, backgroundBytes);
+
+            // 5. 计算归一化坐标（对应Python: t = 320 * t / setSize_imgWidth）
+            double t = 320.0 * X / width;
+            String pointJson = "{\"x\":" + t + ",\"y\":5}";
+
+            // 6. AES加密坐标（对应Python的aes_encrypt）
+            String encryptedPointJson = aesEncryptForSpilder(pointJson, secretKey);
+
+            // 7. 提交滑块验证（对应Python的check_spilder）
+            Map<String, Object> checkData = new HashMap<>();
+            checkData.put("captchaType", "blockPuzzle");
+            checkData.put("pointJson", encryptedPointJson);
+            checkData.put("token", token);
+
+            Map<String, Object> checkResult = requestComponent.checkSpilder(checkData, headers);
+
+            // 8. 判断初步验证结果
+            if (checkResult == null || !"0000".equals(checkResult.get("repCode"))) {
+                String repMsg = checkResult != null ? (String) checkResult.get("repMsg") : "滑块验证失败";
+                log.error("滑块初步验证失败: {}", repMsg);
+                return false;
+            }
+
+            log.info("滑块初步验证通过，进行二次验证");
+
+            // 9. 二次验证（Python新增步骤）
+            // 对应Python: rstoken = check_spilder_res['repData']['token']; captchaVerification = aes_encrypt(rstoken + '---' + point_json, secretKey)
+            @SuppressWarnings("unchecked")
+            Map<String, Object> checkRepData = (Map<String, Object>) checkResult.get("repData");
+            if (checkRepData == null) {
+                log.error("滑块初步验证repData为空");
+                return false;
+            }
+            String rsToken = (String) checkRepData.get("token");
+            if (rsToken == null) {
+                log.error("滑块初步验证返回token为空");
+                return false;
+            }
+            String captchaVerification = aesEncryptForSpilder(rsToken + "---" + pointJson, secretKey);
+
+            Map<String, Object> verifyData = new HashMap<>();
+            verifyData.put("captchaVerification", captchaVerification);
+
+            Map<String, Object> verifyResult = requestComponent.verifySpilder(verifyData, validate0, validate1, headers);
+
+            // 10. 判断二次验证结果（对应Python: verify_spilder_res['repCode'] == '0000'）
+            if (verifyResult != null && "0000".equals(verifyResult.get("repCode"))) {
+                log.info("滑块二次验证通过");
+                return true;
+            } else {
+                String repMsg = verifyResult != null ? (String) verifyResult.get("repMsg") : "滑块二次验证失败";
+                log.error("滑块二次验证失败: {}", repMsg);
+                return false;
+            }
+        } catch (Exception e) {
+            log.error("滑块验证异常: {}", e.getMessage(), e);
+            return false;
+        }
+    }
+
+    /**
+     * 计算滑块匹配位置（对应Python的get_X方法，使用模板匹配算法）
+     *
+     * <p>通过比较拼图块与背景图的像素差异，找到拼图块在背景图中的最佳匹配位置</p>
+     *
+     * @param jigsawBytes    拼图块图片字节（带透明通道的滑块图）
+     * @param backgroundBytes 背景图图片字节
+     * @return 滑块X坐标
+     */
+    private int getX(byte[] jigsawBytes, byte[] backgroundBytes) {
+        try {
+            BufferedImage jigsaw = ImageIO.read(new ByteArrayInputStream(jigsawBytes));
+            BufferedImage background = ImageIO.read(new ByteArrayInputStream(backgroundBytes));
+
+            if (jigsaw == null || background == null) {
+                log.warn("无法解码滑块图片，使用默认X=0");
+                return 0;
+            }
+
+            int bgWidth = background.getWidth();
+            int bgHeight = background.getHeight();
+            int jgWidth = jigsaw.getWidth();
+            int jgHeight = jigsaw.getHeight();
+
+            // 搜索范围：只在X方向滑动（滑块验证通常只需要水平匹配）
+            int searchEnd = bgWidth - jgWidth;
+            if (searchEnd <= 0) {
+                return 0;
+            }
+
+            double bestMatch = Double.MAX_VALUE;
+            int bestX = 0;
+
+            // 遍历X方向搜索最佳匹配位置
+            for (int x = 0; x <= searchEnd; x++) {
+                double diff = 0;
+                int count = 0;
+
+                // 比较拼图块非透明像素与背景对应位置的像素差异
+                for (int jx = 0; jx < jgWidth; jx++) {
+                    for (int jy = 0; jy < jgHeight; jy++) {
+                        int jigsawPixel = jigsaw.getRGB(jx, jy);
+                        int jigsawAlpha = (jigsawPixel >> 24) & 0xff;
+
+                        // 只比较非透明的拼图像素
+                        if (jigsawAlpha > 128) {
+                            int bgPixel = background.getRGB(x + jx, jy);
+
+                            int jr = (jigsawPixel >> 16) & 0xff;
+                            int jg = (jigsawPixel >> 8) & 0xff;
+                            int jb = jigsawPixel & 0xff;
+                            int br = (bgPixel >> 16) & 0xff;
+                            int bg = (bgPixel >> 8) & 0xff;
+                            int bb = bgPixel & 0xff;
+
+                            // 使用颜色差异的平方和作为相似度度量
+                            diff += Math.pow(jr - br, 2) + Math.pow(jg - bg, 2) + Math.pow(jb - bb, 2);
+                            count++;
+                        }
+                    }
+                }
+
+                if (count > 0) {
+                    diff /= count;
+                    if (diff < bestMatch) {
+                        bestMatch = diff;
+                        bestX = x;
+                    }
+                }
+            }
+
+            log.info("滑块匹配结果: X={}, diff={}", bestX, bestMatch);
+            return bestX;
+        } catch (Exception e) {
+            log.error("滑块图片匹配异常: {}", e.getMessage(), e);
+            return 0;
+        }
+    }
+
+    /**
+     * AES加密（对应Python的aes_encrypt方法）
+     *
+     * <p>使用AES/ECB/PKCS5Padding模式加密，密钥不足16位时右侧补空格，超出16位截断</p>
+     *
+     * @param plainText 明文
+     * @param key       密钥
+     * @return Base64编码的密文
+     */
+    private String aesEncryptForSpilder(String plainText, String key) {
+        // 确保密钥长度为16字节（对应Python: key.ljust(16)[:16]）
+        String paddedKey;
+        if (key.length() < 16) {
+            paddedKey = String.format("%-16s", key);
+        } else {
+            paddedKey = key.substring(0, 16);
+        }
+        return AESUtils.encryptECBPK5Base64(plainText, paddedKey);
+    }
+
     /**
      * 构建报价结果VO
      *
@@ -543,10 +791,12 @@ public class RenBaoNewCrawlerRequestImpl implements RenBaoNewCrawlerRequest {
                                 costs.setCiPremium(planFee);
                                 totalPremium += fee;
                             } else if ("RM9".equals(payReason)) {
-                                vvTax = fee;
-                                costs.setVvTax(planFee);
+                                vvTax = vvTax +fee;
+                                totalPremium += fee;
+                            } else if ("RM8".equals(payReason)) {
+                                vvTax = vvTax +fee;
                                 totalPremium += fee;
-                            } else if (proposalNo != null && proposalNo.contains("DAA")) {
+                            }else if (proposalNo != null && proposalNo.contains("DAA")) {
                                 biPremium += fee;
                                 totalPremium += fee;
                             } else if (proposalNo != null && proposalNo.contains("DZA")) {

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/classifier/impl/PassengerCarClassifier.java

@@ -22,7 +22,7 @@ public class PassengerCarClassifier implements CarKindClassifier {
     @Override
     public CarKindDetailIdCode getKind(CarInfoVo car) {
         int seats = Integer.parseInt(car.getSeatCount());
-        if (seats <= 6) {
+        if (seats < 6) {
             return CarKindDetailIdCode.K01;
         }
         if (seats <= 10) {

tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/service/TKSimpleService.java

@@ -1,16 +1,19 @@
 package com.jzg.quotation.taikang.crawler.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.jzg.commons.constants.quote.enums.quote.CarKindCode;
 import com.jzg.commons.constants.quote.enums.quote.VehicleUseCode;
 import com.jzg.commons.entity.orders.po.InsOrdersCarUserInfo;
 import com.jzg.commons.entity.quote.vo.*;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.quotation.commons.filter.CarModelsFilterUtils;
+import com.jzg.quotation.commons.utils.TimeProcessing;
 import com.jzg.quotation.taikang.crawler.CodeUtil;
 import com.jzg.quotation.taikang.crawler.model.TKLoginSession;
 import com.jzg.quotation.taikang.crawler.model.api.*;
 import com.jzg.quotation.taikang.crawler.model.entity.*;
 import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -18,8 +21,11 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.function.Function;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+@Slf4j
 @Service
 public class TKSimpleService {
 
@@ -1139,6 +1145,8 @@ public class TKSimpleService {
             nonCarProductList.forEach(nonCarProductListDTO -> {
                 nonCarProductListDTO.setIsSelect("0");
                 nonCarProductListDTO.setPremium("0");
+                nonCarProductListDTO.setStartDate(null);
+                nonCarProductListDTO.setEndDate(null);
             });
         }
 

tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/service/impl/TKQuotationBaseServiceImpl.java

@@ -345,7 +345,7 @@ public class TKQuotationBaseServiceImpl implements TKQuotationBaseService {
                     }
                 });
 
-            } else if ("C02".equals(imageCode)) {
+            } else if ("C02".equals(imageCode) || "D02".equals(imageCode)) {
                 List<InsuranceImageVo.ImageDTO> imageBase64List = s.getImageBase64List();
                 imageBase64List.forEach(c -> {
                     String imageId = c.getImageId();