富文本框输入版本变化

KKSU

2023-12-21 f215f23bae13f1e6984c38b5893103a184c3c534

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

@@ -105,10 +105,10 @@
        }
//        mallMember.setName(registerDto.getName());
//        mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
        mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_DISABLED);
        mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
        mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
        mallMember.setLevel(AgentLevelEnum.ZERO_LEVEL.getCode());
        mallMember.setIsFrozen(ProductEnum.MEMBER_FROZEN.getValue());
        mallMember.setIsFrozen(ProductEnum.MEMBER_UNFROZEN.getValue());
//        mallMember.setSex("男");
//        mallMember.setBindPhone(registerDto.getAccount());

@@ -158,7 +158,7 @@

        ApiRegisterVo apiRegisterVo = new ApiRegisterVo();
        apiRegisterVo.setAccount(mallMember.getAccountLogin());
        apiRegisterVo.setAccount(mallMember.getUserKey());
        apiRegisterVo.setUserKey(mallMember.getUserKey());
        return new FebsResponse().success().data(apiRegisterVo);
    }

@@ -242,6 +242,16 @@
            mallMemberVo.setHasPayment(1);
        }

        DataDictionaryCustom nftMinDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.NFT_MIN.getType(),
                DataDictionaryEnum.NFT_MIN.getCode());
        mallMemberVo.setNftMin(ObjectUtil.isEmpty(nftMinDic) ? new BigDecimal(100) : new BigDecimal(nftMinDic.getValue()));

        DataDictionaryCustom outFcmMinDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.OUT_FCM_MIN.getType(),
                DataDictionaryEnum.OUT_FCM_MIN.getCode());
        mallMemberVo.setOutFcmMin(ObjectUtil.isEmpty(outFcmMinDic) ? new BigDecimal(100) : new BigDecimal(outFcmMinDic.getValue()));

        DataDictionaryCustom fcmPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.FCM_PRICE.getType(),
                DataDictionaryEnum.FCM_PRICE.getCode());
@@ -264,6 +274,13 @@
        );
        BigDecimal memberFrozenFcmCnt = ObjectUtil.isEmpty(memberFrozenFcmCntDic) ? new BigDecimal(100) : new BigDecimal(memberFrozenFcmCntDic.getValue());
        mallMemberVo.setUnfrozenCnt(memberFrozenFcmCnt);

        DataDictionaryCustom insureMinuteDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.INSURE_END_MINUTE.getType(),
                DataDictionaryEnum.INSURE_END_MINUTE.getCode()
        );
        Integer insureMinute = Integer.parseInt(ObjectUtil.isEmpty(insureMinuteDic) ? "60" : insureMinuteDic.getValue());
        mallMemberVo.setMinuteCnt(insureMinute);

        DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.AGENT_LEVEL, mallMember.getLevel());
        if (dic != null) {
@@ -288,7 +305,7 @@
        );
        mallMemberVo.setEndTime(endTimeDic.getValue());

        Integer pickCount = mallProductBuyMapper.selectListByMemberIdAndState(id,ProductEnum.PRODUCT_BUY_SUCCESS.getValue());
        Integer pickCount = mallProductBuyMapper.selectListByMemberIdAndState(id);
        mallMemberVo.setPickCount(pickCount);
        return new FebsResponse().success().data(mallMemberVo);
    }
@@ -458,7 +475,7 @@
        }
        if(2 == type){
            if (amount.compareTo(mallMemberAmountLogin.getTokenAva()) > 0) {
                throw new FebsException("令牌不足");
                throw new FebsException("门票不足");
            }
            mallMemberAmountLogin.setTokenAva(mallMemberAmountLogin.getTokenAva().subtract(amount));
            mallMemberAmountMapper.updateTokenAvaById(mallMemberAmountLogin);
@@ -850,6 +867,15 @@
        return new FebsResponse().success().message("操作成功");
    }

    @Override
    public FebsResponse moneyFlowInside(MoneyFlowDto moneyFlowDto) {
        IPage<MoneyFlowVo> page = new Page<>(moneyFlowDto.getPageNum(), moneyFlowDto.getPageSize());
        Long id = LoginUserUtil.getLoginUser().getId();
        moneyFlowDto.setMemberId(id);
        IPage<MoneyFlowVo> pages = mallMoneyFlowMapper.selectApiFcmMoneyFlowInsideInPage(page, moneyFlowDto);
        return new FebsResponse().success().data(pages);
    }

    public static void main(String[] args) {
        Set<String> objectsAccount = new HashSet<>();
        Set<String> objects = new HashSet<>();