From 23d4943535b59e54de1399d159d0209638c68657 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 21 八月 2025 16:38:01 +0800
Subject: [PATCH] 抽奖活动字段调整
---
framework/src/main/java/cn/lili/modules/lmk/domain/entity/PrizeActivity.java | 4 ++--
framework/src/main/java/cn/lili/modules/lmk/domain/entity/PrizeRecord.java | 2 +-
framework/src/main/java/cn/lili/modules/lmk/domain/entity/PrizeGrantRecord.java | 2 +-
framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeServiceImpl.java | 8 ++++----
framework/src/main/java/cn/lili/modules/lmk/domain/vo/PrizeProbabilityVO.java | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/entity/PrizeActivity.java b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/PrizeActivity.java
index 22b0f94..78589dc 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/entity/PrizeActivity.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/PrizeActivity.java
@@ -28,12 +28,12 @@
/** 娲诲姩鎻忚堪 */
private String activityDes;
- @TableField(value = "begin_time", typeHandler = LocalDateTimeTypeHandler.class)
+ @TableField(value = "begin_time")
/** 娲诲姩寮�濮嬫椂闂� */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date beginTime;
- @TableField(value = "end_time", typeHandler = LocalDateTimeTypeHandler.class)
+ @TableField(value = "end_time")
/** 娲诲姩缁撴潫鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/entity/PrizeGrantRecord.java b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/PrizeGrantRecord.java
index 7effdda..85de010 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/entity/PrizeGrantRecord.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/PrizeGrantRecord.java
@@ -36,7 +36,7 @@
@TableField("prize_id")
/** 濂栧搧id */
- private Long prizeId;
+ private String prizeId;
@TableField("prize_name")
/** 濂栧搧鍚嶇О */
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/entity/PrizeRecord.java b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/PrizeRecord.java
index b100e42..807de4d 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/entity/PrizeRecord.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/PrizeRecord.java
@@ -52,7 +52,7 @@
@TableField("prize_id")
/** 濂栧搧id */
- private Long prizeId;
+ private String prizeId;
@TableField("prize_name")
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/PrizeProbabilityVO.java b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/PrizeProbabilityVO.java
index 39a0401..6bce225 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/PrizeProbabilityVO.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/PrizeProbabilityVO.java
@@ -6,6 +6,6 @@
@Data
public class PrizeProbabilityVO {
- private Long prizeId;
+ private String prizeId;
private BigDecimal[][] probability;
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeServiceImpl.java
index c41225c..2da8595 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeServiceImpl.java
@@ -110,13 +110,13 @@
//褰撳ぉ鎶藉璁板綍姹囨��
List<PrizeRecordTimeVO> prizeRecordListByTime;
//杩樿兘鎶藉鍟嗗搧map闆嗗悎
- Map<Long, ActivityRefPrize> canPrizeMap;
+ Map<String, ActivityRefPrize> canPrizeMap;
//寰呮瀯寤烘娊濂栨鐜囧晢鍝侀泦鍚�
List<ActivityRefPrize> refPrizeList;
//姒傜巼闆嗗悎
List<PrizeProbabilityVO> prizeProbabilityList;
//涓鍟嗗搧id
- Long prizeWon = null;
+ String prizeWon = null;
prizeActivity = prizeActivityService.getById(prizeId);
if (prizeActivity == null) {
@@ -127,8 +127,8 @@
if (new Date().after(activityEndtime)) {
throw new ServiceException("褰撳墠娲诲姩宸茬粡缁撴潫");
}
- if (!EnableStatusEnums.ENABLE.name().equals(prizeActivity.getEnableStatus())) {
- throw new ServiceException("娲诲姩杩樻病鏈夊紑濮�");
+ if (!PrizeActivityStatusEnum.ON.name().equals(prizeActivity.getEnableStatus())) {
+ throw new ServiceException("娲诲姩杩樻病鏈夊惎鐢�");
}
//鏌ヨ褰撳ぉ鐨勬娊濂栧嵎
LocalDate now = LocalDate.now();
--
Gitblit v1.8.0