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 4882f8d9..95cb7405 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 @@ -1,7 +1,6 @@ package cn.iocoder.yudao.module.member.service.card; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.math.Money; import cn.hutool.core.util.ObjectUtil; import cn.iocoder.yudao.framework.common.exception.ServiceException; import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -25,9 +24,7 @@ import cn.iocoder.yudao.module.member.dal.mysql.rechargelog.RechargeLogMapper; import cn.iocoder.yudao.module.member.dal.mysql.refund.IntegralRefundMapper; import cn.iocoder.yudao.module.member.dal.mysql.refundlog.RefundLogMapper; import cn.iocoder.yudao.module.member.enums.CostTypeEnum; -import cn.iocoder.yudao.module.member.service.refund.RefundService; import cn.iocoder.yudao.module.member.util.MemberConstants; -import com.alibaba.druid.sql.visitor.functions.Left; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -42,7 +39,11 @@ import java.time.LocalDateTime; import java.time.LocalTime; import java.time.YearMonth; import java.time.format.DateTimeFormatter; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; @@ -125,7 +126,7 @@ public class CardServiceImpl implements CardService { @Override public Boolean recharge(BigDecimal money, String flag, BigDecimal giftMoney,Long userId) { //获取最新余额 - CardDO lastCardDO = getLastCardDO(); + CardDO lastCardDO = getLastCardDO(userId); CardDO cardDO = new CardDO(); cardDO.setUserId(userId); cardDO.setFlag(flag); @@ -217,6 +218,14 @@ public class CardServiceImpl implements CardService { return lastCardDO; } + public CardDO getLastCardDO(Long userId) { + CardDO lastCardDO = cardMapper.selectOne(Wrappers.lambdaQuery().eq(CardDO::getUserId,userId) + .orderByDesc(CardDO::getCreateTime) + .orderByDesc(CardDO::getId) + .last(MemberConstants.LIMIT_ONE)); + return lastCardDO; + } + @Override public void insertBatch(List list) {