From d9901a1d21c42372d8b38a081844177e578980a6 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 15 八月 2025 11:34:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/lmk/domain/entity/PrizeRecord.java | 12 +++++++++++-
framework/src/main/java/cn/lili/modules/lmk/domain/vo/PrizeRecordVO.java | 3 +++
framework/src/main/java/cn/lili/modules/lmk/enums/general/PrizeDistributeStatusEnum.java | 16 ++++++++++++++++
framework/src/main/java/cn/lili/modules/lmk/enums/general/PrizeStatusEnum.java | 15 +++++++++++++++
4 files changed, 45 insertions(+), 1 deletions(-)
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 21fe4e4..c7f52b6 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
@@ -1,5 +1,7 @@
package cn.lili.modules.lmk.domain.entity;
+import cn.lili.modules.lmk.enums.general.PrizeDistributeStatusEnum;
+import cn.lili.modules.lmk.enums.general.PrizeStatusEnum;
import cn.lili.mybatis.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -39,7 +41,9 @@
private String prizeActivityCover;
@TableField("prize_status")
- /** 涓鐘舵�� */
+ /** 涓鐘舵��
+ * @see PrizeStatusEnum
+ * */
private String prizeStatus;
@TableField("prize_content")
@@ -62,5 +66,11 @@
/** 娲诲姩濂栧搧鍏宠仈琛╥d */
private Long activityPrizeRefId;
+ @TableField("distribute_status")
+ /** 濂栧搧鍙戞斁鐘舵��
+ * @see PrizeDistributeStatusEnum
+ * */
+ private String distributeStatus;
+
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/PrizeRecordVO.java b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/PrizeRecordVO.java
index 1515289..f7cb1af 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/PrizeRecordVO.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/PrizeRecordVO.java
@@ -64,6 +64,9 @@
@ApiModelProperty("娲诲姩濂栧搧鍏宠仈琛╥d")
private Long activityPrizeRefId;
+ /** 濂栧搧鍙戞斁鐘舵�� */
+ private String distributeStatus;
+
public static PrizeRecordVO getVoByEntity(@NonNull PrizeRecord entity, PrizeRecordVO vo) {
if(vo == null) {
vo = new PrizeRecordVO();
diff --git a/framework/src/main/java/cn/lili/modules/lmk/enums/general/PrizeDistributeStatusEnum.java b/framework/src/main/java/cn/lili/modules/lmk/enums/general/PrizeDistributeStatusEnum.java
new file mode 100644
index 0000000..008fb6b
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/lmk/enums/general/PrizeDistributeStatusEnum.java
@@ -0,0 +1,16 @@
+package cn.lili.modules.lmk.enums.general;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum PrizeDistributeStatusEnum {
+ /**
+ * 濂栧搧鍙戞斁鐘舵��
+ */
+ NOT_WAIT("鏈腑濂�"),
+ WAIT("寰呭彂鏀�"),
+ SUCCESS("宸插彂鏀�");
+ private final String description;
+}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/enums/general/PrizeStatusEnum.java b/framework/src/main/java/cn/lili/modules/lmk/enums/general/PrizeStatusEnum.java
new file mode 100644
index 0000000..c07cb8e
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/lmk/enums/general/PrizeStatusEnum.java
@@ -0,0 +1,15 @@
+package cn.lili.modules.lmk.enums.general;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum PrizeStatusEnum {
+ /**
+ * 涓鐘舵��
+ */
+ WIN("鏈腑濂�"),
+ NOT_WIN("涓");
+ private final String description;
+}
--
Gitblit v1.8.0