From 19db286c012a6ff637f5d67cafdad80e7543ee3d Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 13 Jan 2025 17:51:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E5=A5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DiscSpinningServiceImpl.java          | 10 +++++-----
 .../modules/redisService/impl/RedisServiceImpl.java    |  6 +++++-
 2 files changed, 10 insertions(+), 6 deletions(-)

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 b3f389e8..b4433557 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
@@ -2,6 +2,7 @@ package com.sqx.modules.discSpinning.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.RandomUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sqx.common.utils.DateUtils;
@@ -104,13 +105,12 @@ public class DiscSpinningServiceImpl extends ServiceImpl<DiscSpinningDao, DiscSp
             recordService.save(record);
             return record;
         }
-        Random random = new Random();
+
         BigDecimal maxNumber = prizes.stream()
                 .map(DiscSpinning::getNumber)
                 .max(BigDecimal::compareTo)
                 .orElse(null);
-        BigDecimal randomNum = new BigDecimal(ThreadLocalRandom.current().nextDouble(0.01, maxNumber.doubleValue()));
-
+        BigDecimal randomNum = new BigDecimal(RandomUtil.randomDouble(0.01, maxNumber.doubleValue()));
         List<DiscSpinningAmount> amounts = new ArrayList<>();
         Map<String, List<DiscSpinningAmount>> amountMaps = redisUtils.getMapData(RedisKeys.getDateKey("spinning:amount:") + source, "setDiscSpinningAmounts", DiscSpinningAmount.class);
         for (int i = drawCount; i >= 0; i--) {
@@ -125,11 +125,11 @@ public class DiscSpinningServiceImpl extends ServiceImpl<DiscSpinningDao, DiscSp
                     int maxAmount = Integer.parseInt(commonRepository.findOne(900).getValue());
                     double resultAmount = 0;
                     if (prize.getType() == 2) {
-                        double baseRandom = random.nextDouble();
+                        double baseRandom = RandomUtil.randomDouble(0.01, 1);
                         double baseAmount = 0;
                         for (DiscSpinningAmount amount : amounts) {
                             if (baseRandom < amount.getRandom()) {
-                                resultAmount = baseAmount + random.nextDouble() * (amount.getMaxAmount() - baseAmount);
+                                resultAmount = baseAmount + RandomUtil.randomDouble(0.01, 1) * (amount.getMaxAmount() - baseAmount);
                                 break;
                             }
                             baseAmount = amount.getMaxAmount();
diff --git a/src/main/java/com/sqx/modules/redisService/impl/RedisServiceImpl.java b/src/main/java/com/sqx/modules/redisService/impl/RedisServiceImpl.java
index 52a72eb0..a9df5c4e 100644
--- a/src/main/java/com/sqx/modules/redisService/impl/RedisServiceImpl.java
+++ b/src/main/java/com/sqx/modules/redisService/impl/RedisServiceImpl.java
@@ -43,9 +43,13 @@ public class RedisServiceImpl implements RedisService {
         this.redisTemplate = redisTemplate;
     }
 
+    //spinning:amount:3
     @Override
     public void setDiscSpinningAmounts(String key) {
-        List<DiscSpinningAmount> amounts = amountService.list(new QueryWrapper<DiscSpinningAmount>().eq("status", 1).orderByAsc("max_amount"));
+        List<DiscSpinningAmount> amounts = amountService.list(new QueryWrapper<DiscSpinningAmount>()
+                .eq("status", 1)
+                .eq("type",key.split(":")[2])
+                .orderByAsc("max_amount"));
         Map<Integer, List<DiscSpinningAmount>> map =
                 amounts.stream().collect(Collectors.groupingBy(
                         disc -> disc.getNum() == null ? 0 : disc.getNum()