From 0378999b3ea3e5b9639894f4c7d34ef0bbff242e Mon Sep 17 00:00:00 2001 From: damonyuan <404054358@qq.com> Date: Sun, 10 Nov 2024 16:41:37 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E7=BB=9F=E4=B8=80=E5=85=88=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95=E5=86=8Dupdate=20?= =?UTF-8?q?user=20money?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/service/impl/FinanceRechargerServiceImpl.java | 9 +++++---- .../com/mdd/common/mapper/log/UserAccountLogMapper.java | 4 ++-- .../java/com/mdd/front/service/impl/PayServiceImpl.java | 9 +++++---- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java index 6a338b4a..35fdb68f 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java @@ -167,10 +167,6 @@ public class FinanceRechargerServiceImpl implements IFinanceRechargerService { rechargeOrder.setRefundStatus(1); rechargeOrderMapper.updateById(rechargeOrder); - // 更新用户余额 - user.setUserMoney(user.getUserMoney().subtract(rechargeOrder.getOrderAmount())); - userMapper.updateById(user); - // 记录余额日志 userAccountLogMapper.dec( user.getId(), @@ -182,6 +178,11 @@ public class FinanceRechargerServiceImpl implements IFinanceRechargerService { null ); + + // 更新用户余额 + user.setUserMoney(user.getUserMoney().subtract(rechargeOrder.getOrderAmount())); + userMapper.updateById(user); + // 生成退款记录 String refundSn = refundRecordMapper.randMakeOrderSn("sn"); refundRecord = new RefundRecord(); diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/log/UserAccountLogMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/log/UserAccountLogMapper.java index 4cc5f547..8712a2fc 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/log/UserAccountLogMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/log/UserAccountLogMapper.java @@ -43,7 +43,7 @@ public interface UserAccountLogMapper extends IBaseMapper { Integer changeObject = AccountLogEnum.getChangeObject(changeType); - BigDecimal leftAmount = user.getUserMoney(); //.add(changeAmount); + BigDecimal leftAmount = user.getUserMoney().add(changeAmount); UserAccountLog logMoney = new UserAccountLog(); logMoney.setSn(this.randMakeOrderSn()); logMoney.setUserId(userId); @@ -82,7 +82,7 @@ public interface UserAccountLogMapper extends IBaseMapper { break; } - BigDecimal leftAmount = user.getUserMoney(); //.subtract(changeAmount); + BigDecimal leftAmount = user.getUserMoney().subtract(changeAmount); UserAccountLog logMoney = new UserAccountLog(); logMoney.setSn(this.randMakeOrderSn()); diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java index fa7ec63b..f0c058c8 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java @@ -359,10 +359,6 @@ public class PayServiceImpl implements IPayService { rechargeOrder.setUpdateTime(System.currentTimeMillis() / 1000); rechargeOrderMapper.updateById(rechargeOrder); - User user = userMapper.selectById(rechargeOrder.getUserId()); - user.setUserMoney(user.getUserMoney().add(rechargeOrder.getOrderAmount())); - user.setUpdateTime(System.currentTimeMillis() / 1000); - userMapper.updateById(user); logMoneyMapper.add(rechargeOrder.getUserId(), AccountLogEnum.UM_INC_RECHARGE.getCode(), @@ -370,6 +366,11 @@ public class PayServiceImpl implements IPayService { rechargeOrder.getId(), rechargeOrder.getSn(), "用户充值余额", null); + + User user = userMapper.selectById(rechargeOrder.getUserId()); + user.setUserMoney(user.getUserMoney().add(rechargeOrder.getOrderAmount())); + user.setUpdateTime(System.currentTimeMillis() / 1000); + userMapper.updateById(user); } } }