KKSU
2023-12-01 ff8b0d3fa80f8f6e11adb7bd059efdf03ba30e2b
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -148,6 +148,10 @@
        MallMemberAmount mallMemberAmount = new MallMemberAmount();
        mallMemberAmount.setMemberId(mallMember.getId());
        mallMemberAmountMapper.insert(mallMemberAmount);
        MallMemberPayment mallMemberPayment = new MallMemberPayment();
        mallMemberPayment.setMemberId(mallMember.getId());
        mallMemberPaymentMapper.insert(mallMemberPayment);
        return new FebsResponse().success().message("注册成功");
    }
@@ -246,6 +250,13 @@
                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) {
@@ -353,7 +364,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);
    }
@@ -380,7 +392,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();