From 1bf57dbbb7025facb8a3e3c2074e82af6f13b24f Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Thu, 28 Apr 2022 15:13:59 +0800 Subject: [PATCH] fix --- src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 48 insertions(+), 10 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java index d2efbaf..5b4e315 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java @@ -4,6 +4,8 @@ import cc.mrbird.febs.common.entity.QueryRequest; import cc.mrbird.febs.common.enumerates.AgentLevelEnum; import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum; +import cc.mrbird.febs.common.exception.FebsException; +import cc.mrbird.febs.common.utils.MallUtils; import cc.mrbird.febs.mall.dto.*; import cc.mrbird.febs.mall.entity.*; import cc.mrbird.febs.mall.entity.MallNewsInfo; @@ -14,6 +16,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.crypto.SecureUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -382,6 +385,7 @@ } @Override + @Transactional public FebsResponse updateSystemPay(MallSystemPayDto mallSystemPayDto) { Long memberId = mallSystemPayDto.getId(); MallMember mallMember = mallMemberMapper.selectById(memberId); @@ -398,17 +402,51 @@ mallMemberWallet.setBalance(mallMemberWallet.getBalance().add(bigDecimal)); mallMemberWalletMapper.updateBalanceWithId(mallMemberWallet); -// MallMoneyFlow flow = new MallMoneyFlow(); -// flow.setMemberId(memberId); -// flow.setAmount(bigDecimal); + MallMoneyFlow flow = new MallMoneyFlow(); + flow.setMemberId(memberId); + flow.setAmount(bigDecimal); // flow.setType(MoneyFlowTypeEnum.SYSTEM_PAY.getValue()); -// flow.setOrderNo(orderNo); -// flow.setDescription(description); -// flow.setRemark(remark); -// flow.setRtMemberId(rtMemberId); -// flow.setStatus(status); -// mallMoneyFlowMapper.insert(flow); - return null; + flow.setOrderNo("SYS"+MallUtils.getOrderNum()); + flow.setStatus(2); + mallMoneyFlowMapper.insert(flow); + return new FebsResponse().success(); } + @Override + public AdminAgentLevelSetInfoVo getAgentLevelSetInfoByMemberId(long id) { + AdminAgentLevelSetInfoVo adminAgentLevelSetInfoVo = mallMemberMapper.getAgentLevelSetInfoByMemberId(id); + return adminAgentLevelSetInfoVo; + } + + @Override + public FebsResponse agentLevelSetUpdate(AgentLevelSetUpdateDto agentLevelSetUpdateDto) { + Long memberId = agentLevelSetUpdateDto.getId(); + MallMember mallMember = mallMemberMapper.selectById(memberId); + if(ObjectUtil.isEmpty(mallMember)){ + return new FebsResponse().fail().message("系统繁忙,请刷新页面重试"); + } + mallMember.setLevel(agentLevelSetUpdateDto.getLevelCode()); + mallMemberMapper.updateById(mallMember); + return new FebsResponse().success(); + } + + @Override + public FebsResponse resetPwd(Long id) { + MallMember mallMember = this.baseMapper.selectById(id); + if (mallMember == null) { + throw new FebsException("用户不存在"); + } + + String pwd = SecureUtil.md5("a123456"); + mallMember.setPassword(pwd); + this.baseMapper.updateById(mallMember); + return new FebsResponse().success().message("重置成功"); + } + + @Override + public IPage<MallDataVo> getMallDataList(MallMember mallMember, QueryRequest request) { + Page<MallDataVo> page = new Page<>(request.getPageNum(), request.getPageSize()); + IPage<MallDataVo> mallDataVos = this.baseMapper.getMallDataListInPage(page, mallMember); + return mallDataVos; + } } -- Gitblit v1.9.1