From b593c7804a0c4fea505d40953e63f6f613eb0044 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 13 Jan 2025 16:57:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BD=AC=E7=9B=98=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DiscSpinningController.java | 16 +++++----------- 1 file changed, 5 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 f4fe083a..bb0029ec 100644 --- a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java +++ b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java @@ -70,24 +70,19 @@ public class DiscSpinningController { @ApiOperation("添加大转盘") @Transactional public Result insertDiscSpinning(@RequestBody DiscSpinning discSpinning) { - discSpinning.setCreateTime(DateUtils.format(new Date())); - discSpinning.setNumber(discSpinning.getOdds()); - discSpinningService.save(discSpinning); - 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()); prize.setNumber(number); } - BigDecimal totalOdds = prizes.stream() - .map(DiscSpinning::getOdds) - .filter(Objects::nonNull) - .reduce(BigDecimal.ZERO, BigDecimal::add); - if (totalOdds.compareTo(new BigDecimal(100)) > 0) { + discSpinning.setNumber(number.add(discSpinning.getOdds())); + if (discSpinning.getNumber().compareTo(new BigDecimal(100)) > 0) { return Result.error("中奖概率总和 不可超过100"); } - discSpinningService.updateBatchById(prizes); + discSpinning.setCreateTime(DateUtils.format(new Date())); + discSpinning.setNumber(discSpinning.getOdds()); + discSpinningService.save(discSpinning); return Result.success(); } @@ -100,7 +95,6 @@ public class DiscSpinningController { @PostMapping("/discSpinning/updateDiscSpinning") @ApiOperation("修改大转盘") public Result updateDiscSpinning(@RequestBody DiscSpinning discSpinning) { -// DiscSpinning current = discSpinningService.getById(discSpinning.getId()); List prizes = discSpinningService.list(new QueryWrapper().eq("disc_type", discSpinning.getDiscType()).orderByAsc("type", "id")); List upPrizes = new ArrayList<>(); BigDecimal number = BigDecimal.ZERO;