预约列表

KKSU

2023-12-01 a4b21510fb9ab151537d772c14cd9c2dece0c2ab

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

@@ -15,6 +15,8 @@
import cc.mrbird.febs.mall.vo.*;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -59,6 +61,8 @@
    private final MallRegisterAppealMapper mallRegisterAppealMapper;
    private final MallMemberBankMapper mallMemberBankMapper;
    private final IMallMoneyFlowService mallMoneyFlowService;
    private final MallProductBuyRecordMapper mallProductBuyRecordMapper;
    private final MallProductBuyMapper mallProductBuyMapper;


    @Value("${spring.profiles.active}")
@@ -103,6 +107,7 @@
        mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_DISABLED);
        mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
        mallMember.setLevel(AgentLevelEnum.ZERO_LEVEL.getCode());
        mallMember.setIsFrozen(ProductEnum.MEMBER_FROZEN.getValue());
//        mallMember.setSex("男");
//        mallMember.setBindPhone(registerDto.getAccount());

@@ -145,7 +150,15 @@
        MallMemberAmount mallMemberAmount = new MallMemberAmount();
        mallMemberAmount.setMemberId(mallMember.getId());
        mallMemberAmountMapper.insert(mallMemberAmount);
        return new FebsResponse().success().message("注册成功");

        MallMemberPayment mallMemberPayment = new MallMemberPayment();
        mallMemberPayment.setMemberId(mallMember.getId());
        mallMemberPaymentMapper.insert(mallMemberPayment);

        ApiRegisterVo apiRegisterVo = new ApiRegisterVo();
        apiRegisterVo.setAccount(accountLogin);
        apiRegisterVo.setAccount(userKey);
        return new FebsResponse().success().data(apiRegisterVo);
    }

    @Override
@@ -237,6 +250,20 @@
                DataDictionaryEnum.OUT_FCM_FEE.getType(),
                DataDictionaryEnum.OUT_FCM_FEE.getCode());
        mallMemberVo.setOutFcmFee(ObjectUtil.isEmpty(outFcmFeeDic) ? new BigDecimal(20) : new BigDecimal(outFcmFeeDic.getValue()));

        DataDictionaryCustom nftFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.NFT_FEE.getType(),
                DataDictionaryEnum.NFT_FEE.getCode());
        BigDecimal nftFeePercent = ObjectUtil.isEmpty(nftFeeDic) ? new BigDecimal(20) : new BigDecimal(nftFeeDic.getValue());
        mallMemberVo.setNftFee(nftFeePercent);

        DataDictionaryCustom memberFrozenFcmCntDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.MEMBER_FROZEN_FCM_CNT.getType(),
                DataDictionaryEnum.MEMBER_FROZEN_FCM_CNT.getCode()
        );
        BigDecimal memberFrozenFcmCnt = ObjectUtil.isEmpty(memberFrozenFcmCntDic) ? new BigDecimal(100) : new BigDecimal(memberFrozenFcmCntDic.getValue());
        mallMemberVo.setUnfrozenCnt(memberFrozenFcmCnt);

        DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.AGENT_LEVEL, mallMember.getLevel());
        if (dic != null) {
            mallMemberVo.setLevelName(dic.getDescription());
@@ -249,6 +276,19 @@
        mallMemberVo.setFcmCntFrozen(mallMemberAmount.getFcmCntFrozen());
        mallMemberVo.setTokenAva(mallMemberAmount.getTokenAva());
        mallMemberVo.setTokenFrozen(mallMemberAmount.getTokenFrozen());
        DataDictionaryCustom startTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.YU_YUE_START_TIME.getType(),
                DataDictionaryEnum.YU_YUE_START_TIME.getCode()
        );
        mallMemberVo.setStartTime(startTimeDic.getValue());
        DataDictionaryCustom endTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.YU_YUE_END_TIME.getType(),
                DataDictionaryEnum.YU_YUE_END_TIME.getCode()
        );
        mallMemberVo.setEndTime(endTimeDic.getValue());

        Integer pickCount = mallProductBuyMapper.selectListByMemberIdAndState(id,ProductEnum.PRODUCT_BUY_SUCCESS.getValue());
        mallMemberVo.setPickCount(pickCount);
        return new FebsResponse().success().data(mallMemberVo);
    }

@@ -333,7 +373,8 @@
        IPage<MoneyFlowVo> page = new Page<>(moneyFlowDto.getPageNum(), moneyFlowDto.getPageSize());
        Long id = LoginUserUtil.getLoginUser().getId();
        moneyFlowDto.setMemberId(id);
        IPage<MoneyFlowVo> pages = mallMoneyFlowMapper.selectApiMoneyFlowInPage(page, moneyFlowDto);
//        IPage<MoneyFlowVo> pages = mallMoneyFlowMapper.selectApiMoneyFlowInPage(page, moneyFlowDto);
        IPage<MoneyFlowVo> pages = mallMoneyFlowMapper.selectApiFcmMoneyFlowInPage(page, moneyFlowDto);
        return new FebsResponse().success().data(pages);
    }

@@ -360,7 +401,7 @@
        BigDecimal amount = transferDto.getAmount();
        int type = transferDto.getType();

        if(1 != type || 2 != type){
        if(1 != type && 2 != type){
            throw new FebsException("请选择互转类型");
        }
        Integer insideWith = loginMember.getInsideWith() == null ? 2 :loginMember.getInsideWith();