From 5f6f1cd3d7e11ce0843a5e8f750dbbad042a5302 Mon Sep 17 00:00:00 2001 From: huangqizhen <15552608129@163.com> Date: Mon, 30 Mar 2026 15:05:31 +0800 Subject: [PATCH] =?UTF-8?q?3.26=20=E5=85=8D=E8=B4=B9=E9=87=91=E5=B8=81?= =?UTF-8?q?=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/Mysql/MysqlServiceImpl.java | 1 + .../com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java b/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java index 0e59467..4caf9ee 100644 --- a/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java +++ b/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java @@ -920,6 +920,7 @@ public class MysqlServiceImpl implements MysqlService { case 7 -> 4; // 其他 → 西南钱包 case 10 -> 8; case 15 -> 3; + case 16 -> 6; default -> 1; }; } diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java index 3a64f97..6e5c4cd 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java @@ -476,6 +476,13 @@ public class CashRefundServiceImpl implements RefundService { user.setCurrentPermanentGold(BigDecimal.valueOf(-userGoldRecord.getPermanentGold())); //当前永久金币 user.setCurrentFreeJune(BigDecimal.valueOf(-userGoldRecord.getFreeJune())); //当前六月免费金币 user.setCurrentFreeDecember(BigDecimal.valueOf(-userGoldRecord.getFreeDecember())); //当前十二月免费金币 + User usergold = userMapper.selectUserByJwcode(userGoldRecord.getJwcode()); + if(usergold.getCurrentFreeJune().add(user.getCurrentFreeJune()).compareTo(BigDecimal.ZERO)<0){ + throw new RuntimeException("当前六月免费金币不足"); + } + if (usergold.getCurrentFreeDecember().add(user.getCurrentFreeDecember()).compareTo(BigDecimal.ZERO)<0){ + throw new RuntimeException("当前十二月免费金币不足"); + } auditMapper.updateUserGold(user); // 钱包更新 - 按原始充值流水 wallet_id 优先级顺序原路退回(1-10,越小优先级越高)