From ff8b0d3fa80f8f6e11adb7bd059efdf03ba30e2b Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 01 Dec 2023 14:59:18 +0800
Subject: [PATCH] 预约列表
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 24 ++++++++++++++++++++++--
1 files changed, 22 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 9ee508a..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
@@ -105,6 +105,7 @@
mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_DISABLED);
mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
mallMember.setLevel(AgentLevelEnum.ZERO_LEVEL.getCode());
+ mallMember.setIsFrozen(ProductEnum.MEMBER_FROZEN.getValue());
// mallMember.setSex("男");
// mallMember.setBindPhone(registerDto.getAccount());
@@ -147,6 +148,10 @@
MallMemberAmount mallMemberAmount = new MallMemberAmount();
mallMemberAmount.setMemberId(mallMember.getId());
mallMemberAmountMapper.insert(mallMemberAmount);
+
+ MallMemberPayment mallMemberPayment = new MallMemberPayment();
+ mallMemberPayment.setMemberId(mallMember.getId());
+ mallMemberPaymentMapper.insert(mallMemberPayment);
return new FebsResponse().success().message("注册成功");
}
@@ -239,6 +244,20 @@
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 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());
@@ -345,7 +364,8 @@
IPage<MoneyFlowVo> page = new Page<>(moneyFlowDto.getPageNum(), moneyFlowDto.getPageSize());
Long id = LoginUserUtil.getLoginUser().getId();
moneyFlowDto.setMemberId(id);
- IPage<MoneyFlowVo> pages = mallMoneyFlowMapper.selectApiMoneyFlowInPage(page, moneyFlowDto);
+// IPage<MoneyFlowVo> pages = mallMoneyFlowMapper.selectApiMoneyFlowInPage(page, moneyFlowDto);
+ IPage<MoneyFlowVo> pages = mallMoneyFlowMapper.selectApiFcmMoneyFlowInPage(page, moneyFlowDto);
return new FebsResponse().success().data(pages);
}
@@ -372,7 +392,7 @@
BigDecimal amount = transferDto.getAmount();
int type = transferDto.getType();
- if(1 != type || 2 != type){
+ if(1 != type && 2 != type){
throw new FebsException("请选择互转类型");
}
Integer insideWith = loginMember.getInsideWith() == null ? 2 :loginMember.getInsideWith();
--
Gitblit v1.9.1