优化
This commit is contained in:
@ -1,7 +1,6 @@
|
|||||||
package cn.iocoder.yudao.module.member.service.card;
|
package cn.iocoder.yudao.module.member.service.card;
|
||||||
|
|
||||||
import cn.hutool.core.collection.CollectionUtil;
|
import cn.hutool.core.collection.CollectionUtil;
|
||||||
import cn.hutool.core.math.Money;
|
|
||||||
import cn.hutool.core.util.ObjectUtil;
|
import cn.hutool.core.util.ObjectUtil;
|
||||||
import cn.iocoder.yudao.framework.common.exception.ServiceException;
|
import cn.iocoder.yudao.framework.common.exception.ServiceException;
|
||||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
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.refund.IntegralRefundMapper;
|
||||||
import cn.iocoder.yudao.module.member.dal.mysql.refundlog.RefundLogMapper;
|
import cn.iocoder.yudao.module.member.dal.mysql.refundlog.RefundLogMapper;
|
||||||
import cn.iocoder.yudao.module.member.enums.CostTypeEnum;
|
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 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.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
@ -42,7 +39,11 @@ import java.time.LocalDateTime;
|
|||||||
import java.time.LocalTime;
|
import java.time.LocalTime;
|
||||||
import java.time.YearMonth;
|
import java.time.YearMonth;
|
||||||
import java.time.format.DateTimeFormatter;
|
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 java.util.stream.Collectors;
|
||||||
|
|
||||||
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
|
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
|
||||||
@ -125,7 +126,7 @@ public class CardServiceImpl implements CardService {
|
|||||||
@Override
|
@Override
|
||||||
public Boolean recharge(BigDecimal money, String flag, BigDecimal giftMoney,Long userId) {
|
public Boolean recharge(BigDecimal money, String flag, BigDecimal giftMoney,Long userId) {
|
||||||
//获取最新余额
|
//获取最新余额
|
||||||
CardDO lastCardDO = getLastCardDO();
|
CardDO lastCardDO = getLastCardDO(userId);
|
||||||
CardDO cardDO = new CardDO();
|
CardDO cardDO = new CardDO();
|
||||||
cardDO.setUserId(userId);
|
cardDO.setUserId(userId);
|
||||||
cardDO.setFlag(flag);
|
cardDO.setFlag(flag);
|
||||||
@ -217,6 +218,14 @@ public class CardServiceImpl implements CardService {
|
|||||||
return lastCardDO;
|
return lastCardDO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public CardDO getLastCardDO(Long userId) {
|
||||||
|
CardDO lastCardDO = cardMapper.selectOne(Wrappers.<CardDO>lambdaQuery().eq(CardDO::getUserId,userId)
|
||||||
|
.orderByDesc(CardDO::getCreateTime)
|
||||||
|
.orderByDesc(CardDO::getId)
|
||||||
|
.last(MemberConstants.LIMIT_ONE));
|
||||||
|
return lastCardDO;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void insertBatch(List<CardDO> list) {
|
public void insertBatch(List<CardDO> list) {
|
||||||
|
Reference in New Issue
Block a user