Merge branch 'dev_v1.3.4_20220902' of http://git.dayaedu.com/yonge/cooleshow into dev_v1.3.4_20220902

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

@@ -28,6 +28,7 @@ import com.yonge.cooleshow.common.enums.EStatus;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.thirdparty.message.MessageSenderPluginContext;
 import org.apache.commons.collections.CollectionUtils;
+import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -122,8 +123,8 @@ public class CouponIssueServiceImp extends ServiceImpl<CouponIssueMapper, Coupon
         Long startTime = null;
         Long endTime = null;
         if (couponInfo.getValidDay() != null && couponInfo.getValidDay() >0) {
-            startTime = LocalDateTime.now().atZone(ZoneId.systemDefault()).toEpochSecond();
-            endTime = LocalDateTime.now().plusDays(couponInfo.getValidDay()).atZone(ZoneId.systemDefault()).toEpochSecond();
+            startTime = DateTime.now().getMillis();
+            endTime = DateTime.now().plusDays(couponInfo.getValidDay()).getMillis();
         } else {
             startTime = couponInfo.getStartTime();
             endTime = couponInfo.getEndTime();
@@ -139,7 +140,7 @@ public class CouponIssueServiceImp extends ServiceImpl<CouponIssueMapper, Coupon
             CouponIssue couponIssue = new CouponIssue();
             couponIssue.setCouponId(couponId);
             couponIssue.setIssuer(issuer);
-            couponIssue.setIssueTime(new Date().getTime());
+            couponIssue.setIssueTime(DateTime.now().getMillis());
             couponIssue.setIssueWay(SendTypeEnum.PLATFORM.getCode());
             couponIssue.setRemark(reason);
             couponIssue.setStartTime(startTime);

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

@@ -54,8 +54,8 @@ public class CouponInfoVO {
     @ApiModel(value = "优惠券信息分页信息", description = "优惠券信息分页信息")
     public static class CouponPageInfo implements Serializable {
 
-        @ApiModelProperty("优惠券ID")
-        private Long id;
+        @ApiModelProperty("优惠券发放id")
+        private Long couponIssueId;
 
         @ApiModelProperty("优惠券名称")
         private String couponName;