修改返回时间格式

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

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.admin.io.request.coupon;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.dto.UserParam;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
@@ -184,9 +185,11 @@ public class CouponIssueVo {
         private String orderNo;
 
         @ApiModelProperty("有效期开始时间")
+        @JSONField(format = "yyyy-MM-dd")
         private Date startTime;
 
         @ApiModelProperty("有效期结束时间")
+        @JSONField(format = "yyyy-MM-dd")
         private Date endTime;
 
         @ApiModelProperty("发放时间")
@@ -562,9 +565,11 @@ public class CouponIssueVo {
         private String orderNo;
 
         @ApiModelProperty("有效期开始时间")
+        @JSONField(format = "yyyy-MM-dd")
         private Date startTime;
 
         @ApiModelProperty("有效期结束时间")
+        @JSONField(format = "yyyy-MM-dd")
         private Date endTime;
 
         @ApiModelProperty("发放时间")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CouponIssueServiceImp.java

@@ -35,8 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.LocalDateTime;
-import java.time.ZoneId;
+import java.time.*;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -151,8 +150,9 @@ public class CouponIssueServiceImp extends ServiceImpl<CouponIssueMapper, Coupon
         Long startTime = null;
         Long endTime = null;
         if (couponInfo.getValidDay() != null && couponInfo.getValidDay() >0) {
-            startTime = DateTime.now().getMillis();
-            endTime = DateTime.now().plusDays(couponInfo.getValidDay()).getMillis();
+            startTime =LocalDateTime.of(LocalDate.now(), LocalTime.MIN).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+            endTime = LocalDateTime.of(LocalDate.now().plusDays(couponInfo.getValidDay()-1), LocalTime.MAX)
+                                   .atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
         } else {
             startTime = couponInfo.getStartTime();
             endTime = couponInfo.getEndTime();

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

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.teacher.io.request;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.annotation.JSONField;
 import com.yonge.cooleshow.biz.dal.enums.coupon.CouponUseStateEnum;
 import com.yonge.toolset.base.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
@@ -85,9 +86,11 @@ public class CouponInfoVO {
         private Long useTime;
 
         @ApiModelProperty("生效时间")
+        @JSONField(format = "yyyy-MM-dd")
         private Long startTime;
 
         @ApiModelProperty("失效时间")
+        @JSONField(format = "yyyy-MM-dd")
         private Long endTime;
     }