更新

src/main/java/com/sqx/modules/lovers/service/impl/LoversSetOrderInfoServiceImpl.java

@@ -343,7 +343,7 @@ public class LoversSetOrderInfoServiceImpl extends ServiceImpl<LoversSetOrderInf
 
         // 校验套餐有效时间
         LocalDateTime now = LocalDateTime.now();
-        if (now.isBefore(loversSetVO.getStartTime()) || now.isAfter(loversSetVO.getEndTime())) {
+        if (now.isBefore(LocalDateTime.ofInstant(loversSetVO.getStartTime().toInstant(), ZoneId.systemDefault())) || now.isAfter( LocalDateTime.ofInstant(loversSetVO.getEndTime().toInstant(), ZoneId.systemDefault()))) {
             throw new SqxException("当前时间不在套餐有效时间内");
         }
 

src/main/java/com/sqx/modules/lovers/vo/LoversSetOrderVO.java

@@ -1,7 +1,9 @@
 package com.sqx.modules.lovers.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -50,9 +52,13 @@ public class LoversSetOrderVO {
     private String receiverPhone;
 
     @ApiModelProperty("接货开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date receiveStartDate;
 
     @ApiModelProperty("接货结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date receiveEndDate;
 
     @ApiModelProperty("期待接货时间;HH:mm:ss")
@@ -68,10 +74,14 @@ public class LoversSetOrderVO {
     private String refundStatus;
 
     @ApiModelProperty("创建时间")
-    private LocalDateTime createTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
 
     @ApiModelProperty("更新时间")
-    private LocalDateTime updateTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
 
     @ApiModelProperty("订单详情列表")
     private List<LoversSetOrderDetailVO> orderDetailList;

src/main/java/com/sqx/modules/lovers/vo/LoversSetVO.java

@@ -1,10 +1,13 @@
 package com.sqx.modules.lovers.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -60,16 +63,24 @@ public class LoversSetVO {
     private Integer subOrderGenerateTime;
 
     @ApiModelProperty("套餐开始时间")
-    private LocalDateTime startTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date startTime;
 
     @ApiModelProperty("套餐结束时间")
-    private LocalDateTime endTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date endTime;
 
     @ApiModelProperty("自定义时间段开始时间;type为4自定义时必填")
-    private LocalDateTime selfStartTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date selfStartTime;
 
     @ApiModelProperty("自定义时间段结束时间;type为4自定义时必填")
-    private LocalDateTime selfEndTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date selfEndTime;
 
     @ApiModelProperty("套餐内容列表")
     private List<LoversSetContentVO> contentList;