From 88c64922309bb5ec43524ba9885c959adf24293a Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Fri, 27 Jun 2025 17:00:37 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/serviceImpl/ConsumeServiceImpl.java | 27 +++++++++++----------- src/main/resources/mapper/UserMapper.xml | 1 + 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java index 93be91f..b8699f7 100644 --- a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java @@ -118,26 +118,26 @@ 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()){ + 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月保持默认值 - if(consumeUser.getFreeGold()>gold.getNowFreeJune()) { + if (consumeUser.getFreeGold() > gold.getNowFreeJune()) { userGoldRecord.setFreeJune(gold.getNowFreeJune()); - userGoldRecord.setFreeDecember(consumeUser.getFreeGold()-gold.getNowFreeJune()); - }else { + userGoldRecord.setFreeDecember(consumeUser.getFreeGold() - gold.getNowFreeJune()); + } else { userGoldRecord.setFreeJune(consumeUser.getFreeGold()); userGoldRecord.setFreeDecember(0); } } else { // 7-12月：设置12月额度，6月保持默认值 - if(consumeUser.getFreeGold()>gold.getNowFreeDecember()) { + if (consumeUser.getFreeGold() > gold.getNowFreeDecember()) { userGoldRecord.setFreeDecember(gold.getNowFreeDecember()); - userGoldRecord.setFreeJune(consumeUser.getFreeGold()-gold.getNowFreeDecember()); - }else { + userGoldRecord.setFreeJune(consumeUser.getFreeGold() - gold.getNowFreeDecember()); + } else { userGoldRecord.setFreeDecember(consumeUser.getFreeGold()); userGoldRecord.setFreeJune(0); } @@ -153,11 +153,12 @@ public class ConsumeServiceImpl implements ConsumeService { consumeMapper.add(userGoldRecord); User user = new User(); user.setJwcode(userGoldRecord.getJwcode()); - user.setCurrentPermanentGold(gold.getNowPermanentGold()-consumeUser.getPermanentGold()); - user.setCurrentFreeJune(gold.getNowFreeJune()-userGoldRecord.getFreeJune()); - user.setCurrentFreeDecember(gold.getNowFreeDecember()-userGoldRecord.getFreeDecember()); - user.setCurrentTaskGold(gold.getNowTaskGold()-consumeUser.getTaskGold()); - user.setConsumeNum(gold.getConsumeNum()+1); + user.setCurrentPermanentGold(gold.getNowPermanentGold() - consumeUser.getPermanentGold()); + user.setCurrentFreeJune(gold.getNowFreeJune() - userGoldRecord.getFreeJune()); + user.setCurrentFreeDecember(gold.getNowFreeDecember() - userGoldRecord.getFreeDecember()); + user.setCurrentTaskGold(gold.getNowTaskGold() - consumeUser.getTaskGold()); + user.setConsumeNum(gold.getConsumeNum() + 1); + user.setSumConsume(consumeUser.getPermanentGold() + consumeUser.getFreeGold() + consumeUser.getTaskGold()); userMapper.updateGold(user); return Result.success(); } diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml index 70596af..aae9e60 100644 --- a/src/main/resources/mapper/UserMapper.xml +++ b/src/main/resources/mapper/UserMapper.xml @@ -45,6 +45,7 @@ current_free_december = #{currentFreeDecember}, current_task_gold = #{currentTaskGold}, consume_num = #{consumeNum}, + sum_consume = sum_consume + #{sumConsume}, update_time = NOW() WHERE jwcode = #{jwcode}