zt/canteen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
zt
2025-01-10 14:53:47 +08:00
parent af67ff401b
commit fed32ee0ea
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/amount/DeductionServiceImpl.java
View File

@ -469,15 +469,15 @@ public class DeductionServiceImpl implements DeductionService {
synchronized (getUserLock(userId)) { synchronized (getUserLock(userId)) {
MemberUserDO user = userService.getUser(userId); MemberUserDO user = userService.getUser(userId);
MoneyDO moneyDO = moneyService.getMoney(userId, storeId); MoneyDO moneyDO = moneyService.getMoney(userId, storeId);
BigDecimal total = moneyDO.getCashAmount().add(user.getWxAmount()).add(user.getGiftAmount());
if (total.compareTo(money) < 0) {
if (user.getMoney().compareTo(money) < 0) {
if (CHECK_LIST.contains(type)) { if (CHECK_LIST.contains(type)) {
throw exception(CASH_AMOUNT_NOT_ENOUGH); throw exception(CASH_AMOUNT_NOT_ENOUGH);
} }
user.setWxAmount(BigDecimal.ZERO); user.setWxAmount(BigDecimal.ZERO);
moneyDO.setCashAmount(BigDecimal.ZERO); moneyDO.setCashAmount(BigDecimal.ZERO);
user.setGiftAmount(BigDecimal.ZERO); user.setGiftAmount(BigDecimal.ZERO);
moneyDO.setDebtAmount(total.subtract(money));
} else { } else {
BigDecimal wxAmount = user.getWxAmount(); BigDecimal wxAmount = user.getWxAmount();
BigDecimal giftAmount = user.getGiftAmount(); BigDecimal giftAmount = user.getGiftAmount();