From 722f17e0fc6a1fbe709bd02bbb7c75b8da435e07 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Tue, 10 May 2022 15:20:50 +0800 Subject: [PATCH] add score goods-list and goods-add --- src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 113 ++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 68 insertions(+), 45 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 c5eb694..c4b46eb 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 @@ -2,6 +2,7 @@ import cc.mrbird.febs.common.entity.FebsResponse; import cc.mrbird.febs.common.enumerates.AgentLevelEnum; +import cc.mrbird.febs.common.enumerates.FlowTypeEnum; import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum; import cc.mrbird.febs.common.exception.FebsException; import cc.mrbird.febs.common.utils.*; @@ -12,9 +13,7 @@ import cc.mrbird.febs.mall.service.IApiMallMemberService; import cc.mrbird.febs.mall.service.IApiMallMemberWalletService; import cc.mrbird.febs.mall.service.ICommonService; -import cc.mrbird.febs.mall.vo.MallMemberVo; -import cc.mrbird.febs.mall.vo.MoneyFlowVo; -import cc.mrbird.febs.mall.vo.TeamListVo; +import cc.mrbird.febs.mall.vo.*; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; @@ -33,6 +32,7 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -55,6 +55,7 @@ private final IApiMallMemberWalletService walletService; private final MallMemberPaymentMapper mallMemberPaymentMapper; private final DataDictionaryCustomMapper dataDictionaryCustomMapper; + @Value("${spring.profiles.active}") private String active; @@ -229,6 +230,9 @@ } MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(mallMemberVo.getId()); mallMemberVo.setBalance(wallet.getBalance()); + mallMemberVo.setScore(wallet.getScore()); + mallMemberVo.setPrizeScore(wallet.getPrizeScore()); + mallMemberVo.setTotalCost(mallOrderInfoMapper.selectTotalAmount(id)); return new FebsResponse().success().data(mallMemberVo); } @@ -309,8 +313,19 @@ own.setCnt(this.baseMapper.selectOwnCntByInviteId(mallMember.getInviteId())); own.setOrderCnt(this.baseMapper.selectOwnOrderCntByInviteId(mallMember.getInviteId())); own.setId(mallMember.getId()); - list.add(0, own); - return new FebsResponse().success().data(list); +// list.add(0, own); + + MyTeamVo myTeamVo = new MyTeamVo(); + myTeamVo.setTeam(list); + myTeamVo.setMyAchieve(BigDecimal.valueOf(100)); + myTeamVo.setMyTeamAchieve(BigDecimal.valueOf(100)); + myTeamVo.setMyTeamCnt(100); + return new FebsResponse().success().data(myTeamVo); + } + + @Override + public MyTeamVo teamListForMine(TeamListDto teamListDto) { + return null; } @Override @@ -323,7 +338,7 @@ } @Override - public void addMoneyFlow(Long memberId, BigDecimal amount, Integer type, String orderNo, String description, String remark, Long rtMemberId, Integer status) { + public void addMoneyFlow(Long memberId, BigDecimal amount, Integer type, String orderNo, String description, String remark, Long rtMemberId, Integer status, Integer flowType) { MallMoneyFlow flow = new MallMoneyFlow(); flow.setMemberId(memberId); flow.setAmount(amount); @@ -333,6 +348,7 @@ flow.setRemark(remark); flow.setRtMemberId(rtMemberId); flow.setStatus(status); + flow.setFlowType(flowType); mallMoneyFlowMapper.insert(flow); } @@ -361,47 +377,10 @@ 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); + this.addMoneyFlow(memberId, transferDto.getAmount().negate(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, mallMember.getId(), null, FlowTypeEnum.BALANCE.getValue()); walletService.addBalance(transferDto.getAmount(), mallMember.getId()); - this.addMoneyFlow(mallMember.getId(), transferDto.getAmount(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, memberId, null); - } - - @Override - public void withdrawal(WithdrawalDto withdrawalDto) { - Long memberId = LoginUserUtil.getLoginUser().getId(); - MallMember mallMember = this.baseMapper.selectById(memberId); - if (StrUtil.isBlank(mallMember.getTradePassword())) { - throw new FebsException("未设置支付密码"); - } - - if (!mallMember.getTradePassword().equals(SecureUtil.md5(withdrawalDto.getTradePwd()))) { - throw new FebsException("支付密码错误"); - } - - if (withdrawalDto.getAmount().compareTo(BigDecimal.valueOf(100)) < 0) { - throw new FebsException("最小提现金额为100"); - } - - MallMemberPayment payment = mallMemberPaymentMapper.selectByMemberId(memberId); - if (payment == null) { - throw new FebsException("未设置收款方式"); - } - - BigDecimal profit = mallMoneyFlowMapper.selectProfitByDateAndMemberId(memberId); - MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(memberId); - if (profit != null) { - // 可提现 - BigDecimal canMoney = wallet.getBalance().subtract(profit); - - if(withdrawalDto.getAmount().compareTo(canMoney) > 0) { - throw new FebsException("提现金额不足"); - } - } - - walletService.reduceBalance(withdrawalDto.getAmount(), memberId); - String orderNo = MallUtils.getOrderNum("W"); - this.addMoneyFlow(memberId, withdrawalDto.getAmount().negate(), MoneyFlowTypeEnum.WITHDRAWAL.getValue(), orderNo, null, null, null, 1); + this.addMoneyFlow(mallMember.getId(), transferDto.getAmount(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, memberId, null, FlowTypeEnum.BALANCE.getValue()); } @Override @@ -452,4 +431,48 @@ } return canMoney; } + + @Override + public List<MallMember> findRankList(RankListDto rankListDto) { + IPage<MallMember> page = new Page<>(rankListDto.getPageNum(), rankListDto.getPageSize()); + + MallMember member = new MallMember(); + member.setQuery("2"); + member.setCreatedTime(new Date()); + IPage<MallMember> list = this.baseMapper.selectRankListInPage(page, member); + + return list.getRecords(); + } + + @Override + public MallMember findMemberInfoByAccount(String phone) { + return this.baseMapper.selectInfoByAccount(phone); + } + + @Override + public MyCommissionVo myCommission() { + Long id = LoginUserUtil.getLoginUser().getId(); + MallMember mallMember = this.baseMapper.selectById(id); + + MyCommissionVo commissionVo = MallMemberConversion.INSTANCE.entityToCommissionVo(mallMember); + + MallMember referMember = this.baseMapper.selectInfoByInviteId(mallMember.getReferrerId()); + if (referMember != null) { + commissionVo.setReferrerName(referMember.getName()); + commissionVo.setAvatar(referMember.getAvatar()); + } + + DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.AGENT_LEVEL, mallMember.getLevel()); + if (dic != null) { + commissionVo.setLevelName(dic.getDescription()); + } + + MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(id); + commissionVo.setCommission(wallet.getCommission()); + commissionVo.setToday(mallMoneyFlowMapper.selectCommissionIncome(1, new Date(), id)); + commissionVo.setMonth(mallMoneyFlowMapper.selectCommissionIncome(2, new Date(), id)); + commissionVo.setTotal(mallMoneyFlowMapper.selectCommissionIncome(null, null, id)); + commissionVo.setWaitCommission(BigDecimal.ZERO); + return commissionVo; + } } -- Gitblit v1.9.1