From af71811487394b5462bb568aa57bf7bbb8313b13 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 13 Dec 2024 15:04:41 +0800
Subject: [PATCH] =?UTF-8?q?redis=20=E7=BC=93=E5=AD=98=E9=97=AE=E9=A2=98=20?=
 =?UTF-8?q?id=E9=BB=98=E8=AE=A4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sqx/modules/discSpinning/entity/DiscSpinningAmount.java | 6 ++----
 .../discSpinning/service/impl/DiscSpinningServiceImpl.java  | 3 ++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/sqx/modules/discSpinning/entity/DiscSpinningAmount.java b/src/main/java/com/sqx/modules/discSpinning/entity/DiscSpinningAmount.java
index 4380b448..2c1ea319 100644
--- a/src/main/java/com/sqx/modules/discSpinning/entity/DiscSpinningAmount.java
+++ b/src/main/java/com/sqx/modules/discSpinning/entity/DiscSpinningAmount.java
@@ -4,16 +4,13 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
 import lombok.Data;
 
 /**
  * 现金红包 抽奖配置(DiscSpinningAmount)表实体类
  *
  * @author ww
- * @since 2024-12-11 14:59:01
+ * @since 2024-12-13 15:04:07
  */
 @Data
 @TableName("disc_spinning_amount")
@@ -27,6 +24,7 @@ public class DiscSpinningAmount extends Model<DiscSpinningAmount> {
     private Double random;
     @ApiModelProperty("最大金额")
     private Double maxAmount;
+    @ApiModelProperty("是否启动 0否1是")
     private Integer status;
 
 
diff --git a/src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningServiceImpl.java b/src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningServiceImpl.java
index c3b6d4b6..5136faf6 100644
--- a/src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningServiceImpl.java
+++ b/src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningServiceImpl.java
@@ -146,7 +146,7 @@ public class DiscSpinningServiceImpl extends ServiceImpl<DiscSpinningDao, DiscSp
         } while (randomDouble == 0);
         BigDecimal randomNum = new BigDecimal(randomDouble).multiply(new BigDecimal(10000)).divide(new BigDecimal(100));
 
-        List<DiscSpinningAmount> amounts = redisUtils.getDate(RedisKeys.getDateKey("spinning:amount"), ArrayList.class, "setDiscSpinningAmounts");
+        List<DiscSpinningAmount> amounts = amountService.list(new QueryWrapper<DiscSpinningAmount>().eq("status",1).orderByAsc("max_amount"));
         for (DiscSpinning prize : prizes) {
             if (randomNum.compareTo(prize.getNumber()) < 0) {
                 if (prize.getType() == 2) {
@@ -184,5 +184,6 @@ public class DiscSpinningServiceImpl extends ServiceImpl<DiscSpinningDao, DiscSp
         recordService.save(record);
         return record;
     }
+
 }