Hentua
2023-06-12 2f34848f649b7d29f7697f8fe13b5e93c543c19a
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -15,6 +15,7 @@
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.service.ICommonService;
import cc.mrbird.febs.mall.vo.*;
import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
@@ -114,6 +115,7 @@
        mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
        mallMember.setLevel(AgentLevelEnum.ZERO_LEVEL.getCode());
        mallMember.setSex(registerDto.getSex());
        mallMember.setInsideWith(1);
        mallMember.setBindPhone(registerDto.getAccount());
        mallMember.setSkin("default");
@@ -163,7 +165,7 @@
        MallMember mallMember = this.baseMapper.selectInfoByAccountAndPwd(loginDto.getAccount(), md5Pwd);
        if (mallMember == null) {
            throw new FebsException("用户不存在或账号密码错误");
            throw new FebsException("账号密码错误");
        }
        if (MallMember.ACCOUNT_STATUS_DISABLED.equals(mallMember.getAccountStatus())) {
@@ -195,8 +197,8 @@
    @Override
    public FebsResponse forgetPwd(ForgetPwdDto forgetPwdDto) {
        MallMember mallMember = this.baseMapper.selectInfoByAccount(forgetPwdDto.getPhone());
//        MallMember mallMember = this.baseMapper.selectInfoByAccount(forgetPwdDto.getAccount());
//        MallMember mallMember = this.baseMapper.selectInfoByAccount(forgetPwdDto.getPhone());
        MallMember mallMember = this.baseMapper.selectInfoByAccount(forgetPwdDto.getAccount());
        if (mallMember == null) {
            throw new FebsException("账号不存在");
        }
@@ -497,7 +499,7 @@
        commissionVo.setLevelName(MemberLevelTagDicEnums.getDesc(mallMember.getSex(), mallMember.getLevel()));
        MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(id);
        commissionVo.setCommission(wallet.getCommission());
        commissionVo.setCommission(wallet.getBalance());
        commissionVo.setToday(mallMoneyFlowMapper.selectCommissionIncome(1, new Date(), id));
        commissionVo.setMonth(mallMoneyFlowMapper.selectCommissionIncome(2, new Date(), id));
        commissionVo.setTotal(mallMoneyFlowMapper.selectCommissionIncome(null, null, id));
@@ -635,7 +637,10 @@
    @Override
    public List<SkinTypeVo> findSkinList() {
        MallMember loginUser = LoginUserUtil.getLoginUser();
        String level = loginUser.getLevel();
        MallMember member = this.baseMapper.selectById(loginUser.getId());
        String level = member.getLevel();
        // 全网分红 -- 代理和股东当作是女王殿下级别
        if (MemberLevelEnum.getLevelCode(level) > MemberLevelEnum.FOUR_LEVEL.getCode()) {
            level = MemberLevelEnum.FOUR_LEVEL.getType();