Merge branch 'master' into dev_jzg_lipf_v20260518

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

@@ -4,10 +4,10 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.jzg.commons.entity.quote.vo.CarInfoVo;
 import com.jzg.commons.entity.quote.vo.CustomerInfoVo;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
+import com.jzg.commons.entity.vo.InsOrdersOtherInfoVo;
 import com.jzg.quotation.commons.utils.TimeProcessing;
 import com.jzg.quotation.guoren.crawler.entity.dto.PrpTMainDTO;
 import com.jzg.quotation.guoren.crawler.entity.response.GuoRenCrawlerQueryByVinNoData;
-import com.jzg.quotation.guoren.crawler.entity.response.GuoRenCrawlerQueryCarModelData;
 import com.jzg.quotation.guoren.crawler.entity.response.GuoRenCrawlerWriteBackAddressData;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -622,15 +622,17 @@ public class GuoRenCrawlerGetCarPriceRequest {
 
         CarInfoVo carInfoVo = quoteVo.getCarInfoVo();
         CustomerInfoVo ownersInfo = quoteVo.getOwnersInfo();
+        InsOrdersOtherInfoVo otherInfo = quoteVo.getOtherInfo();
+
         this.licenseNo = carInfoVo.getLicenseNo();
         this.vinNo = carInfoVo.getVinNo();
         this.engineNo = carInfoVo.getEngineNo();
         this.carIdentifyType = "01";
         this.rateCode = "20";
         this.loanVehicleFlag = "0";
-        this.chgOwnerFlag = "0";
-        this.ciChgOwnerFlag = "0";
-        this.biChgOwnerFlag = "0";
+        this.chgOwnerFlag =String.valueOf(otherInfo.getTransfer());
+        this.ciChgOwnerFlag = String.valueOf(otherInfo.getTransfer());
+        this.biChgOwnerFlag = String.valueOf(otherInfo.getTransfer());
         this.newDeviceFlag = "0";
         this.chargingpostFlag = "0";
         this.productType = "0101";

tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quotation/hengbang/crawler/service/Impl/HengBangCrawlerRequestImpl.java

@@ -42,17 +42,15 @@ import com.jzg.quotation.hengbang.crawler.properties.HengBangCrawlerProperties;
 import com.jzg.quotation.hengbang.crawler.service.HbCrawlerOrderService;
 import com.jzg.quotation.hengbang.crawler.service.HengBangCrawlerRequest;
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.compress.utils.IOUtils;
 import org.springframework.http.HttpHeaders;
 import org.springframework.util.StringUtils;
 
-
-import java.io.IOException;
-import java.io.InputStream;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -183,7 +181,7 @@ public class HengBangCrawlerRequestImpl implements HengBangCrawlerRequest {
             status = JSONObject.parseObject(resJson).getString("status");
         }
 
-        if (errorMsg.equals("成功") || status.equals("9")) {
+        if (errorMsg.equals("成功")) {
             errorMsg = "成功";
             // 5.2 报价第三步，获取报价数据
             proposalResponse = hbCrawlerRequestComponent.proposal(plyappno, headers);

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/entity/request/YangGuangSubmitRequest.java

@@ -8,6 +8,7 @@ import com.jzg.commons.entity.orders.po.InsOrdersCarInfo;
 import com.jzg.commons.entity.orders.po.InsOrdersCarUserInfo;
 import com.jzg.commons.entity.orders.po.InsOrdersCosts;
 import com.jzg.commons.entity.quote.vo.aggregated.UnderwritingVo;
+import com.jzg.commons.util.StringUtils;
 import com.jzg.quotation.yangguang.api.entity.YangGuangConfigureParameters;
 import com.jzg.quotation.yangguang.api.entity.po.YangGuangApiOrder;
 import lombok.Data;

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/service/impl/YangGuangApiOrderServiceImpl.java

@@ -29,7 +29,7 @@ public class YangGuangApiOrderServiceImpl implements YangGuangApiOrderService {
         yangGuangApiOrder.setOrdersNo(quoteVo.getOrder().getOrdersNo());
         yangGuangApiOrder.setProductsCode(quoteVo.getProductId());
         List<YangGuangAccuracyCalculateResponse.PtptNonVehicleProductInformationList> list = yangGuangAccuracyCalculateResponse.getPtptNonVehicleProductInformationList();
-        yangGuangApiOrder.setCrossInsurance(list.toString());
+        yangGuangApiOrder.setCrossInsurance(JSON.toJSONString(list));
         yangGuangApiOrder.setInfotransNo(yangGuangAccuracyCalculateResponse.getInfotransNo());
         yangGuangApiOrderRepository.save(yangGuangApiOrder);
     }