From 80d0084966d93a699e46212e4d8cbb095f9341cc Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 27 Nov 2023 15:35:58 +0800
Subject: [PATCH] 匹配
---
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java | 2 ++
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallProductServiceImpl.java | 8 ++++++++
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 7 +++++++
3 files changed, 17 insertions(+), 0 deletions(-)
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 9ee508a..3970c58 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
@@ -239,6 +239,13 @@
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 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/service/impl/ApiMallProductServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallProductServiceImpl.java
index 2d4a298..ad8e578 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallProductServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallProductServiceImpl.java
@@ -309,6 +309,14 @@
mallMember.getId(),
FlowTypeNewEnum.NFT.getValue(),
MoneyFlowTypeNewEnum.NFT_OUT_FEE.getDescrition());
+ iMallMoneyFlowService.addMoneyFlow(
+ memberId,
+ nftFee.negate(),
+ MoneyFlowTypeNewEnum.NFT_OUT_FEE.getValue(),
+ orderNo,
+ mallMember.getId(),
+ FlowTypeNewEnum.NFT.getValue(),
+ MoneyFlowTypeNewEnum.NFT_OUT_FEE.getDescrition());
agentProducer.sendFcmNFTExchangeMsg(fcmFeeCnt.toString());
return new FebsResponse().success();
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 a8377a3..c4f096c 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
@@ -84,6 +84,8 @@
private BigDecimal tokenFrozen;//令牌冻结
@ApiModelProperty(value = "FCM提现收续费")
private BigDecimal outFcmFee;//FCM提现收续费
+ @ApiModelProperty(value = "NFT提现收续费")
+ private BigDecimal nftFee;//FCM提现收续费
@ApiModelProperty(value = "FCM价格")
private BigDecimal fcmPrice;//FCM价格
@ApiModelProperty(value = "预约开始时间")
--
Gitblit v1.9.1