From eea862961b8b73721921fdfb0ab7626e42e1bbf7 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 13 Jan 2025 18:34:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E5=A5=96=20=E7=BB=88=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DiscSpinningController.java          |  8 --------
 .../service/impl/DiscSpinningServiceImpl.java       | 13 ++++++++++---
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java
index 780b050c..420f1615 100644
--- a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java
+++ b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java
@@ -273,13 +273,5 @@ public class DiscSpinningController {
 //        userService.addBlackUser(userId, "转盘奖项领取");
         return Result.success().put("data", 1);
     }
-
-    @ApiOperation("大转盘奖项领取")
-    @RequestMapping("/app/discSpinning/receive1")
-    public Result receive1() {
-        DiscSpinningRecord draws = discSpinningService.draws(1, 0, 1876099750242897979L, 1073589141326935825L, 2);
-        return Result.success().put("data", draws);
-    }
-
 }
 
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 3a6769a8..a666495e 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
@@ -109,11 +109,18 @@ public class DiscSpinningServiceImpl extends ServiceImpl<DiscSpinningDao, DiscSp
         BigDecimal maxNumber = prizes.stream()
                 .map(DiscSpinning::getNumber)
                 .max(BigDecimal::compareTo)
-                .orElse(null);
-        BigDecimal randomNum = new BigDecimal(RandomUtil.randomDouble(0.01, maxNumber.doubleValue()));
+                .orElse(BigDecimal.ZERO);
+        if (maxNumber.equals(BigDecimal.ZERO)) {
+            DiscSpinningRecord record = new DiscSpinningRecord(result.getName(), sourceId, userId, result.getUrl(), result.getType(),
+                    result.getNumber(), DateUtils.formatYMD(new Date()), DateUtils.format(new Date()), source);
+            recordService.save(record);
+            return record;
+        }
+        Random random = new Random();
+        BigDecimal randomNum = new BigDecimal(random.nextInt(maxNumber.intValue()));
         List<DiscSpinningAmount> amounts = new ArrayList<>();
         Map<String, List<DiscSpinningAmount>> amountMaps = redisUtils.getMapData(RedisKeys.getDateKey("spinning:amount:") + source, "setDiscSpinningAmounts", DiscSpinningAmount.class);
-        if(CollectionUtil.isNotEmpty(amountMaps)){
+        if (CollectionUtil.isNotEmpty(amountMaps)) {
             for (int i = drawCount; i >= 0; i--) {
                 if (amountMaps.containsKey(i + "")) {
                     amounts = amountMaps.get(i + "");