hy/aslan-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

日期改为时间戳类型

Browse Source
This commit is contained in:
tianfeng 2025-11-05 18:59:14 +08:00
parent f52a547b18
commit 89fd614569
4 changed files with 41 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/convertor/PropCouponConvertor.java
View File

@ -8,6 +8,7 @@ import com.red.circle.other.domain.propcoupon.PropCouponStatus;
import com.red.circle.other.domain.propcoupon.PropCouponType;
import com.red.circle.other.infra.database.rds.entity.props.PropCouponDO;
import com.red.circle.other.infra.database.rds.entity.props.PropCouponUseRecordDO;
import com.red.circle.other.infra.utils.ZonedDateTimeUtils;
/**
* 道具券对象转换器
@ -37,9 +38,10 @@ public class PropCouponConvertor {
co.setStatusName(propCoupon.getStatus().getDesc());
co.setSource(propCoupon.getSource().getCode());
co.setSourceName(propCoupon.getSource().getDesc());
co.setExpireTime(propCoupon.getExpireTime());
co.setUseTime(propCoupon.getUseTime());
co.setCreateTime(propCoupon.getCreateTime());
co.setExpireTime(ZonedDateTimeUtils.toTimestamp(propCoupon.getExpireTime()));
co.setUseTime(ZonedDateTimeUtils.toTimestamp(propCoupon.getUseTime()));
co.setCreateTime(ZonedDateTimeUtils.toTimestamp(propCoupon.getCreateTime()));
return co;
}
@ -79,10 +81,10 @@ public class PropCouponConvertor {
if (source != null) {
co.setSourceName(source.getDesc());
}
co.setExpireTime(propCouponDO.getExpireTime());
co.setUseTime(propCouponDO.getUseTime());
co.setCreateTime(propCouponDO.getCreateTime());
co.setExpireTime(ZonedDateTimeUtils.toTimestamp(propCouponDO.getExpireTime()));
co.setUseTime(ZonedDateTimeUtils.toTimestamp(propCouponDO.getUseTime()));
co.setCreateTime(ZonedDateTimeUtils.toTimestamp(propCouponDO.getCreateTime()));
return co;
}
@ -117,7 +119,7 @@ public class PropCouponConvertor {
co.setReceiverId(recordDO.getReceiverId());
co.setRemark(recordDO.getRemark());
co.setCreateTime(recordDO.getCreateTime());
co.setCreateTime(ZonedDateTimeUtils.toTimestamp(recordDO.getCreateTime()));
return co;
}

10
rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/PropCouponCO.java
View File

@ -3,6 +3,7 @@ package com.red.circle.other.app.dto.clientobject;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.sql.Timestamp;
import java.time.LocalDateTime;
/**
@ -77,18 +78,15 @@ public class PropCouponCO {
/**
* 过期时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime expireTime;
private Timestamp expireTime;
/**
* 使用时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime useTime;
private Timestamp useTime;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
private Timestamp createTime;
}

4
rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/PropCouponRecordCO.java
View File

@ -3,6 +3,7 @@ package com.red.circle.other.app.dto.clientobject;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.sql.Timestamp;
import java.time.LocalDateTime;
/**
@ -77,6 +78,5 @@ public class PropCouponRecordCO {
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
private Timestamp createTime;
}

25
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/utils/ZonedDateTimeUtils.java
View File

@ -3,6 +3,7 @@ package com.red.circle.other.infra.utils;
import com.alibaba.cloud.commons.lang.StringUtils;
import com.red.circle.tool.core.date.ZonedId;
import java.sql.Timestamp;
import java.time.DayOfWeek;
import java.time.Duration;
import java.time.LocalDate;
@ -440,6 +441,30 @@ public final class ZonedDateTimeUtils {
return time.format(DateTimeFormatter.ofPattern(format.getPattern()));
}
/**
* localDateTime 转毫秒
* @param localDateTime
* @return
*/
public static long toTimestampMillis(LocalDateTime localDateTime) {
if (localDateTime == null) {
throw new IllegalArgumentException("LocalDateTime cannot be null");
}
return localDateTime.atZone(ZonedId.ASIA_RIYADH.getZonedId()).toInstant().toEpochMilli();
}
/**
* localDateTime 转时间戳
* @param localDateTime
* @return
*/
public static Timestamp toTimestamp(LocalDateTime localDateTime) {
if (localDateTime == null) {
return null;
}
return Timestamp.from(localDateTime.atZone(ZonedId.ASIA_RIYADH.getZonedId()).toInstant());
}
/**
* 转换zoneId
*