diff --git a/src/main/java/com/sqx/config/ShiroConfig.java b/src/main/java/com/sqx/config/ShiroConfig.java index d535d4c4..74a17164 100644 --- a/src/main/java/com/sqx/config/ShiroConfig.java +++ b/src/main/java/com/sqx/config/ShiroConfig.java @@ -53,6 +53,7 @@ public class ShiroConfig { filterMap.put("/captcha.jpg", "anon"); filterMap.put("/search/**", "anon"); filterMap.put("/cashOutAudit/batchCashOutOrder", "anon"); + filterMap.put("/app/discSpinning/receive1", "anon"); filterMap.put("/**", "oauth2"); shiroFilter.setFilterChainDefinitionMap(filterMap); 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 54310c8d..780b050c 100644 --- a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java +++ b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java @@ -274,6 +274,12 @@ public class DiscSpinningController { 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 284baf9f..3a6769a8 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 @@ -113,10 +113,12 @@ public class DiscSpinningServiceImpl extends ServiceImpl amounts = new ArrayList<>(); Map> amountMaps = redisUtils.getMapData(RedisKeys.getDateKey("spinning:amount:") + source, "setDiscSpinningAmounts", DiscSpinningAmount.class); - for (int i = drawCount; i >= 0; i--) { - if (amountMaps.containsKey(i + "")) { - amounts = amountMaps.get(i + ""); - break; + if(CollectionUtil.isNotEmpty(amountMaps)){ + for (int i = drawCount; i >= 0; i--) { + if (amountMaps.containsKey(i + "")) { + amounts = amountMaps.get(i + ""); + break; + } } } for (DiscSpinning prize : prizes) { @@ -149,6 +151,7 @@ public class DiscSpinningServiceImpl extends ServiceImpl amounts = amountService.list(new QueryWrapper() .eq("status", 1) - .eq("type",key.split(":")[2]) + .eq("type",key.split(":")[3]) .orderByAsc("max_amount")); Map> map = amounts.stream().collect(Collectors.groupingBy(