1.中煤核保，报价字段修改

src/main/java/com/ydtech/modules/order/entity/api/zm/request/QuotedPriceRequest.java

@@ -2,13 +2,14 @@ package com.ydtech.modules.order.entity.api.zm.request;
 
 import cn.hutool.core.util.ArrayUtil;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ydtech.constants.enums.InsuranceRisk;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
 import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
 import com.ydtech.modules.ins.model.vo.KindInfoVo;
 import com.ydtech.modules.ins.model.vo.RiskInfoVo;
+import com.ydtech.modules.order.constants.InsuranceTypeCorrespondence;
 import com.ydtech.modules.order.entity.api.zm.BaseRequest;
 import com.ydtech.modules.order.entity.api.zm.BaseRequestHead;
-import com.ydtech.modules.order.entity.api.zm.constants.InsuranceTypeCorrespondence;
 import com.ydtech.modules.order.entity.api.zm.constants.TimeConstants;
 import com.ydtech.modules.order.entity.api.zm.constants.TransCode;
 import com.ydtech.modules.order.entity.api.zm.constants.enums.ContractEnum;
@@ -25,7 +26,6 @@ import lombok.NoArgsConstructor;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -106,7 +106,6 @@ public class QuotedPriceRequest extends BaseRequest {
         }
 
 
-
         @AllArgsConstructor
         @NoArgsConstructor
         @Data
@@ -267,11 +266,11 @@ public class QuotedPriceRequest extends BaseRequest {
             for (RiskInfoVo riskInfoVo : riskInfoVos) {
                 ContractDTO contractDTO = new ContractDTO();
                 contractDTO.contractMain = new ContractMainDTO(riskInfoVo);
-                if (InsuranceTypeCorrespondence.TRAFFIC.equals(riskInfoVo.getRiskCode())) {
+                if (InsuranceRisk.TRAFFIC.getCode().equals(riskInfoVo.getRiskCode())) {
                     contractDTO.coverage = Collections.singletonList(new CoverageDTO().fetchTraffic());
                 }
 
-                if (InsuranceTypeCorrespondence.BUSINESS.equals(riskInfoVo.getRiskCode())) {
+                if (InsuranceRisk.BUSINESS.getCode().equals(riskInfoVo.getRiskCode())) {
                     contractDTO.coverage = new CoverageDTO().getBusiness(kindInfoVos, quantity);
                 }
                 contractDTOS.add(contractDTO);
@@ -304,16 +303,16 @@ public class QuotedPriceRequest extends BaseRequest {
                 String startDate = riskInfoVo.getStartDate();
                 DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
                 LocalDate localDate = LocalDate.parse(startDate, formatter);
-                LocalDate nextYears = localDate.plus(1, ChronoUnit.YEARS);
+                LocalDate nextYears = localDate.plusYears(1);
                 if (startDate.contains(TimeConstants.START_TIME)) {
-                    LocalDate expiry = nextYears.minus(1, ChronoUnit.DAYS);
+                    LocalDate expiry = nextYears.minusDays(1);
                     this.validDate = riskInfoVo.getStartDate();
                     this.expiryDate = expiry + " " + TimeConstants.END_TIME;
                     this.reinsuranceFlag = "0";
                 } else {
                     // 及时
                     LocalDateTime localDateTime = LocalDateTime.parse(startDate, formatter);
-                    LocalDateTime expiryDateTime = localDateTime.plus(1, ChronoUnit.YEARS);
+                    LocalDateTime expiryDateTime = localDateTime.plusYears(1);
                     this.validDate = startDate;
                     this.expiryDate = expiryDateTime.format(formatter);
                     this.reinsuranceFlag = "1";
@@ -360,7 +359,7 @@ public class QuotedPriceRequest extends BaseRequest {
                     CoverageDTO coverageDTO = new CoverageDTO();
                     String code = kindInfoVo.getKindCode();
                     int i = ArrayUtil.indexOf(InsuranceTypeCorrespondence.getJinZhangGuiType(), code);
-                    String s = InsuranceTypeCorrespondence.getConnectInsuranceType()[i];
+                    String s = InsuranceTypeCorrespondence.getZmConnectInsuranceType()[i];
                     ContractEnum contractEnum = Enum.valueOf(ContractEnum.class, "C_" + s);
                     coverageDTO.kindName = contractEnum.getKindName();
                     coverageDTO.kindCode = contractEnum.getKindCode();
@@ -371,7 +370,7 @@ public class QuotedPriceRequest extends BaseRequest {
                         coverageDTO.quantity = 1;
                         coverageDTO.unitAmount = (int) kindInfoVo.getAmount();
                     }
-
+                    // 乘客
                     if (ArrayUtil.indexOf(InsuranceTypeCorrespondence.getPassenger(), code) >= 0) {
                         coverageDTO.quantity = quantity;
                         coverageDTO.amount = (int) kindInfoVo.getUnitAmount() * quantity;
@@ -470,10 +469,7 @@ public class QuotedPriceRequest extends BaseRequest {
         }
 
         public List<CustomerDTO> getCustomers(CustomerInfoVo ownerInfo, CustomerInfoVo policyHolderInfo, CustomerInfoVo insuredPersonInfo) {
-            return Arrays.asList(
-                    new CustomerDTO(ownerInfo, "3"),
-                    new CustomerDTO(policyHolderInfo, "1"),
-                    new CustomerDTO(insuredPersonInfo, "2"));
+            return Arrays.asList(new CustomerDTO(ownerInfo, "3"), new CustomerDTO(policyHolderInfo, "1"), new CustomerDTO(insuredPersonInfo, "2"));
 
         }
     }

src/main/java/com/ydtech/modules/order/entity/api/zm/request/SubmitRequest.java

@@ -6,6 +6,7 @@ import com.ydtech.modules.order.entity.api.zm.BaseRequestHead;
 import com.ydtech.modules.order.entity.api.zm.constants.TransCode;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 /**
@@ -14,13 +15,14 @@ import lombok.NoArgsConstructor;
  * @description 核保请求参数
  * @date 2023/4/24 10:40
  */
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @Data
 public class SubmitRequest extends BaseRequest {
 
     private static final long serialVersionUID = 180600971227499971L;
 
-    @JsonProperty("OrderNo")
+    @JsonProperty("businessNo")
     private String orderNo;
     @JsonProperty("VIN")
     private String vin;