华泰核保修改

src/main/java/com/ydtech/modules/order/entity/api/huatai/request/HuaTaiQuotedPriceRequest.java

@@ -136,6 +136,11 @@ public class HuaTaiQuotedPriceRequest extends HuaTaiBaseRequest {
                 this.operateDate = df.format(new Date());
             }
 
+            public void setOperate() {
+                SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                this.operateDate = df.format(new Date());
+            }
+
         }
 
         @NoArgsConstructor

src/main/java/com/ydtech/modules/order/entity/api/huatai/request/HuaTaiSubmitRequest.java

@@ -21,7 +21,6 @@ import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -182,30 +181,18 @@ public class HuaTaiSubmitRequest extends HuaTaiBaseRequest {
         private String remark;
 
         public ContractMainDto(RiskInfoVo riskInfoVo, InsAreaCompany insAreaCompany, HuaTaiConfigureParameters huaTaiConfigureParameters) {
-            if ("0507".equals(riskInfoVo.getRiskCode())) {
+            if (InsuranceRisk.TRAFFIC.getCode().equals(riskInfoVo.getRiskCode())) {
                 this.contractNo = insAreaCompany.getJqapplyno();
                 this.totalPremium = insAreaCompany.getJqpremium().doubleValue();
-            } else {
+                this.validDate = insAreaCompany.getJqStartDate();
+                this.expiryDate = insAreaCompany.getJqEndDate();
+            } else if(InsuranceRisk.BUSINESS.getCode().equals(riskInfoVo.getRiskCode())) {
                 this.contractNo = insAreaCompany.getSyapplyno();
                 this.totalPremium = insAreaCompany.getSypremium().doubleValue();
+                this.validDate = insAreaCompany.getSyStartDate();
+                this.expiryDate = insAreaCompany.getSyEndDate();
             }
             this.riskCode = InsuranceTypeCorrespondence.getHuaTaiRisk().get(riskInfoVo.getRiskCode());
-            String startDate = riskInfoVo.getStartDate();
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-            LocalDate localDate = LocalDate.parse(startDate, formatter);
-            LocalDate nextYears = localDate.plusYears(1);
-            if (startDate.contains(TimeConstants.START_TIME)) {
-                LocalDate expiry = nextYears.minusDays(1);
-                this.validDate = riskInfoVo.getStartDate();
-                this.expiryDate = expiry + " " + TimeConstants.END_TIME;
-            } else {
-                // 及时
-                LocalDateTime localDateTime = LocalDateTime.parse(startDate, formatter);
-                LocalDateTime expiryDateTime = localDateTime.plusYears(1);
-                this.validDate = startDate;
-                this.expiryDate = expiryDateTime.format(formatter);
-            }
-
         }
     }
 

src/main/java/com/ydtech/modules/order/service/impl/HuaTaiOrderApiServiceImpl.java

@@ -360,7 +360,6 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         String syFailReason = "";
         List<HuaTaiOrderStatusResponse.PayDetaiDto> payDetaiList = orderStatusResponse.getPayDetaiList();
         for (HuaTaiOrderStatusResponse.PayDetaiDto payDetai : payDetaiList) {
-            insAreaCompany.getJqapplyno();
             //交强保单号存值
             if (StringUtils.isNotEmpty(insAreaCompany.getJqapplyno()) && insAreaCompany.getJqapplyno().equals(payDetai.getBUSINESSNO())) {
                 if ("1".equals(payDetai.getPOLICYSTATUS())) {