fix

Helius

2021-09-24 31caa96bc740697c01812ec8382b492b309bab93

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java

@@ -7,16 +7,19 @@
import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.common.utils.ShareCodeUtil;
import cc.mrbird.febs.mall.conversion.MallMemberConversion;
import cc.mrbird.febs.mall.dto.ForgetPwdDto;
import cc.mrbird.febs.mall.dto.LoginDto;
import cc.mrbird.febs.mall.dto.RegisterDto;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.entity.MallMemberWallet;
import cc.mrbird.febs.mall.entity.MallShoppingCart;
import cc.mrbird.febs.mall.mapper.MallMemberMapper;
import cc.mrbird.febs.mall.mapper.MallMemberWalletMapper;
import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
import cc.mrbird.febs.mall.mapper.MallShoppingCartMapper;
import cc.mrbird.febs.mall.service.IApiMallMemberService;
import cc.mrbird.febs.mall.service.ICommonService;
import cc.mrbird.febs.mall.vo.MallMemberVo;
import cc.mrbird.febs.mall.vo.TeamListVo;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -45,9 +48,11 @@
@RequiredArgsConstructor
public class ApiMallMemberServiceImpl extends ServiceImpl<MallMemberMapper, MallMember> implements IApiMallMemberService {

    private MallMemberWalletMapper mallMemberWalletMapper;
    private final MallMemberWalletMapper mallMemberWalletMapper;
    private final ICommonService commonService;
    private final RedisUtils redisUtils;
    private final MallOrderInfoMapper mallOrderInfoMapper;
    private final MallShoppingCartMapper mallShoppingCartMapper;

    @Value("${spring.profiles.active}")
    private String active;
@@ -113,7 +118,7 @@
                break;
            }
            parentId = parentMember.getReferrerId();
            if (parentMember.getReferrerId().equals(parentMember.getInviteId())) {
            if (StrUtil.isBlank(parentMember.getReferrerId())) {
                flag = true;
            }
        }
@@ -200,7 +205,88 @@
        MallMember mallMember = this.baseMapper.selectById(id);

        MallMemberVo mallMemberVo = MallMemberConversion.INSTANCE.entityToVo(mallMember);
        return new FebsResponse().data(mallMemberVo);

        MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(mallMemberVo.getId());
        mallMemberVo.setBalance(wallet.getBalance());
        return new FebsResponse().success().data(mallMemberVo);
    }

    @Override
    public FebsResponse findMemberMarkCnt() {
        Long id = LoginUserUtil.getLoginUser().getId();

        List<Map<String, Integer>> maps = mallOrderInfoMapper.selectMemberOrderStatusCnt(id);
        Map<Integer, Integer> orderCnt = new HashMap<>();
        if (CollUtil.isNotEmpty(maps)) {
            for (Map<String, Integer> map : maps) {
                orderCnt.put(map.get("status"), map.get("cnt"));
            }
        }

        List<MallShoppingCart> carts = mallShoppingCartMapper.selectCartGoodsList(id);
        Map<String, Object> result = new HashMap<>();
        result.put("order", orderCnt);
        result.put("carts", carts.size());
        return new FebsResponse().success().data(result);
    }

    @Override
    public FebsResponse setTradePwd(ForgetPwdDto forgetPwdDto) {
        MallMember mallMember = this.baseMapper.selectInfoByAccount(forgetPwdDto.getAccount());
        if (mallMember == null) {
            throw new FebsException("账号不存在");
        }

        boolean b = commonService.verifyCode(forgetPwdDto.getAccount(), forgetPwdDto.getCode());
        if (!b) {
            throw new FebsException("验证码错误");
        }

        mallMember.setTradePassword(SecureUtil.md5(forgetPwdDto.getPassword()));
        this.baseMapper.updateById(mallMember);
        return new FebsResponse().success().message("设置成功");
    }

    @Override
    public FebsResponse modifyMemberInfo(ModifyMemberInfoDto modifyMemberInfoDto) {
        MallMember member = LoginUserUtil.getLoginUser();
        MallMember mallMember = this.baseMapper.selectById(member.getId());
        if (StrUtil.isNotBlank(modifyMemberInfoDto.getName())) {
            mallMember.setName(modifyMemberInfoDto.getName());
        }

        if (StrUtil.isNotBlank(modifyMemberInfoDto.getPhoto())) {
            mallMember.setAvatar(modifyMemberInfoDto.getPhoto());
        }

        this.baseMapper.updateById(mallMember);
        return new FebsResponse().success().message("修改成功");
    }

    @Override
    public FebsResponse teamList(TeamListDto teamListDto) {
        Long memberId = null;
        if (teamListDto.getId() == null) {
            memberId = LoginUserUtil.getLoginUser().getId();
        } else {
            memberId = teamListDto.getId();
        }

        MallMember mallMember = this.baseMapper.selectById(memberId);

        List<TeamListVo> list = this.baseMapper.selectTeamListByInviteId(mallMember.getInviteId());
        BigDecimal ownAmount = this.baseMapper.selectOwnAmountByInviteId(mallMember.getInviteId());

        TeamListVo own = new TeamListVo();
        own.setCreatedTime(mallMember.getCreatedTime());
        own.setAmount(ownAmount);
        own.setName(mallMember.getName());
        own.setPhone(mallMember.getPhone());
        own.setInviteId(mallMember.getInviteId());
        own.setIsCurrent(1);
        own.setCnt(this.baseMapper.selectOwnCntByInviteId(mallMember.getInviteId()));
        own.setId(mallMember.getId());
        list.add(0, own);
        return new FebsResponse().success().data(list);
    }
}