更新

src/main/java/com/sqx/modules/lovers/dto/LoversSetAddDTO.java

@@ -1,7 +1,9 @@
 package com.sqx.modules.lovers.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
@@ -10,6 +12,7 @@ import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -77,17 +80,25 @@ public class LoversSetAddDTO {
 
     @ApiModelProperty("套餐开始时间")
     @NotNull(message = "套餐开始时间不能为空")
-    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("套餐结束时间")
     @NotNull(message = "套餐结束时间不能为空")
-    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("套餐详情列表")
     @NotNull(message = "套餐详情列表不能为空")

src/main/java/com/sqx/modules/lovers/dto/LoversSetMenstrualPeriodSettingDTO.java

@@ -1,7 +1,9 @@
 package com.sqx.modules.lovers.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -23,20 +25,32 @@ public class LoversSetMenstrualPeriodSettingDTO implements Serializable {
     private Integer intervalDays;
 
     @ApiModelProperty("上一次月经开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date lastStartDate;
 
     @ApiModelProperty("上一次月经结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date lastEndDate;
 
     @ApiModelProperty("预计下一次月经开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date nextStartDateOfExpect;
 
     @ApiModelProperty("预计下一次月经结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date nextEndDateOfExpect;
 
     @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;
 }

src/main/java/com/sqx/modules/lovers/dto/LoversSetOrderDeliveryInfoModifyDTO.java

@@ -1,10 +1,13 @@
 package com.sqx.modules.lovers.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 情侣套餐配送信息修改DTO
@@ -20,5 +23,7 @@ public class LoversSetOrderDeliveryInfoModifyDTO {
 
     @ApiModelProperty("预计配送时间")
     @NotNull(message = "预计配送时间不能为空")
-    private LocalDateTime deliveryTimeOfExpect;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date deliveryTimeOfExpect;
 }

src/main/java/com/sqx/modules/lovers/dto/LoversSetOrderSubmitDTO.java

@@ -1,7 +1,9 @@
 package com.sqx.modules.lovers.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
@@ -42,18 +44,26 @@ public class LoversSetOrderSubmitDTO {
 
     @ApiModelProperty("上一次月经开始时间")
     @NotNull(message = "上一次月经开始时间不能为空")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date lastStartDate;
 
     @ApiModelProperty("上一次月经结束时间")
     @NotNull(message = "上一次月经结束时间不能为空")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date lastEndDate;
 
     @ApiModelProperty("预计下一次月经开始时间")
     @NotNull(message = "预计下一次月经开始时间不能为空")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date nextStartDateOfExpect;
 
     @ApiModelProperty("预计下一次月经结束时间")
     @NotNull(message = "预计下一次月经结束时间不能为空")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date nextEndDateOfExpect;
 
     @ApiModelProperty("收货人姓名")
@@ -66,10 +76,14 @@ public class LoversSetOrderSubmitDTO {
 
     @ApiModelProperty("接货开始时间")
     @NotBlank(message = "接货开始时间不能为空")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date receiveStartDate;
 
     @ApiModelProperty("接货结束时间")
     @NotBlank(message = "接货结束时间不能为空")
+    @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")

src/main/java/com/sqx/modules/lovers/entity/LoversSet.java

@@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -65,14 +67,22 @@ public class LoversSet implements Serializable {
     private Integer subOrderGenerateTime;
 
     @ApiModelProperty("套餐开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date startTime;
 
     @ApiModelProperty("套餐结束时间")
+    @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自定义时必填")
+    @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自定义时必填")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date selfEndTime;
 }

src/main/java/com/sqx/modules/lovers/entity/LoversSetMenstrualPeriodSetting.java

@@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -37,20 +39,32 @@ public class LoversSetMenstrualPeriodSetting implements Serializable {
     private Integer intervalDays;
 
     @ApiModelProperty("上一次月经开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date lastStartDate;
 
     @ApiModelProperty("上一次月经结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date lastEndDate;
 
     @ApiModelProperty("预计下一次月经开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date nextStartDateOfExpect;
 
     @ApiModelProperty("预计下一次月经结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date nextEndDateOfExpect;
 
     @ApiModelProperty("创建时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     @ApiModelProperty("更新时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 }

src/main/java/com/sqx/modules/lovers/entity/LoversSetOrderDeliveryInfo.java

@@ -3,11 +3,14 @@ package com.sqx.modules.lovers.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 @TableName("lovers_set_order_delivery_info")
@@ -25,7 +28,9 @@ public class LoversSetOrderDeliveryInfo implements Serializable {
     private String deliveryContent;
 
     @ApiModelProperty("预计配送时间")
-    private LocalDateTime deliveryTimeOfExpect;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date deliveryTimeOfExpect;
 
     @ApiModelProperty("配送单id（跑腿订单id）")
     private Long deliveryOrderId;

src/main/java/com/sqx/modules/lovers/entity/LoversSetOrderInfo.java

@@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -59,9 +61,13 @@ public class LoversSetOrderInfo implements Serializable {
     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")
@@ -77,8 +83,12 @@ public class LoversSetOrderInfo implements Serializable {
     private String refundStatus;
 
     @ApiModelProperty("创建时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     @ApiModelProperty("更新时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 }

src/main/java/com/sqx/modules/lovers/entity/LoversSetRule.java

@@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -40,8 +42,12 @@ public class LoversSetRule implements Serializable {
     private Integer status;
 
     @ApiModelProperty("创建时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     @ApiModelProperty("更新时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 }

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

@@ -217,7 +217,7 @@ public class LoversSetOrderInfoServiceImpl extends ServiceImpl<LoversSetOrderInf
             throw new SqxException("配送单状态异常（当前状态：" + deliveryInfo.getDeliveryStatus() + ")，id：" + deliveryInfoId);
         }
 
-        if (ChronoUnit.DAYS.between(deliveryInfo.getDeliveryTimeOfExpect(), modifyDTO.getDeliveryTimeOfExpect()) != 0) {
+        if (ChronoUnit.DAYS.between( LocalDateTime.ofInstant(deliveryInfo.getDeliveryTimeOfExpect().toInstant(), ZoneId.systemDefault()), LocalDateTime.ofInstant(modifyDTO.getDeliveryTimeOfExpect().toInstant(), ZoneId.systemDefault())) != 0) {
             throw new SqxException("只能修改为同一天的配送时间，id：" + deliveryInfoId);
         }
 
@@ -263,7 +263,7 @@ public class LoversSetOrderInfoServiceImpl extends ServiceImpl<LoversSetOrderInf
                                     {
                                         setLoversSetOrderId(orderInfo.getId());
                                         setDeliveryContent(content);
-                                        setDeliveryTimeOfExpect(expectReceiveTime);
+                                        setDeliveryTimeOfExpect(Date.from(expectReceiveTime.atZone(ZoneId.systemDefault()).toInstant()));
                                         // 1等待生成配送单
                                         setDeliveryStatus("1");
                                     }
@@ -320,8 +320,8 @@ public class LoversSetOrderInfoServiceImpl extends ServiceImpl<LoversSetOrderInf
         LoversSetMenstrualPeriodSettingDTO dto = new LoversSetMenstrualPeriodSettingDTO();
         BeanUtil.copyProperties(submitDTO, dto);
         dto.setUserId(userId);
-        dto.setCreateTime(LocalDateTime.now());
-        dto.setUpdateTime(LocalDateTime.now());
+        dto.setCreateTime(new Date());
+        dto.setUpdateTime(new Date());
         return dto;
     }
 

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

@@ -45,14 +45,14 @@ public class AppLoversSetShortVO {
     private String suitSex;
 
     @ApiModelProperty("套餐开始时间")
-    private LocalDateTime startTime;
+    private String startTime;
 
     @ApiModelProperty("套餐结束时间")
-    private LocalDateTime endTime;
+    private String endTime;
 
     @ApiModelProperty("自定义时间段开始时间;type为4自定义时必填")
-    private LocalDateTime selfStartTime;
+    private String selfStartTime;
 
     @ApiModelProperty("自定义时间段结束时间;type为4自定义时必填")
-    private LocalDateTime selfEndTime;
+    private String selfEndTime;
 }

src/main/resources/application.yml

@@ -79,8 +79,8 @@ mybatis-plus:
     cache-enabled: false
     call-setters-on-nulls: true
     jdbc-type-for-null: 'null'
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
 sqx:
   redis:
     open: true

src/main/resources/mapper/lovers/LoversSetDao.xml

@@ -74,8 +74,8 @@
             scd.shop_id,
             scd.shop_name,
             scd.num,
-            scd.detail_price,
-            scd.detail_original_price
+            scd.price,
+            scd.original_price
         FROM
             lovers_set s
             left join lovers_set_rule r on r.id = s.rule_id
@@ -161,8 +161,8 @@
         scd.shop_id,
         scd.shop_name,
         scd.num,
-        scd.detail_price,
-        scd.detail_original_price
+        scd.price,
+        scd.original_price
         FROM
         lovers_set s
         left join lovers_set_rule r on r.id = s.rule_id