From 50cd684a58c2fda4f87d6d65cfac651b144a3ff2 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 30 Nov 2023 16:54:16 +0800
Subject: [PATCH] 预约列表
---
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java | 2 ++
src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java | 2 +-
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 7 +++++++
3 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java b/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java
index 0516960..4f6b6e1 100644
--- a/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java
+++ b/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"),
/**
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 5ab21e3..1360a4e 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/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());
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
index c4f096c..b796891 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
+++ b/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提现收续费
}
--
Gitblit v1.9.1