From a4eb134d03bf737149f45648bd71565bf791f6c4 Mon Sep 17 00:00:00 2001 From: hupeng Date: Fri, 10 Jul 2020 16:22:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E5=8C=96?= =?UTF-8?q?=E5=8A=A0=E4=B8=8Atimezone=3DGMT+8,=E4=BF=AE=E5=A4=8D=E9=A6=96?= =?UTF-8?q?=E9=A1=B5redis=E7=BC=93=E5=AD=98=E5=AF=BC=E8=87=B4=E9=94=80?= =?UTF-8?q?=E9=87=8F=E4=B8=8D=E4=B8=80=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yshop-common/src/main/java/co/yixiang/api/ApiResult.java | 2 +- yshop-common/src/main/java/co/yixiang/domain/BaseDomain.java | 4 ++-- .../modules/activity/service/dto/YxStoreCombinationDto.java | 2 +- .../modules/activity/service/dto/YxStoreCouponDto.java | 2 +- .../modules/activity/service/dto/YxStoreCouponIssueDto.java | 2 +- .../co/yixiang/modules/activity/vo/StoreCouponUserVo.java | 2 +- .../modules/activity/vo/YxStoreCouponIssueQueryVo.java | 4 ++-- .../yixiang/modules/activity/vo/YxStoreCouponUserQueryVo.java | 4 ++-- .../modules/order/service/impl/YxStoreOrderServiceImpl.java | 1 + .../java/co/yixiang/modules/order/vo/YxStoreOrderQueryVo.java | 2 +- .../modules/product/vo/YxStoreProductReplyQueryVo.java | 2 +- .../co/yixiang/modules/user/service/dto/YxUserBillDto.java | 2 +- .../java/co/yixiang/modules/user/service/dto/YxUserDto.java | 2 +- .../java/co/yixiang/modules/user/vo/YxUserBillQueryVo.java | 2 +- .../co/yixiang/modules/wechat/service/dto/YxArticleDto.java | 2 +- 15 files changed, 18 insertions(+), 17 deletions(-) diff --git a/yshop-common/src/main/java/co/yixiang/api/ApiResult.java b/yshop-common/src/main/java/co/yixiang/api/ApiResult.java index f9b960f8..16b53a19 100644 --- a/yshop-common/src/main/java/co/yixiang/api/ApiResult.java +++ b/yshop-common/src/main/java/co/yixiang/api/ApiResult.java @@ -59,7 +59,7 @@ public class ApiResult implements Serializable { * 响应时间 */ @JSONField(format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date time; public ApiResult() { diff --git a/yshop-common/src/main/java/co/yixiang/domain/BaseDomain.java b/yshop-common/src/main/java/co/yixiang/domain/BaseDomain.java index efd1ff2e..13e8fa50 100644 --- a/yshop-common/src/main/java/co/yixiang/domain/BaseDomain.java +++ b/yshop-common/src/main/java/co/yixiang/domain/BaseDomain.java @@ -23,11 +23,11 @@ public class BaseDomain implements Serializable { @TableField(fill= FieldFill.INSERT) - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date createTime; @TableField(fill= FieldFill.UPDATE) - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date updateTime; @TableLogic diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java index 9e6b415d..c281c3b1 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java @@ -67,7 +67,7 @@ public class YxStoreCombinationDto implements Serializable { private Integer stock; // 添加时间 - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date createTime; // 推荐 diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponDto.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponDto.java index 3bcf2e45..bbcb9adf 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponDto.java @@ -52,7 +52,7 @@ public class YxStoreCouponDto implements Serializable { private List product; // 兑换项目添加时间 - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date createTime; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueDto.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueDto.java index e6447022..b086153a 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueDto.java @@ -48,7 +48,7 @@ public class YxStoreCouponIssueDto implements Serializable { /** 优惠券添加时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date createTime; } diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/StoreCouponUserVo.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/StoreCouponUserVo.java index 4a7a3eb8..57df9ecb 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/StoreCouponUserVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/StoreCouponUserVo.java @@ -32,7 +32,7 @@ public class StoreCouponUserVo implements Serializable private Double useMinPrice; /** 优惠券结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") private Date endTime; private Integer type; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/YxStoreCouponIssueQueryVo.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/YxStoreCouponIssueQueryVo.java index d22725ef..edc3b6f3 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/YxStoreCouponIssueQueryVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/YxStoreCouponIssueQueryVo.java @@ -31,11 +31,11 @@ public class YxStoreCouponIssueQueryVo implements Serializable { private Integer ctype; @ApiModelProperty(value = "优惠券领取开启时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") private Date startTime; @ApiModelProperty(value = "优惠券领取结束时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") private Date endTime; @ApiModelProperty(value = "优惠券领取数量") diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/YxStoreCouponUserQueryVo.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/YxStoreCouponUserQueryVo.java index e5e53fdb..93512d07 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/YxStoreCouponUserQueryVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/YxStoreCouponUserQueryVo.java @@ -40,11 +40,11 @@ public class YxStoreCouponUserQueryVo implements Serializable { @ApiModelProperty(value = "最低消费多少金额可用优惠券") private BigDecimal useMinPrice; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") private Date createTime; @ApiModelProperty(value = "优惠券结束时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") private Date endTime; @ApiModelProperty(value = "使用时间") diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java index 421debd1..165c457c 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java @@ -413,6 +413,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl