diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/card/CardApiImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/card/CardApiImpl.java index 0c229a38..d6636ede 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/card/CardApiImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/card/CardApiImpl.java @@ -19,8 +19,7 @@ import java.math.BigDecimal; */ @Service public class CardApiImpl implements CardApi{ - @Resource - private CardService cardService; + @Resource private RechargeAmountService rechargeAmountService; @Resource diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/card/CardServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/card/CardServiceImpl.java index 51c0a022..a2c255cc 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/card/CardServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/card/CardServiceImpl.java @@ -428,13 +428,7 @@ public class CardServiceImpl implements CardService { @Override public BigDecimal getCashMoney(Long userId) { - CardDO lastCardDO = cardMapper.selectOne(Wrappers.lambdaQuery().eq(CardDO::getUserId, userId) - .orderByDesc(CardDO::getCreateTime).orderByDesc(CardDO::getId) - .last(MemberConstants.LIMIT_ONE)); - if (ObjectUtil.isNotEmpty(lastCardDO)) { - return lastCardDO.getCashAmount(); - } - return BigDecimal.ZERO; + return amountService.getCashAmount(userId); } @Override diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesServiceImpl.java index dfbb1d3c..f7cefab8 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesServiceImpl.java @@ -200,7 +200,7 @@ public class DiningPlatesServiceImpl implements DiningPlatesService { checkOrder(memberUserDO.getId()); //余额验证 - BigDecimal money = cardService.getMoneyByUserId(memberUserDO.getId()); + BigDecimal money = memberUserDO.getMoney(); checkMoney(money); diningPlatesDO.setUserId(memberUserDO.getId()); @@ -251,7 +251,7 @@ public class DiningPlatesServiceImpl implements DiningPlatesService { //订单验证 checkOrder(memberUserDO.getId()); //余额验证 - BigDecimal money = cardService.getMoneyByUserId(memberUserDO.getId()); + BigDecimal money = memberUserDO.getMoney(); checkMoney(money); diningPlatesDO.setUserId(memberUserDO.getId()); @@ -307,7 +307,7 @@ public class DiningPlatesServiceImpl implements DiningPlatesService { MemberUserDO memberUserDO = memberUserMapper.selectById(diningPlatesDO.getUserId()); appUserInfoCardVO.setName(memberUserDO.getNickname()); - appUserInfoCardVO.setMoney(cardService.getMoneyByUserId(memberUserDO.getId())); + appUserInfoCardVO.setMoney(memberUserDO.getMoney()); //刷新绑定时间 asyncService.flashTime(diningPlatesDO); @@ -457,7 +457,7 @@ public class DiningPlatesServiceImpl implements DiningPlatesService { .eq(DiningPlatesDO::getDiningPlatesNum, diningPlatesNum) .eq(DiningPlatesDO::getStoreId,storeId) .last("limit 1")); - BigDecimal moneyByUserId = cardService.getMoneyByUserId(diningPlatesDO.getUserId()); +// BigDecimal moneyByUserId = cardService.getMoneyByUserId(diningPlatesDO.getUserId()); MemberUserDO memberUserDO = memberUserMapper.selectById(diningPlatesDO.getUserId()); DishesRespDto dish = dishesApi.getDish(dishId); @@ -466,7 +466,7 @@ public class DiningPlatesServiceImpl implements DiningPlatesService { appUserInfo.setNickname(StrUtil.isNotBlank(memberUserDO.getName())?memberUserDO.getName():memberUserDO.getNickname()) .setDishesName(dish.getDishesName()) .setDishesBasePrice(dish.getDishesBasePrice()).setDishesSumPrice(dish.getDishesSumPrice()) - .setMoney(moneyByUserId).setOrderMoney(new BigDecimal(stringRedisTemplate.opsForValue().get(diningPlatesNum+"-"+storeId))); + .setMoney(memberUserDO.getMoney()).setOrderMoney(new BigDecimal(stringRedisTemplate.opsForValue().get(diningPlatesNum+"-"+storeId))); return appUserInfo; }