调整时间类型转换

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/io/request/coupon/CouponInfoVO.java

@@ -1,7 +1,9 @@
 package com.yonge.cooleshow.admin.io.request.coupon;
 
 import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
+import com.yonge.cooleshow.biz.dal.enums.MK;
 import com.yonge.cooleshow.biz.dal.enums.coupon.CouponCategoryEnum;
 import com.yonge.cooleshow.biz.dal.enums.coupon.CouponTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.coupon.CouponValidTypeEnum;
@@ -112,9 +114,11 @@ public class CouponInfoVO {
         private Long updateTime;
 
         @ApiModelProperty("最后更新时间")
+        @JsonFormat(pattern = MK.TIME_PATTERN, timezone = MK.TIME_ZONE)
         private Date updatedTime;
 
         @ApiModelProperty("创建时间")
+        @JsonFormat(pattern = MK.TIME_PATTERN, timezone = MK.TIME_ZONE)
         private Date createdTime;
 
         public Date getUpdatedTime() {
@@ -189,6 +193,7 @@ public class CouponInfoVO {
         private Long createdBy;
 
         @ApiModelProperty("创建时间")
+        @JsonFormat(pattern = MK.TIME_PATTERN, timezone = MK.TIME_ZONE)
         private Date createdTime;
 
         public static CouponQueryInfo from(String recv) {

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/io/request/coupon/CouponInventoryVO.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.admin.io.request.coupon;
 
 import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.enums.MK;
 import com.yonge.cooleshow.biz.dal.enums.coupon.CouponInventoryEnum;
 import com.yonge.cooleshow.common.enums.EStatus;
@@ -12,8 +13,8 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
-import org.joda.time.format.DateTimeFormat;
+import org.joda.time.DateTime;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -46,10 +47,14 @@ public class CouponInventoryVO {
         private CouponInventoryEnum dataType;
 
         @ApiModelProperty("开始时间, yyyy-MM-dd HH:mm:ss")
-        private String startQueryTime;
+        @DateTimeFormat(pattern = MK.TIME_PATTERN)
+        @JsonFormat(pattern = MK.TIME_PATTERN, timezone = MK.TIME_ZONE)
+        private Date startQueryTime;
 
         @ApiModelProperty("结束时间, yyyy-MM-dd HH:mm:ss")
-        private String endQueryTime;
+        @DateTimeFormat(pattern = MK.TIME_PATTERN)
+        @JsonFormat(pattern = MK.TIME_PATTERN, timezone = MK.TIME_ZONE)
+        private Date endQueryTime;
 
         @ApiModelProperty(value = "结束时间", hidden = true)
         private Long startTime;
@@ -76,15 +81,15 @@ public class CouponInventoryVO {
         }
 
         public Long getStartTime() {
-            if (StringUtils.isNotEmpty(getStartQueryTime())) {
-                return DateTimeFormat.forPattern(MK.TIME_FORMAT).parseDateTime(getStartQueryTime()).getMillis() / 1000;
+            if (Objects.nonNull(getStartQueryTime())) {
+                return new DateTime(getStartQueryTime()).getMillis() / 1000;
             }
             return startTime;
         }
 
         public Long getEndTime() {
-            if (StringUtils.isNotEmpty(getEndQueryTime())) {
-                return DateTimeFormat.forPattern(MK.TIME_FORMAT).parseDateTime(getEndQueryTime()).getMillis() / 1000;
+            if (Objects.nonNull(getEndQueryTime())) {
+                return new DateTime(getEndQueryTime()).getMillis() / 1000;
             }
             return endTime;
         }
@@ -120,6 +125,7 @@ public class CouponInventoryVO {
         private String remark;
 
         @ApiModelProperty("创建时间")
+        @JsonFormat(pattern = MK.TIME_PATTERN, timezone = MK.TIME_ZONE)
         private Date createdTime;
 
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/MK.java

@@ -11,5 +11,7 @@ public interface MK {
     // 正型
     String EXP_INT = "^\\d+$";
     // 时间格式
-    String TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
+    String TIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
+    // 时区设置
+    String TIME_ZONE = "GMT+8";
 }