From 77c79f189d86a99595d2666faef135e64b7a627f Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Wed, 18 Dec 2024 17:52:38 +0800 Subject: [PATCH] refactor(test): 重构 AgentTest 类并添加新的测试方法 --- src/main/java/cc/mrbird/febs/mall/service/impl/RunVipServiceImpl.java | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 157 insertions(+), 15 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/RunVipServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/RunVipServiceImpl.java index 9310a62..2b15086 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/RunVipServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/RunVipServiceImpl.java @@ -1,33 +1,27 @@ package cc.mrbird.febs.mall.service.impl; import cc.mrbird.febs.common.entity.FebsResponse; +import cc.mrbird.febs.common.enumerates.FlowTypeEnum; import cc.mrbird.febs.common.enumerates.RunVipDataDictionaryEnum; +import cc.mrbird.febs.common.enumerates.RunVipMoneyFlowTypeEnum; import cc.mrbird.febs.common.enumerates.YesOrNoEnum; import cc.mrbird.febs.common.exception.FebsException; import cc.mrbird.febs.common.utils.LoginUserUtil; import cc.mrbird.febs.common.utils.MallUtils; import cc.mrbird.febs.mall.conversion.RunVipConversion; -import cc.mrbird.febs.mall.dto.ApiChargeListDto; -import cc.mrbird.febs.mall.dto.ApiGoChargeDto; -import cc.mrbird.febs.mall.dto.ApiGoChargeInfoDto; -import cc.mrbird.febs.mall.dto.ApiMemberChargeFailDto; -import cc.mrbird.febs.mall.entity.MallCharge; -import cc.mrbird.febs.mall.entity.MallMember; -import cc.mrbird.febs.mall.entity.MallMemberPayment; -import cc.mrbird.febs.mall.entity.RunVip; -import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper; -import cc.mrbird.febs.mall.mapper.MallChargeMapper; -import cc.mrbird.febs.mall.mapper.MallMemberPaymentMapper; -import cc.mrbird.febs.mall.mapper.RunVipMapper; +import cc.mrbird.febs.mall.dto.*; +import cc.mrbird.febs.mall.entity.*; +import cc.mrbird.febs.mall.mapper.*; import cc.mrbird.febs.mall.service.IRunVipService; -import cc.mrbird.febs.mall.vo.ApiChargeVo; -import cc.mrbird.febs.mall.vo.ApiGoChargeVo; -import cc.mrbird.febs.mall.vo.ApiRunVipVo; +import cc.mrbird.febs.mall.vo.*; import cc.mrbird.febs.rabbit.producter.AgentProducer; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.crypto.SecureUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -38,6 +32,9 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.IntStream; @Slf4j @Service @@ -48,6 +45,9 @@ private final MallMemberPaymentMapper mallMemberPaymentMapper; private final MallChargeMapper mallChargeMapper; private final AgentProducer agentProducer; + private final MallMoneyFlowMapper mallMoneyFlowMapper; + private final MallMemberWalletMapper mallMemberWalletMapper; + private final MallMemberMapper mallMemberMapper; @Override public List<ApiRunVipVo> vipInfo() { MallMember member = LoginUserUtil.getLoginUser(); @@ -72,7 +72,14 @@ public FebsResponse goCharge(ApiGoChargeDto apiGoChargeDto) { Long memberId = LoginUserUtil.getLoginUser().getId(); + MallMember mallMember = mallMemberMapper.selectById(memberId); + if (StrUtil.isBlank(mallMember.getTradePassword())) { + throw new FebsException("未设置资金密码"); + } + if (!mallMember.getTradePassword().equals(SecureUtil.md5(apiGoChargeDto.getTradeWord()))) { + throw new FebsException("资金密码错误"); + } Long runVipId = apiGoChargeDto.getRunVipId(); RunVip runVip = this.baseMapper.selectById(runVipId); if(runVip.getState() != YesOrNoEnum.YES.getValue()){ @@ -169,4 +176,139 @@ Page<ApiChargeVo> page = new Page<>(apiChargeListDto.getPageNum(), apiChargeListDto.getPageSize()); return mallChargeMapper.selectChargeListInPage(apiChargeListDto, page); } + + @Override + public List<ApiGetRunDateVo> getRunDate(ApiGetRunDateDto queryDto) { + + Long memberId = LoginUserUtil.getLoginUser().getId(); + DateTime dateTime = DateUtil.parseDate(queryDto.getDateStr()); + + DateTime startTime = DateUtil.beginOfMonth(dateTime); + DateTime endTime = DateUtil.endOfMonth(dateTime); + long between = DateUtil.between(startTime, endTime, DateUnit.DAY); + List<ApiGetRunDateVo> apiGetRunDateVos = generateDateList(startTime, between); + + List<MallMoneyFlow> mallMoneyFlows = mallMoneyFlowMapper.selectList( + new LambdaQueryWrapper<MallMoneyFlow>() + .eq(MallMoneyFlow::getMemberId, memberId) + .eq(MallMoneyFlow::getFlowType, FlowTypeEnum.SCORE.getValue()) + .eq(MallMoneyFlow::getType, RunVipMoneyFlowTypeEnum.SCORE_OUT_BALANCE.getValue()) + .ge(MallMoneyFlow::getCreatedTime, startTime) + .le(MallMoneyFlow::getCreatedTime, endTime) + ); + if(CollUtil.isNotEmpty(mallMoneyFlows)){ + calculateProfits(apiGetRunDateVos,mallMoneyFlows); + } + + return apiGetRunDateVos; + } + + /** + * 生成日期列表 + * + * @param startDate 开始日期 + * @param days 从开始日期算起的天数 + * @return 一个包含日期信息的ApiGetRunDateVo对象列表 + */ + private List<ApiGetRunDateVo> generateDateList(DateTime startDate, long days) { + // 使用IntStream生成从0到days(包含days)的整数流,表示每一天 + return IntStream.range(0, (int) days + 1) + // 将每个整数映射为一个ApiGetRunDateVo对象 + .mapToObj(i -> { + // 创建ApiGetRunDateVo对象 + ApiGetRunDateVo apiGetRunDateVo = new ApiGetRunDateVo(); + // 计算日期:从起始日期开始偏移i天 + DateTime dateTime = DateUtil.offsetDay(startDate, i); + // 格式化日期为"yyyy-MM-dd"字符串,并设置到对象中 + apiGetRunDateVo.setDateStr(DateUtil.format(dateTime, "yyyy-MM-dd")); + // 初始化碳积分为0 + apiGetRunDateVo.setScore(BigDecimal.ZERO); + // 返回构建好的对象 + return apiGetRunDateVo; + }) + // 将流中的对象收集到一个列表中 + .collect(Collectors.toList()); + } + /** + * 计算每日累计碳积分 + * + * @param dateList 日期列表,包含了每日的碳积分信息 + * @param mallMoneyFlows 商城资金流列表,包含了每笔碳积分信息 + */ + private void calculateProfits(List<ApiGetRunDateVo> dateList, List<MallMoneyFlow> mallMoneyFlows) { + // 将日期列表转换为映射,以便通过日期快速访问每日碳积分信息 + Map<String, ApiGetRunDateVo> dateMap = dateList.stream() + .collect(Collectors.toMap(ApiGetRunDateVo::getDateStr, vo -> vo)); + + // 遍历mallMoneyFlows + for (MallMoneyFlow item : mallMoneyFlows) { + // 格式化当前项的创建时间,提取日期 + String date = DateUtil.format(item.getCreatedTime(), "yyyy-MM-dd"); + // 从日期映射中获取对应的每日碳积分信息 + ApiGetRunDateVo apiGetRunDateVo = dateMap.get(date); + // 如果找到了对应的每日碳积分信息 + if (apiGetRunDateVo != null) { + // 获取当前日期的碳积分 + BigDecimal score = apiGetRunDateVo.getScore(); + // 计算新的碳积分,将碳积分与碳积分相加,并向下取整到个位数 + BigDecimal profit = score.add(item.getAmount().abs()).setScale(0,BigDecimal.ROUND_DOWN); + // 更新每日碳积分信息的利润值 + apiGetRunDateVo.setScore(profit); + } + } + } + + @Override + public ApiRunDataVo runData() { + Long memberId = LoginUserUtil.getLoginUser().getId(); + ApiRunDataVo apiRunDataVo = new ApiRunDataVo(); + MallMember mallMember = mallMemberMapper.selectById(memberId); + String level = mallMember.getLevel(); + RunVip runVip = this.baseMapper.selectOne(new LambdaQueryWrapper<RunVip>().eq(RunVip::getVipCode, level)); + apiRunDataVo.setAimScore(runVip.getGrowthCnt()); + + List<MallMoneyFlow> mallMoneyFlows = mallMoneyFlowMapper.selectList( + new LambdaQueryWrapper<MallMoneyFlow>() + .eq(MallMoneyFlow::getMemberId, memberId) + .eq(MallMoneyFlow::getFlowType, FlowTypeEnum.SCORE.getValue()) + .in(MallMoneyFlow::getType, RunVipMoneyFlowTypeEnum.GET_SCORE.getValue(),RunVipMoneyFlowTypeEnum.SYS_SCORE.getValue()) + .ge(MallMoneyFlow::getCreatedTime, DateUtil.beginOfDay(DateUtil.date())) + .le(MallMoneyFlow::getCreatedTime, DateUtil.endOfDay(DateUtil.date())) + ); + if(CollUtil.isNotEmpty(mallMoneyFlows)){ + BigDecimal reduce = mallMoneyFlows.stream().map(MallMoneyFlow::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add); + apiRunDataVo.setScore(reduce.intValue()); + } + + MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(memberId); + apiRunDataVo.setBalance(mallMemberWallet.getBalance()); + apiRunDataVo.setRealScore(mallMemberWallet.getScore().intValue()); + return apiRunDataVo; + } + + @Override + public ApiRunHealthVo runHealth() { + Long memberId = LoginUserUtil.getLoginUser().getId(); + ApiRunHealthVo apiRunHealthVo = new ApiRunHealthVo(); + + MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(memberId); + int realScore = mallMemberWallet.getScore().intValue(); + apiRunHealthVo.setScore(realScore); + List<MallMoneyFlow> mallMoneyFlows = mallMoneyFlowMapper.selectList( + new LambdaQueryWrapper<MallMoneyFlow>() + .eq(MallMoneyFlow::getMemberId, memberId) + .eq(MallMoneyFlow::getFlowType, FlowTypeEnum.SCORE.getValue()) + .in(MallMoneyFlow::getType, RunVipMoneyFlowTypeEnum.GET_SCORE.getValue(),RunVipMoneyFlowTypeEnum.SYS_SCORE.getValue()) + .ge(MallMoneyFlow::getCreatedTime, DateUtil.beginOfDay(DateUtil.date())) + .le(MallMoneyFlow::getCreatedTime, DateUtil.endOfDay(DateUtil.date())) + ); + if(CollUtil.isNotEmpty(mallMoneyFlows)){ + BigDecimal reduce = mallMoneyFlows.stream().map(MallMoneyFlow::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add); + if(reduce.intValue() > realScore){ + apiRunHealthVo.setScoreUsed(reduce.intValue() - realScore); + apiRunHealthVo.setScoreTotal(reduce.intValue()); + } + } + return apiRunHealthVo; + } } -- Gitblit v1.9.1