From 288e2a2ca2e7c2f7158507174a42f8a417380d23 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Tue, 17 Dec 2024 18:03:35 +0800 Subject: [PATCH] feat(mall): 实现 VIP购买功能 --- src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 451 +++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 376 insertions(+), 75 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java index 75eb752..9603404 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java @@ -1,10 +1,7 @@ package cc.mrbird.febs.mall.service.impl; import cc.mrbird.febs.common.entity.FebsResponse; -import cc.mrbird.febs.common.enumerates.DataDictionaryEnum; -import cc.mrbird.febs.common.enumerates.FlowTypeEnum; -import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum; -import cc.mrbird.febs.common.enumerates.ScoreFlowTypeEnum; +import cc.mrbird.febs.common.enumerates.*; import cc.mrbird.febs.common.exception.FebsException; import cc.mrbird.febs.common.properties.XcxProperties; import cc.mrbird.febs.common.utils.*; @@ -24,6 +21,7 @@ import cc.mrbird.febs.vip.mapper.MallVipConfigMapper; import cn.hutool.core.bean.BeanUtil; 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.IdUtil; @@ -84,9 +82,11 @@ private final MallGoodsMapper mallGoodsMapper; private final MallVipConfigMapper mallVipConfigMapper; + private final RunVipMapper runVipMapper; private final MallStoreMapper mallStoreMapper; private final MallStoreItemMapper mallStoreItemMapper; private final MallStoreMemberMapper mallStoreMemberMapper; + private final MallMemberWithdrawMapper mallMemberWithdrawMapper; @Value("${spring.profiles.active}") @@ -177,10 +177,10 @@ mallMember.setReferrerIds(ids); } //会员VIP等级 - List<MallVipConfig> configs = mallVipConfigMapper.selectVipConfigList(); - if (StrUtil.isBlank(mallMember.getLevel()) && CollUtil.isNotEmpty(configs)) { - MallVipConfig mallVipConfig = configs.get(0); - mallMember.setLevel(mallVipConfig.getCode()); + List<RunVip> runVips = runVipMapper.selectList(new LambdaQueryWrapper<RunVip>().orderByAsc(RunVip::getOrderNumber)); + if (StrUtil.isBlank(mallMember.getLevel()) && CollUtil.isNotEmpty(runVips)) { + RunVip runVip = runVips.get(0); + mallMember.setLevel(runVip.getVipCode()); } this.baseMapper.updateById(mallMember); @@ -269,48 +269,46 @@ public FebsResponse findMemberInfo() { Long id = LoginUserUtil.getLoginUser().getId(); MallMember mallMember = this.baseMapper.selectById(id); - MallMemberVo mallMemberVo = MallMemberConversion.INSTANCE.entityToVo(mallMember); - if(StrUtil.isNotEmpty(mallMember.getReferrerId())){ - MallMember referMember = this.baseMapper.selectInfoByInviteId(mallMember.getReferrerId()); - if (referMember != null) { - mallMemberVo.setReferrerName(referMember.getName()); - } - } - if (StrUtil.isNotBlank(mallMember.getTradePassword())) { - mallMemberVo.setHasTradePwd(1); - } + mallMemberVo.setTradeWord(StrUtil.isEmpty(mallMember.getTradePassword()) ? YesOrNoEnum.NO.getValue() : YesOrNoEnum.YES.getValue()); - MallMemberPayment payment = mallMemberPaymentMapper.selectByMemberId(id); - if (payment != null) { - mallMemberVo.setHasPayment(1); - } - - MemberCollectionListDto memberCollectionListDto = new MemberCollectionListDto(); - memberCollectionListDto.setPageNow(1); - memberCollectionListDto.setPageSize(10); - List<CollectionListVo> collectionList = mallMemberCollectionService.findMemberCollectionList(memberCollectionListDto); - mallMemberVo.setCollectionCnt(CollUtil.isNotEmpty(collectionList) ? collectionList.size() : 0); - - MemberFootprintListDto memberFootprintListDto = new MemberFootprintListDto(); - memberFootprintListDto.setPageNow(1); - memberFootprintListDto.setPageSize(10); - List<FootprintListVo> footprintList = mallMemberFootprintService.findMemberFootprintList(memberFootprintListDto); - mallMemberVo.setFootprintCnt(CollUtil.isNotEmpty(footprintList) ? footprintList.size() : 0); - - List<MallMember> mallMembers = this.baseMapper.selectByRefererId(mallMember.getInviteId()); - mallMemberVo.setChildCnt(CollUtil.isNotEmpty(mallMembers) ? mallMembers.size() : 0); + RunVip runVip = runVipMapper.selectOne(new LambdaQueryWrapper<RunVip>().eq(RunVip::getVipCode, mallMemberVo.getLevel())); + mallMemberVo.setLevelName(runVip.getVipName()); + mallMemberVo.setLevelPng(runVip.getVipPng()); MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(mallMemberVo.getId()); - - MallVipConfig mallVipConfig = mallVipConfigMapper.selectVipConfigByCode(mallMember.getLevel()); - - mallMemberVo.setVipInfo(mallVipConfig); mallMemberVo.setBalance(wallet.getBalance()); -// mallMemberVo.setScore(wallet.getScore()); - mallMemberVo.setPrizeScore(wallet.getPrizeScore()); -// mallMemberVo.setTotalCost(mallOrderInfoMapper.selectTotalAmount(id)); + mallMemberVo.setScore(wallet.getScore()); + + mallMemberVo.setMinScore( + new BigDecimal( + dataDictionaryCustomMapper.selectDicDataByTypeAndCode( + RunVipDataDictionaryEnum.RUN_VIP_SCORE_MIN.getType(), + RunVipDataDictionaryEnum.RUN_VIP_SCORE_MIN.getCode()).getValue() + ).setScale(0,BigDecimal.ROUND_DOWN) + ); + mallMemberVo.setScoreBalance( + new BigDecimal( + dataDictionaryCustomMapper.selectDicDataByTypeAndCode( + RunVipDataDictionaryEnum.RUN_VIP_SCORE_TO_BALANCE.getType(), + RunVipDataDictionaryEnum.RUN_VIP_SCORE_TO_BALANCE.getCode()).getValue() + ).setScale(2, BigDecimal.ROUND_DOWN) + ); + mallMemberVo.setBalanceCoin( + new BigDecimal( + dataDictionaryCustomMapper.selectDicDataByTypeAndCode( + RunVipDataDictionaryEnum.RUN_VIP_BALANCE_TO_COIN.getType(), + RunVipDataDictionaryEnum.RUN_VIP_BALANCE_TO_COIN.getCode()).getValue() + ).setScale(2, BigDecimal.ROUND_DOWN) + ); + mallMemberVo.setBalanceCoinPercent( + new BigDecimal( + dataDictionaryCustomMapper.selectDicDataByTypeAndCode( + RunVipDataDictionaryEnum.RUN_VIP_BALANCE_TO_COIN_PERCENT.getType(), + RunVipDataDictionaryEnum.RUN_VIP_BALANCE_TO_COIN_PERCENT.getCode()).getValue() + ).setScale(4, BigDecimal.ROUND_DOWN) + ); return new FebsResponse().success().data(mallMemberVo); } @@ -375,17 +373,67 @@ } else { memberId = teamListDto.getId(); } - MallMember mallMember = this.baseMapper.selectById(memberId); - - List<TeamListVo> list = this.baseMapper.selectTeamListByInviteId(mallMember.getInviteId()); - + /** + * 直属三级 + */ MyTeamVo myTeamVo = new MyTeamVo(); - myTeamVo.setTeam(list); - myTeamVo.setMyAchieve(this.mallOrderInfoMapper.selectAmountOrTeamAmount(mallMember.getInviteId(), 1)); - myTeamVo.setMyTeamAchieve(this.mallOrderInfoMapper.selectAmountOrTeamAmount(mallMember.getInviteId(), 2)); - myTeamVo.setMyTeamCnt(this.baseMapper.selectAllChildAgentListByInviteId(mallMember.getInviteId()).size()); + //获取个人的碳币 + MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(memberId); + myTeamVo.setMyBalance(mallMemberWallet.getBalance()); + //全部直推 + List<MallMember> mallMembers = this.baseMapper.selectByRefererId(mallMember.getInviteId()); + /** + * 如果没有下级,那么直接返回当前用户的信息 + */ + if(CollUtil.isEmpty(mallMembers)){ + myTeamVo.setMyTeamCnt(0); + myTeamVo.setMyTeamBalance(BigDecimal.ZERO); + myTeamVo.setTeam(null); + return new FebsResponse().success().data(myTeamVo); + } + /** + * 如果有下级,获取所有的团队 + */ + myTeamVo.setMyTeamCnt(mallMembers.size()); + myTeamVo.setMyTeamBalance(getTeamBalance(mallMembers)); + + List<TeamListVo> teamListVos = MallMemberConversion.INSTANCE.entityToTeamListVos(mallMembers); + teamListVos.forEach(item -> { + item.setMyBalance(mallMemberWalletMapper.selectWalletByMemberId(item.getId()).getBalance()); + item.setLevelName(runVipMapper.selectOne(new LambdaQueryWrapper<RunVip>().eq(RunVip::getVipCode,item.getLevel())).getVipName()); + List<MallMember> mallMemberRefs = this.baseMapper.selectByRefererId(item.getInviteId()); + if(CollUtil.isEmpty(mallMemberRefs)){ + item.setMyTeamCnt(0); + item.setMyTeamBalance(BigDecimal.ZERO); + }else{ + item.setMyTeamCnt(mallMemberRefs.size()); + //获取mallMembers的所有id + myTeamVo.setMyTeamBalance(getTeamBalance(mallMemberRefs)); + } + }); + + return new FebsResponse().success().data(myTeamVo); + } + + /** + * 获取团队余额 + * 该方法计算一组商城成员的总余额 + * 它首先提取成员ID,然后查询这些成员的钱包信息,并计算钱包余额的总和 + * + * @param mallMembers 商城成员列表,用于计算总余额 + * @return 团队的总余额,表示为BigDecimal类型 + */ + private BigDecimal getTeamBalance(List<MallMember> mallMembers) { + // 提取所有商城成员的ID,以便进行后续的钱包信息查询 + List<Long> ids = mallMembers.stream().map(MallMember::getId).collect(Collectors.toList()); + + // 根据成员ID列表查询所有相关成员的钱包信息 + List<MallMemberWallet> mallMemberWallets = mallMemberWalletMapper.selectList(new LambdaQueryWrapper<MallMemberWallet>().in(MallMemberWallet::getMemberId, ids)); + + // 计算所有成员钱包余额的总和,并返回该总和 + return mallMemberWallets.stream().map(MallMemberWallet::getBalance).reduce(BigDecimal.ZERO, BigDecimal::add); } @Override @@ -399,12 +447,6 @@ Long id = LoginUserUtil.getLoginUser().getId(); moneyFlowDto.setMemberId(id); IPage<MoneyFlowVo> pages = mallMoneyFlowMapper.selectApiMoneyFlowInPage(page, moneyFlowDto); - - if (moneyFlowDto.getFlowType() == 3) { - pages.getRecords().forEach(item -> { - item.setDescription(ScoreFlowTypeEnum.getDescByValue(item.getType())); - }); - } return new FebsResponse().success().data(pages); } @@ -423,55 +465,265 @@ mallMoneyFlowMapper.insert(flow); } + /** + * 处理VIP资金流水添加操作 + * 此方法用于在会员进行充值或扣费活动时,记录相应的资金流水信息 + * + * @param memberId 会员ID,标识进行资金操作的会员 + * @param rtMemberId 实体会员ID,用于关联现实中的会员身份 + * @param orderNo 订单编号,用于跟踪资金流水的来源订单 + * @param flowType 流水类型,指示资金流入或流出 + * @param type 交易类型,区分不同的交易场景 + * @param amount 金额,本次操作涉及的资金量 + * @param description 描述,简述本次资金操作的原因或场景 + * @param status 状态,表示资金操作的当前状态 + */ + @Override + public void runVipMoneyFlowAdd(Long memberId, Long rtMemberId, String orderNo,Integer flowType, Integer type, BigDecimal amount, String description, Integer status) { + // 创建一个新的商城资金流水对象 + MallMoneyFlow flow = new MallMoneyFlow(); + + // 设置资金流水的各项属性 + flow.setMemberId(memberId); + flow.setRtMemberId(rtMemberId); + flow.setOrderNo(orderNo); + flow.setFlowType(flowType); + flow.setType(type); + flow.setAmount(amount); + flow.setDescription(description); + flow.setStatus(status); + + // 插入资金流水记录到数据库 + mallMoneyFlowMapper.insert(flow); + } + @Override @Transactional(rollbackFor = Exception.class) public void transfer(TransferDto transferDto) { + Long memberId = LoginUserUtil.getLoginUser().getId(); MallMember mallMember = this.baseMapper.selectInfoByAccount(transferDto.getAccount()); if (mallMember == null) { throw new FebsException("用户不存在"); } - - Long memberId = LoginUserUtil.getLoginUser().getId(); MallMember loginMember = this.baseMapper.selectById(memberId); + + /** + * 用户的等级level是否允许兑换碳币 + */ + RunVip runVip = runVipMapper.selectOne(new LambdaQueryWrapper<RunVip>().eq(RunVip::getVipCode, loginMember.getLevel())); + if(ObjectUtil.isEmpty(runVip) || runVip.getChangeState() != YesOrNoEnum.YES.getValue()){ + throw new FebsException("请先升级会员"); + } if (loginMember.getPhone().equals(transferDto.getAccount()) || loginMember.getInviteId().equals(transferDto.getAccount())) { throw new FebsException("不能给自己转账"); } if (StrUtil.isBlank(loginMember.getTradePassword())) { - throw new FebsException("未设置支付密码"); + throw new FebsException("未设置资金密码"); } if (!loginMember.getTradePassword().equals(SecureUtil.md5(transferDto.getTradePwd()))) { - throw new FebsException("支付密码错误"); + throw new FebsException("资金密码错误"); } - walletService.reduceBalance(transferDto.getAmount(), memberId); - String orderNo = MallUtils.getOrderNum("T"); - this.addMoneyFlow(memberId, transferDto.getAmount().negate(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, mallMember.getId(), null, FlowTypeEnum.BALANCE.getValue()); - + walletService.reduceBalance(transferDto.getAmount(), loginMember.getId()); + String orderNo = MallUtils.getOrderNum("HZ"); + this.runVipMoneyFlowAdd( + loginMember.getId(), + mallMember.getId(), + orderNo, + FlowTypeEnum.BALANCE.getValue(), + RunVipMoneyFlowTypeEnum.BALANCE_OUT_GIVE_FRIEND.getValue(), + transferDto.getAmount().negate(), + StrUtil.format(RunVipMoneyFlowTypeEnum.BALANCE_OUT_GIVE_FRIEND.getDescription(),mallMember.getInviteId(),transferDto.getAmount()), + YesOrNoEnum.YES.getValue() + ); walletService.addBalance(transferDto.getAmount(), mallMember.getId()); - this.addMoneyFlow(mallMember.getId(), transferDto.getAmount(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, memberId, null, FlowTypeEnum.BALANCE.getValue()); + + this.runVipMoneyFlowAdd( + mallMember.getId(), + loginMember.getId(), + orderNo, + FlowTypeEnum.BALANCE.getValue(), + RunVipMoneyFlowTypeEnum.BALANCE_IN_GIVE_FRIEND.getValue(), + transferDto.getAmount(), + StrUtil.format(RunVipMoneyFlowTypeEnum.BALANCE_IN_GIVE_FRIEND.getDescription(),loginMember.getInviteId(),transferDto.getAmount()), + YesOrNoEnum.YES.getValue() + ); } @Override - public void setPayment(MallMemberPayment mallMemberPayment) { - MallMember member = LoginUserUtil.getLoginUser(); + public void withdrawal(WithdrawalDto withdrawalDto) { + Long memberId = LoginUserUtil.getLoginUser().getId(); + MallMember loginMember = this.baseMapper.selectById(memberId); + /** + * 用户的等级level是否允许兑换碳币 + */ + RunVip runVip = runVipMapper.selectOne(new LambdaQueryWrapper<RunVip>().eq(RunVip::getVipCode, loginMember.getLevel())); + if(ObjectUtil.isEmpty(runVip) || runVip.getWithdrawState() != YesOrNoEnum.YES.getValue()){ + throw new FebsException("请先升级会员"); + } - MallMemberPayment exist = mallMemberPaymentMapper.selectByMemberId(member.getId()); - if (exist == null) { + if (StrUtil.isBlank(loginMember.getTradePassword())) { + throw new FebsException("未设置资金密码"); + } + + if (!loginMember.getTradePassword().equals(SecureUtil.md5(withdrawalDto.getTradePwd()))) { + throw new FebsException("资金密码错误"); + } + + MallMemberPayment mallMemberPayment = mallMemberPaymentMapper.selectById(withdrawalDto.getAddressId()); + if (mallMemberPayment == null) { + throw new FebsException("无效的提现地址"); + } + BigDecimal minCnt = new BigDecimal( + dataDictionaryCustomMapper.selectDicDataByTypeAndCode( + RunVipDataDictionaryEnum.RUN_VIP_BALANCE_TO_COIN_MIN.getType(), + RunVipDataDictionaryEnum.RUN_VIP_BALANCE_TO_COIN_MIN.getCode()).getValue() + ).setScale(4, BigDecimal.ROUND_DOWN); + if(minCnt.compareTo(withdrawalDto.getAmount()) > 0){ + throw new FebsException(minCnt+"碳币起提"); + } + + BigDecimal balanceToCoin = new BigDecimal( + dataDictionaryCustomMapper.selectDicDataByTypeAndCode( + RunVipDataDictionaryEnum.RUN_VIP_BALANCE_TO_COIN.getType(), + RunVipDataDictionaryEnum.RUN_VIP_BALANCE_TO_COIN.getCode()).getValue() + ).setScale(2, BigDecimal.ROUND_DOWN); + BigDecimal balanceToCoinPercent = new BigDecimal( + dataDictionaryCustomMapper.selectDicDataByTypeAndCode( + RunVipDataDictionaryEnum.RUN_VIP_BALANCE_TO_COIN_PERCENT.getType(), + RunVipDataDictionaryEnum.RUN_VIP_BALANCE_TO_COIN_PERCENT.getCode()).getValue() + ).setScale(4, BigDecimal.ROUND_DOWN); + /** + * 减少碳币,增加进行中提现记录 + */ + BigDecimal withdrawalAmount = withdrawalDto.getAmount().multiply(balanceToCoin).setScale(2, BigDecimal.ROUND_DOWN); + BigDecimal fee = balanceToCoinPercent.multiply(withdrawalAmount).setScale(2, BigDecimal.ROUND_DOWN); + BigDecimal withdrawalAmountReal = withdrawalAmount.subtract(fee); + String orderNo = MallUtils.getOrderNum("TX"); + MallMemberWithdraw withdraw = new MallMemberWithdraw(); + withdraw.setWithdrawNo(orderNo); + withdraw.setMemberId(loginMember.getId()); + withdraw.setAmount(withdrawalAmountReal); + withdraw.setStatus(YesOrNoEnum.ING.getValue()); + withdraw.setAmountFee(fee); + withdraw.setName(mallMemberPayment.getBank()); + withdraw.setType(mallMemberPayment.getBankNo()); + mallMemberWithdrawMapper.insert(withdraw); + + walletService.reduceBalance(withdrawalDto.getAmount(), loginMember.getId()); + this.runVipMoneyFlowAdd( + loginMember.getId(), + loginMember.getId(), + orderNo, + FlowTypeEnum.BALANCE.getValue(), + RunVipMoneyFlowTypeEnum.BALANCE_OUT.getValue(), + withdrawalDto.getAmount().negate(), + StrUtil.format(RunVipMoneyFlowTypeEnum.BALANCE_OUT.getDescription(),withdrawalDto.getAmount(),withdrawalAmount,fee), + YesOrNoEnum.ING.getValue() + ); + + } + + @Override + public void commissionChange(CommissionChangeDto commissionChange) { + Long memberId = LoginUserUtil.getLoginUser().getId(); + BigDecimal minScore = new BigDecimal( + dataDictionaryCustomMapper.selectDicDataByTypeAndCode( + RunVipDataDictionaryEnum.RUN_VIP_SCORE_MIN.getType(), + RunVipDataDictionaryEnum.RUN_VIP_SCORE_MIN.getCode()).getValue() + ).setScale(0, BigDecimal.ROUND_DOWN); + if(minScore.compareTo(commissionChange.getAmount()) > 0){ + throw new FebsException("碳积分不足"+minScore); + } + + MallMember loginMember = this.baseMapper.selectById(memberId); + if (StrUtil.isBlank(loginMember.getTradePassword())) { + throw new FebsException("未设置资金密码"); + } + if (!loginMember.getTradePassword().equals(SecureUtil.md5(commissionChange.getTradePwd()))) { + throw new FebsException("资金密码错误"); + } + /** + * 用户的等级level是否允许兑换碳币 + */ + RunVip runVip = runVipMapper.selectOne(new LambdaQueryWrapper<RunVip>().eq(RunVip::getVipCode, loginMember.getLevel())); + if(ObjectUtil.isEmpty(runVip) || runVip.getChangeState() != YesOrNoEnum.YES.getValue()){ + throw new FebsException("请先升级会员"); + } + + BigDecimal scoreBalancePercent = new BigDecimal( + dataDictionaryCustomMapper.selectDicDataByTypeAndCode( + RunVipDataDictionaryEnum.RUN_VIP_SCORE_TO_BALANCE.getType(), + RunVipDataDictionaryEnum.RUN_VIP_SCORE_TO_BALANCE.getCode()).getValue() + ).setScale(2, BigDecimal.ROUND_DOWN); + BigDecimal score = commissionChange.getAmount(); + BigDecimal balance = commissionChange.getAmount().multiply(scoreBalancePercent).setScale(2, BigDecimal.ROUND_DOWN); + + walletService.reduceScore(score, loginMember.getId()); + String orderNo = MallUtils.getOrderNum("DH"); + this.runVipMoneyFlowAdd( + loginMember.getId(), + loginMember.getId(), + orderNo, + FlowTypeEnum.SCORE.getValue(), + RunVipMoneyFlowTypeEnum.SCORE_OUT_BALANCE.getValue(), + score.negate(), + StrUtil.format(RunVipMoneyFlowTypeEnum.SCORE_OUT_BALANCE.getDescription(),score,balance), + YesOrNoEnum.YES.getValue() + ); + + walletService.addBalance(balance, loginMember.getId()); + this.runVipMoneyFlowAdd( + loginMember.getId(), + loginMember.getId(), + orderNo, + FlowTypeEnum.BALANCE.getValue(), + RunVipMoneyFlowTypeEnum.SCORE_OUT_BALANCE_IN.getValue(), + balance, + StrUtil.format(RunVipMoneyFlowTypeEnum.SCORE_OUT_BALANCE_IN.getDescription(),score,balance), + YesOrNoEnum.YES.getValue() + ); + } + + @Override + public void setPayment(ApiMallMemberPaymentDto apiMallMemberPaymentDto) { + + List<MallMemberPayment> mallMemberPayments = mallMemberPaymentMapper.selectList( + new LambdaQueryWrapper<MallMemberPayment>().eq(MallMemberPayment::getBank, apiMallMemberPaymentDto.getBank())); + if(CollUtil.isNotEmpty(mallMemberPayments)){ + throw new FebsException("地址已使用"); + } + + MallMember member = LoginUserUtil.getLoginUser(); + if(null == apiMallMemberPaymentDto.getId()){//新增 + MallMemberPayment mallMemberPayment = new MallMemberPayment(); mallMemberPayment.setMemberId(member.getId()); + mallMemberPayment.setBankNo(apiMallMemberPaymentDto.getBankNo()); + mallMemberPayment.setBank(apiMallMemberPaymentDto.getBank()); mallMemberPaymentMapper.insert(mallMemberPayment); - } else { - mallMemberPayment.setId(exist.getId()); + }else{ + MallMemberPayment mallMemberPayment = mallMemberPaymentMapper.selectById(apiMallMemberPaymentDto.getId()); + mallMemberPayment.setMemberId(member.getId()); + mallMemberPayment.setBankNo(apiMallMemberPaymentDto.getBankNo()); + mallMemberPayment.setBank(apiMallMemberPaymentDto.getBank()); mallMemberPaymentMapper.updateById(mallMemberPayment); } } @Override - public MallMemberPayment findMemberPayment() { + public List<MallMemberPayment> findMemberPayment() { MallMember member = LoginUserUtil.getLoginUser(); - return mallMemberPaymentMapper.selectByMemberId(member.getId()); + List<MallMemberPayment> mallMemberPayments = mallMemberPaymentMapper.selectList(new LambdaQueryWrapper<MallMemberPayment>().eq(MallMemberPayment::getMemberId, member.getId())); + return mallMemberPayments; + } + + @Override + public void delPayment(ApiMallMemberPaymentDto mallMemberPayment) { + MallMember member = LoginUserUtil.getLoginUser(); + mallMemberPaymentMapper.deleteById(mallMemberPayment.getId()); } @Override @@ -1309,6 +1561,55 @@ return new FebsResponse().success().data(data); } + @Override + public List<ApiChartVo> dayRecord(ApiRecordDto apiRecordDto) { + /** + * 1:日榜 2:月榜 + * 获取当前日期 + */ + LambdaQueryWrapper<MallMoneyFlow> mallMoneyFlowLambdaQueryWrapper = new LambdaQueryWrapper<>(); + if(apiRecordDto.getType() == 1){ + DateTime dateTime = DateUtil.beginOfDay(DateUtil.date()); + mallMoneyFlowLambdaQueryWrapper.ge(MallMoneyFlow :: getCreatedTime , dateTime); + }else{ + DateTime dateTime = DateUtil.beginOfMonth(DateUtil.date()); + mallMoneyFlowLambdaQueryWrapper.ge(MallMoneyFlow :: getCreatedTime , dateTime); + } + mallMoneyFlowLambdaQueryWrapper.eq(MallMoneyFlow :: getFlowType, FlowTypeEnum.SCORE.getValue()); + mallMoneyFlowLambdaQueryWrapper.eq(MallMoneyFlow :: getType, RunVipMoneyFlowTypeEnum.SCORE_OUT_BALANCE.getValue()); + List<MallMoneyFlow> mallMoneyFlows = mallMoneyFlowMapper.selectList(mallMoneyFlowLambdaQueryWrapper); + + List<ApiChartVo> apiChartVos = new ArrayList<>(); + if(CollUtil.isEmpty(mallMoneyFlows)){ + return apiChartVos; + } + // 使用 Stream API 按照 memberId 分组,并计算每个 memberId 的 amount 绝对值之和 + Map<Long, BigDecimal> sumByMemberId = mallMoneyFlows.stream() + .collect(Collectors.groupingBy( + MallMoneyFlow::getMemberId, + Collectors.reducing(BigDecimal.ZERO, MallMoneyFlow::getAmount, BigDecimal::add) + )).entrySet().stream() + .collect(Collectors.toMap( + Map.Entry::getKey, + entry -> entry.getValue().abs() // 计算绝对值 + )); + + // 对 Map 按照 amount 的绝对值之和从大到小排序,并取前十个结果 + List<Map.Entry<Long, BigDecimal>> sortedList = sumByMemberId.entrySet().stream() + .sorted((entry1, entry2) -> entry2.getValue().compareTo(entry1.getValue())) + .limit(10) + .collect(Collectors.toList()); + sortedList.forEach(entry -> { + ApiChartVo apiChartVo = new ApiChartVo(); + MallMember mallMember = this.baseMapper.selectById(entry.getKey()); + apiChartVo.setPhone(mallMember.getPhone()); + apiChartVo.setAvatar(mallMember.getAvatar()); + apiChartVo.setScore(entry.getValue()); + apiChartVos.add(apiChartVo); + }); + return apiChartVos; + } + public static void main(String[] args) { Long userld = 173L; String shopAccount = "luohu"; -- Gitblit v1.9.1