oneos-v5/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

同步 Date 转换 LocalDateTime 的修改~

Browse Source
This commit is contained in:
YunaiV
2022-11-11 00:20:57 +08:00
parent 2460e492cf
commit 19d9d66a38
336 changed files with 3536 additions and 1176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
归档/promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/coupon/dto/card/CouponCardRespDTO.java
View File

@@ -4,7 +4,7 @@ import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.time.LocalDateTime;
/**
* 优惠劵 Response DTO
@@ -63,11 +63,11 @@ public class CouponCardRespDTO implements Serializable {
/**
* 生效开始时间
*/
private Date validStartTime;
private LocalDateTime validStartTime;
/**
* 生效结束时间
*/
private Date validEndTime;
private LocalDateTime validEndTime;
// ========== 使用规则 END ==========
// ========== 使用效果 BEGIN ==========
@@ -98,13 +98,13 @@ public class CouponCardRespDTO implements Serializable {
/**
* 使用时间
*/
private Date usedTime;
private LocalDateTime usedTime;
// ========== 使用情况 END ==========
/**
* 创建时间
*/
private Date createTime;
private LocalDateTime createTime;
}

4
归档/promotion-service-project/promotion-service-app/src/main/java/cn/iocoder/mall/promotionservice/service/coupon/CouponCardService.java
View File

@@ -150,9 +150,9 @@ public class CouponCardService {
if (CouponTemplateDateTypeEnum.FIXED_DATE.getValue().equals(template.getDateType())) {
card.setValidStartTime(template.getValidStartTime()).setValidEndTime(template.getValidEndTime());
} else if (CouponTemplateDateTypeEnum.FIXED_TERM.getValue().equals(template.getDateType())) {
Date validStartTime = DateUtil.getDayBegin(new Date());
LocalDateTime validStartTime = DateUtil.getDayBegin(new Date());
card.setValidStartTime(DateUtil.addDate(validStartTime, Calendar.DAY_OF_YEAR, template.getFixedStartTerm()));
Date validEndTime = DateUtil.getDayEnd(card.getValidStartTime());
LocalDateTime validEndTime = DateUtil.getDayEnd(card.getValidStartTime());
card.setValidEndTime(DateUtil.addDate(validEndTime, Calendar.DAY_OF_YEAR, template.getFixedEndTerm() - 1));
}
}