紫金驾意险

src/main/java/com/ydtech/modules/order/entity/api/zj/response/QueryOrderDetailResponse.java

@@ -9,6 +9,7 @@ import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -19,7 +20,6 @@ public class QueryOrderDetailResponse extends BaseResponse implements Serializab
 
     private static final long serialVersionUID = -1276766584417540458L;
 
-
     @JsonProperty("resultObj")
     private ResultObjDTO resultObj;
 
@@ -41,11 +41,12 @@ public class QueryOrderDetailResponse extends BaseResponse implements Serializab
     @JsonProperty("terminalId")
     private String terminalId;
 
-    @JsonProperty("orderPolicyList")
-    private List<OrderPolicyListDTO> orderPolicyList;
-
     public List<DrivingInsuranceDto> getDrivingInsuranceDto() {
-        return orderPolicyList.stream()
+        if (resultObj.getOrderPolicyList() == null) {
+            return Collections.emptyList();
+        }
+
+        return resultObj.getOrderPolicyList().stream()
                 // 过滤商业险和交强险
                 .filter(x -> !Arrays.asList(RiskCodeEnum.getRiskCode()).contains(x.getTypeCode()))
                 .map(QueryOrderDetailResponse.OrderPolicyListDTO::toDrivingInsuranceDto)
@@ -76,6 +77,9 @@ public class QueryOrderDetailResponse extends BaseResponse implements Serializab
         @JsonProperty("orderStatus")
         private String orderStatus;
 
+        @JsonProperty("orderPolicyList")
+        private List<OrderPolicyListDTO> orderPolicyList;
+
     }
 
     @NoArgsConstructor

src/main/java/com/ydtech/modules/order/utils/InsuranceTimeProcessing.java

@@ -3,6 +3,7 @@ package com.ydtech.modules.order.utils;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import org.redisson.api.RedissonClient;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;