Merge remote-tracking branch 'origin/master' into dev_jzg_lipf_v20260622

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/api/entity/Request/CarPriceRequest.java

@@ -4,12 +4,12 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.jzg.commons.constants.quote.enums.quote.EnergyTypeCode;
 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.quote.vo.RiskInfoVo;
 import com.jzg.commons.util.StringUtils;
-import com.jzg.commons.constants.quote.enums.quote.EnergyTypeCode;
-import com.jzg.commons.entity.quote.vo.QuoteVo;
 import com.jzg.quotation.guoren.api.constant.enums.CarKindCode;
 import com.jzg.quotation.guoren.api.constant.enums.CategoriesOfVehicles;
 import com.jzg.quotation.guoren.api.constant.enums.ClauseTypeSystem;
@@ -154,6 +154,11 @@ public class CarPriceRequest {
         prpTitemCar.setVinClick("0");
 
         String cimodelclass = carInfo.getCarKindCode();
+
+        prpTitemCar.setCarKindCode(cimodelclass);
+        if ("H0".equals(cimodelclass)) {
+            cimodelclass = "A1";
+        }
         CategoriesOfVehicles categoriesOfVehicles = CategoriesOfVehicles.valueOf( CategoriesOfVehicles.TITLE + cimodelclass);
         if(categoriesOfVehicles.getCode().equals(CategoriesOfVehicles.COV_A1.getCode())){
             TrafficManagementVehicleType trafficManagementVehicleType = TrafficManagementVehicleType.valueOf(carInfo.getCarTypeCode());
@@ -164,7 +169,6 @@ public class CarPriceRequest {
                 prpTitemCar.setCarKindCode(CarKindCode.H3.getCode());
             }
         }
-        prpTitemCar.setCarKindCode(cimodelclass);
 
         prpTitemCar.setMaincarKindCode(categoriesOfVehicles.getCode());
 

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/api/entity/Request/NonAutoInsOrderRequest.java

@@ -1,16 +1,15 @@
 package com.jzg.quotation.guoren.api.entity.Request;
 
 import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.alibaba.fastjson2.JSON;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.jzg.commons.constants.dict.CarKindCode;
 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.quote.vo.RiskInfoVo;
 import com.jzg.commons.util.StringUtils;
-import com.jzg.commons.entity.quote.vo.QuoteVo;
 import com.jzg.quotation.guoren.api.constant.enums.TypeVehicleMapping;
 import com.jzg.quotation.guoren.api.entity.GuoRenConfigureParameters;
 import com.jzg.quotation.guoren.api.entity.Response.VinQueryResponse;
@@ -431,6 +430,7 @@ public class NonAutoInsOrderRequest {
                         this.carType = "8D";
                     }
                     this.carTypeCode = getCarTypeCodeByCarInfo(carInfo);
+                    this.carCategory = "H";
                     //设置车辆大类，请求时已转换，暂时先注释
                     if(CarKindCode.A0.getCode().equals(carInfo.getCarKindCode())){
                         this.carCategory = "A";

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

@@ -16,6 +16,8 @@ import com.jzg.commons.entity.quote.vo.AccidentalDrivingVo;
 import com.jzg.commons.entity.quote.vo.CarInfoVo;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
 import com.jzg.commons.entity.quote.vo.aggregated.*;
+import com.jzg.commons.entity.quote.vo.base.OrderBase;
+import com.jzg.commons.entity.quote.vo.image.InsuranceImageVo;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.AssertionUtils;
 import com.jzg.commons.util.MinioUtils;
@@ -24,13 +26,10 @@ import com.jzg.quotation.commons.annotation.QuoteApiService;
 import com.jzg.quotation.commons.client.PlatformClient;
 import com.jzg.quotation.commons.component.InsImagesUploadCacheComponent;
 import com.jzg.quotation.commons.constant.InsuranceCode;
-import com.jzg.commons.entity.quote.vo.base.OrderBase;
-import com.jzg.commons.entity.quote.vo.image.InsuranceImageVo;
 import com.jzg.quotation.commons.entity.DetectLoginRequest;
 import com.jzg.quotation.commons.standard.conversion.ConfigureParametersConversion;
 import com.jzg.quotation.commons.utils.DateTimeUtil;
 import com.jzg.quotation.commons.utils.HttpUtil;
-import com.jzg.quotation.commons.utils.TimeProcessing;
 import com.jzg.quotation.guoren.api.build.GuoRenApiQuoteResultsVoBuild;
 import com.jzg.quotation.guoren.api.component.GuoRenRequestApiComponent;
 import com.jzg.quotation.guoren.api.component.GuorenDuplicateInsuranceComponent;
@@ -52,7 +51,6 @@ import org.apache.commons.httpclient.methods.multipart.Part;
 import org.apache.commons.httpclient.methods.multipart.StringPart;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.util.ObjectUtils;
 
 import java.io.File;
@@ -450,6 +448,10 @@ public class GuoRenApiRequestImpl implements GuoRenApiRequest {
             //多条
             CarPriceMuchResponse respMuch = request.toJavaObject(CarPriceMuchResponse.class);
 
+            if (respMuch.getResultCode() == 1) {
+                throw new SystemException(respMuch.getResultMsg() == null ? "未获取到车价信息，请联系管理员" : respMuch.getResultMsg());
+            }
+
             //单条
             if (CollUtil.isEmpty(respMuch.getData().getCars())) {
                 CarPriceResponse resp = request.toJavaObject(CarPriceResponse.class);
@@ -705,7 +707,7 @@ public class GuoRenApiRequestImpl implements GuoRenApiRequest {
                     fileName = uploadFile.getFileName();
 
                     // 获取文件流
-                    String imgUrl = minioUtils.getPresignedObjectUrl(uploadFile.getBucketName(), fileName);
+                    String imgUrl = MinioUtils.getPresignedObjectUrl(uploadFile.getBucketName(), fileName);
                     logger.info("国任影像上传，获取文件预签名URL，imgUrl：{}", imgUrl);
                     InputStream inputStream = minioUtils.getObject(uploadFile.getBucketName(), fileName);
                     if (inputStream == null) {

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

@@ -183,7 +183,7 @@ public class YongChengApiRequestImpl implements YongChengApiRequest {
         QuoteResponse quoteResponse = this.getResponse(quoteRequest,quoteVo, requestInfoList,url);
 
         QuoteResultsVo quoteResultsVo = buildQuoteRespVo(order.getOrdersNo(), quoteResponse, quoteVo);
-        quoteResultsVo.setCarActualValue(depreciationPrice);
+        quoteResultsVo.setCarActualValue(negotiatedPrice);
         return quoteResultsVo;
     }
 
@@ -420,9 +420,9 @@ public class YongChengApiRequestImpl implements YongChengApiRequest {
             if (response.getResult().equals("0")) {
                 //判断人工处理和核保退回
                 if(orderStatusVo.getInsOrders().getOrderStatus().equals(InsOrderStatusEnum.STAFF_PROCESS.getCode().toString())){
-                    if(response.getJqstatus().equals("9")){
+                    if(response.getJqstatus().equals("9") || response.getSystatus().equals("9")){
                         orderStatusResultVo.setOrderStatus(InsOrderStatusEnum.PAY_PENDING);
-                    }else if(response.getJqstatus().equals("0")){
+                    }else if(response.getJqstatus().equals("0") || response.getSystatus().equals("0")){
                         orderStatusResultVo.setOrderStatus(InsOrderStatusEnum.STAFF_PROCESS);
                     }else if(response.getJqstatus().equals(3)){
                         orderStatusResultVo.setOrderStatus(InsOrderStatusEnum.AUDIT_FAIL);
@@ -449,7 +449,7 @@ public class YongChengApiRequestImpl implements YongChengApiRequest {
             } else {
                 //失败原因
                 orderStatusResultVo.setOrderStatus(InsOrderStatusEnum.AUDIT_FAIL);
-                orderStatusResultVo.setErrorMsg(response.getMessage());
+                orderStatusResultVo.setErrorMsg(response.getMessage() + response.getJqmessage() + response.getSymessage());
             }
 //            return HttpResult.ok("操作成功，状态已更新。");
         } catch (JsonProcessingException jsonProcessingException) {

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAgreementCostServiceImpl.java

@@ -411,6 +411,8 @@ public class PtlAgreementCostServiceImpl extends ServiceImpl<PtlAgreementCostMap
             ptlAgreementCost.setCreateTime(LocalDateTime.now());
             ptlAgreementCost.setProductId(costCopyParam.getProductId());
             ptlAgreementCost.setProductName(costCopyParam.getProductName());
+            // 复制的费用为待审核
+            ptlAgreementCost.setApproved(0);
 
 
             List<PtlAgreementCostType> newPtlAgreementCostTypes = ptlAgreementCostTypes.stream()