From eabcee6bf5be60af97fab7cc61f7d09552069586 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Sat, 21 Dec 2024 18:13:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=B7=B2=E8=BE=BE=E6=A0=87?= =?UTF-8?q?=E6=AC=A1=E6=95=B0=20=E8=8E=B7=E5=8F=96=E5=A4=A7=E8=BD=AC?= =?UTF-8?q?=E7=9B=98=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DiscSpinningController.java | 27 +++++++++---------- .../service/impl/TaskCenterServiceImpl.java | 4 +-- 2 files changed, 14 insertions(+), 17 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 7ddaed11..c9041f10 100644 --- a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java +++ b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java @@ -63,7 +63,7 @@ public class DiscSpinningController { discSpinning.setNumber(discSpinning.getOdds()); discSpinningService.save(discSpinning); - List prizes = discSpinningService.list(new QueryWrapper().eq("disc_type",discSpinning.getDiscType()).orderByAsc("type", "id")); + List prizes = discSpinningService.list(new QueryWrapper().eq("disc_type", discSpinning.getDiscType()).orderByAsc("type", "id")); BigDecimal number = BigDecimal.ZERO; for (DiscSpinning prize : prizes) { number = number.add(prize.getOdds()); @@ -91,7 +91,7 @@ public class DiscSpinningController { public Result updateDiscSpinning(@RequestBody DiscSpinning discSpinning) { discSpinningService.updateById(discSpinning); - List prizes = discSpinningService.list(new QueryWrapper().eq("disc_type",discSpinning.getDiscType()).orderByAsc("type", "id")); + List prizes = discSpinningService.list(new QueryWrapper().eq("disc_type", discSpinning.getDiscType()).orderByAsc("type", "id")); BigDecimal number = BigDecimal.ZERO; for (DiscSpinning prize : prizes) { number = number.add(prize.getOdds()); @@ -130,18 +130,18 @@ public class DiscSpinningController { @GetMapping("/app/discSpinning/drawCount") @ApiOperation("获取大转盘抽奖次数") @ApiImplicitParams({ - @ApiImplicitParam(name = "source", value = "`1` 订单拉起抽奖 `2` 周任务拉起抽奖 `3` 月任务拉起抽奖", dataTypeClass = String.class, paramType = "body"), + @ApiImplicitParam(name = "source", value = "`1` 订单拉起抽奖 `2` 周任务拉起抽奖 `3` 月任务拉起抽奖", dataTypeClass = Integer.class), }) @ApiResponses({ @ApiResponse(code = 200, message = "{\"sum\":\"总抽奖次数\",\"count\":\"剩余抽奖次数\"}"), }) - public Result drawCount(@ApiIgnore @RequestAttribute("userId") Long userId, @Nullable @ApiIgnore @RequestBody Map maps) { + public Result drawCount(@ApiIgnore @RequestAttribute("userId") Long userId, @RequestParam(required = false, defaultValue = "1") Integer source) { Map map = new HashMap<>(); int drawCount = Integer.parseInt(commonRepository.findOne(901).getValue()); map.put("sum", drawCount); - if (maps != null && maps.containsKey("source") && !"1".equals(maps.get("source"))) { + if (source != null && !source.equals(1)) { //任务可抽奖次数 - map.put("count", taskCenterService.countTaskDisc(userId,maps.get("source").toString())); + map.put("count", taskCenterService.countTaskDisc(userId, source.toString())); } else { int i = recordService.countDraw(userId); if (drawCount - i > 0) { @@ -156,15 +156,14 @@ public class DiscSpinningController { @Login @GetMapping("/app/discSpinning/draw") @ApiImplicitParams({ - @ApiImplicitParam(name = "source", value = "1 普通转盘 2 周任务转盘 3 月任务转盘", dataTypeClass = String.class, paramType = "body"), + @ApiImplicitParam(name = "source", value = "1 普通转盘 2 周任务转盘 3 月任务转盘", dataTypeClass = Integer.class), }) @ApiOperation("抽取大转盘") - public Result draw(@ApiIgnore @RequestAttribute("userId") Long userId, @Nullable @ApiIgnore @RequestBody Map maps) { + public Result draw(@ApiIgnore @RequestAttribute("userId") Long userId, @RequestParam(required = false, defaultValue = "1") Integer source) { double amount = 0; - int discType = 1; Long orderId = null; Integer i = recordService.countDraw(userId); - if (maps == null || !maps.containsKey("source") || !"1".equals(maps.get("source"))) { + if (source != null && source.equals(1)) { //任务抽奖 int drawCount = Integer.parseInt(commonRepository.findOne(901).getValue()); if (i != null && i >= drawCount) { @@ -176,13 +175,11 @@ public class DiscSpinningController { } amount = orders.getPayMoney().doubleValue(); orderId = orders.getOrdersId(); - } - if (CollectionUtil.isNotEmpty(maps) && maps.containsKey("source")) { - discType = Integer.parseInt(maps.get("source").toString()); - + } else if (source == null) { + source = 1; } return new Result().put("data", - discSpinningService.draws(i == null ? 1 : i + 1, amount, orderId, userId, discType)); + discSpinningService.draws(i == null ? 1 : i + 1, amount, orderId, userId, source)); } @ApiOperation("大转盘奖项领取") diff --git a/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java b/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java index 17fe367a..c03a0a85 100644 --- a/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java +++ b/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java @@ -80,7 +80,7 @@ public class TaskCenterServiceImpl extends ServiceImpl 0) { @@ -90,7 +90,7 @@ public class TaskCenterServiceImpl extends ServiceImpl 0) {