fix

Hentua

2023-04-20 9bd759f5a7ad5fe0b47105efd7cacf3f4bf7e9a8

 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.AgentLevelEnum;
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.*;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.*;
import cc.mrbird.febs.mall.conversion.MallGoodsConversion;
@@ -115,7 +112,7 @@
        mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
        mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
        mallMember.setLevel(AgentLevelEnum.ZERO_LEVEL.getCode());
        mallMember.setSex("男");
        mallMember.setSex(registerDto.getSex());
        mallMember.setBindPhone(registerDto.getAccount());

        this.baseMapper.insert(mallMember);
@@ -252,6 +249,7 @@
        mallMemberVo.setPrizeScore(wallet.getPrizeScore());
        mallMemberVo.setTotalScore(wallet.getTotalScore());
        mallMemberVo.setStar(wallet.getStar());
        mallMemberVo.setVoucherCnt(wallet.getVoucherCnt());
        mallMemberVo.setTotalCost(mallOrderInfoMapper.selectTotalAmount(id));
        return new FebsResponse().success().data(mallMemberVo);
    }
@@ -365,6 +363,10 @@
        MallMember mallMember = this.baseMapper.selectInfoByAccount(transferDto.getAccount());
        if (mallMember == null) {
            throw new FebsException("用户不存在");
        }
        Integer insideWith = mallMember.getInsideWith() == null ? 2 :mallMember.getInsideWith();
        if (1 != insideWith) {
            throw new FebsException("功能升级中");
        }

        Long memberId = LoginUserUtil.getLoginUser().getId();
@@ -559,6 +561,17 @@
        if (dic != null) {
            cashOutSettingVo = JSONObject.parseObject(dic.getValue(), CashOutSettingVo.class);
        }
        DataDictionaryCustom voucherOnOffDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                GreenScoreEnum.VOUCHER_ON_OFF.getType(), GreenScoreEnum.VOUCHER_ON_OFF.getCode());
        if(ObjectUtil.isNotEmpty(voucherOnOffDic)){
            cashOutSettingVo.setVoucherOnOff(voucherOnOffDic.getValue());
            DataDictionaryCustom voucherPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                    GreenScoreEnum.VOUCHER_PERCENT.getType(), GreenScoreEnum.VOUCHER_PERCENT.getCode());
            if(ObjectUtil.isNotEmpty(voucherPercentDic)){
                cashOutSettingVo.setVoucherPercent(new BigDecimal(voucherPercentDic.getValue()));
            }
        }

        return cashOutSettingVo;
    }

@@ -615,6 +628,7 @@
        mallMemberBank.setPhone(updateMemberBankDto.getPhone());
        mallMemberBank.setDigitalNo(updateMemberBankDto.getDigitalNo());
        mallMemberBank.setBankName(updateMemberBankDto.getBankName());
        mallMemberBank.setSubbranchName(updateMemberBankDto.getSubbranchName());
        mallMemberBankMapper.updateById(mallMemberBank);
        return new FebsResponse().success();
    }