From 2a9d6a842666d7aae86fdcccf0da13f6842b991b Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 27 Nov 2023 16:36:43 +0800
Subject: [PATCH] 匹配
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 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 d948432..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
@@ -15,6 +15,8 @@
import cc.mrbird.febs.mall.vo.*;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -237,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());
@@ -249,6 +258,16 @@
mallMemberVo.setFcmCntFrozen(mallMemberAmount.getFcmCntFrozen());
mallMemberVo.setTokenAva(mallMemberAmount.getTokenAva());
mallMemberVo.setTokenFrozen(mallMemberAmount.getTokenFrozen());
+ DataDictionaryCustom startTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.YU_YUE_START_TIME.getType(),
+ DataDictionaryEnum.YU_YUE_START_TIME.getCode()
+ );
+ mallMemberVo.setStartTime(startTimeDic.getValue());
+ DataDictionaryCustom endTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.YU_YUE_END_TIME.getType(),
+ DataDictionaryEnum.YU_YUE_END_TIME.getCode()
+ );
+ mallMemberVo.setEndTime(endTimeDic.getValue());
return new FebsResponse().success().data(mallMemberVo);
}
@@ -758,7 +777,7 @@
Long unfreezeMemberId = unfreezeDto.getMemberId();
MallMember mallMember = this.baseMapper.selectById(unfreezeMemberId);
Integer isFrozen = mallMember.getIsFrozen();
- if(1 != isFrozen){
+ if(ProductEnum.MEMBER_UNFROZEN.getValue() == isFrozen){
throw new FebsException("账户未被冻结");
}
DataDictionaryCustom memberFrozenFcmCntDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
@@ -781,7 +800,7 @@
BigDecimal fcmCntAvaSub = fcmCntAva.subtract(memberFrozenFcmCnt);
mallMemberAmount.setFcmCntAva(fcmCntAvaSub);
mallMemberAmountMapper.updateById(mallMemberAmount);
- mallMember.setIsFrozen(0);
+ mallMember.setIsFrozen(ProductEnum.MEMBER_UNFROZEN.getValue());
this.baseMapper.updateById(mallMember);
mallMoneyFlowService.addMoneyFlow(
--
Gitblit v1.9.1