From e8921ddca011dacac57bb7b7c76f94222c730f75 Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Wed, 25 Jun 2025 16:23:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B6=88=E8=80=97=E9=87=91?= =?UTF-8?q?=E5=B8=81=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/controller/ConsumeController.java | 5 ++--- src/main/java/com/example/demo/service/ConsumeService.java | 3 ++- .../java/com/example/demo/serviceImpl/ConsumeServiceImpl.java | 8 +++++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/example/demo/controller/ConsumeController.java b/src/main/java/com/example/demo/controller/ConsumeController.java index 4f150fd..761d291 100644 --- a/src/main/java/com/example/demo/controller/ConsumeController.java +++ b/src/main/java/com/example/demo/controller/ConsumeController.java @@ -66,11 +66,10 @@ public class ConsumeController { return Result.success(gold); } - //消耗金币统计 + //消耗金币增加 @PostMapping("/add") public Result add(@RequestBody ConsumeUser consumeUser) { - consumeService.add(consumeUser); - return Result.success(); + return consumeService.add(consumeUser); } diff --git a/src/main/java/com/example/demo/service/ConsumeService.java b/src/main/java/com/example/demo/service/ConsumeService.java index e0013d9..519492b 100644 --- a/src/main/java/com/example/demo/service/ConsumeService.java +++ b/src/main/java/com/example/demo/service/ConsumeService.java @@ -4,6 +4,7 @@ package com.example.demo.service; import com.example.demo.domain.entity.UserGoldRecord; import com.example.demo.domain.vo.ConsumeUser; import com.example.demo.domain.vo.Gold; +import com.example.demo.domain.vo.Result; import com.github.pagehelper.PageInfo; /** @@ -23,5 +24,5 @@ public interface ConsumeService { PageInfo selectBy(Integer pageNum, Integer pageSize, ConsumeUser consumeUser); - void add(ConsumeUser consumeUser); + Result add(ConsumeUser consumeUser); } diff --git a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java index e039544..a379fd8 100644 --- a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java @@ -5,6 +5,7 @@ import com.example.demo.domain.entity.UserGoldRecord; import com.example.demo.domain.vo.ConsumeUser; import com.example.demo.domain.vo.Gold; import com.example.demo.domain.vo.GoldUser; +import com.example.demo.domain.vo.Result; import com.example.demo.mapper.ConsumeMapper; import com.example.demo.mapper.UserMapper; import com.example.demo.service.ConsumeService; @@ -92,7 +93,7 @@ public class ConsumeServiceImpl implements ConsumeService { //新增消耗 @Override - public void add(ConsumeUser consumeUser) { + public Result add(ConsumeUser consumeUser) { UserGoldRecord userGoldRecord = new UserGoldRecord(); // 获取当前时间戳部分 @@ -117,6 +118,10 @@ public class ConsumeServiceImpl implements ConsumeService { // 获取当前月份（1-12） int currentMonth = LocalDate.now().getMonthValue(); GoldUser gold = userMapper.selectGold(consumeUser.getJwcode().toString()); + if(consumeUser.getFreeGold()>(gold.getNowFreeDecember()+ gold.getNowFreeJune())||consumeUser.getPermanentGold()>gold.getNowPermanentGold() + ||consumeUser.getTaskGold()>gold.getNowTaskGold()){ + return Result.error("金币数量不足"); + } // 根据当前月份设置对应字段 if (currentMonth >= 1 && currentMonth <= 6) { // 1-6月：设置6月额度，12月保持默认值 @@ -153,5 +158,6 @@ public class ConsumeServiceImpl implements ConsumeService { user.setCurrentTaskGold(gold.getNowTaskGold()-consumeUser.getTaskGold()); user.setConsumeNum(gold.getConsumeNum()-1); userMapper.updateGold(user); + return Result.success(); } }