KKSU
2023-11-30 50cd684a58c2fda4f87d6d65cfac651b144a3ff2
预约列表
3 files modified
11 ■■■■■ changed files
src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java 2 ●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java 7 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java
@@ -30,7 +30,7 @@
    FCM_PRICE("FCM_PRICE","FCM_PRICE"),
    OUT_FCM_FEE("OUT_FCM_FEE","OUT_FCM_FEE"),
    /**
     * 银行转账设置-客户号
     * 解冻账户扣除FCM代币数量
     */
    MEMBER_FROZEN_FCM_CNT("MEMBER_FROZEN_FCM_CNT","MEMBER_FROZEN_FCM_CNT"),
    /**
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -251,6 +251,13 @@
        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());
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
@@ -92,5 +92,7 @@
    private String startTime;//FCM价格
    @ApiModelProperty(value = "预约结束时间")
    private String endTime;//FCM价格
    @ApiModelProperty(value = "解冻收费FCM")
    private BigDecimal unfrozenCnt;//FCM提现收续费
}