From 7f92852f58edf03169d52132fcc33525c6b2ca1a Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 30 Nov 2023 09:48:30 +0800
Subject: [PATCH] 匹配
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 665a982..eb87ad2 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,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());
@@ -255,14 +267,12 @@
DataDictionaryEnum.YU_YUE_START_TIME.getType(),
DataDictionaryEnum.YU_YUE_START_TIME.getCode()
);
- DateTime startTime = cn.hutool.core.date.DateUtil.parseTime(startTimeDic.getValue());
- mallMemberVo.setStartTime(startTime);
+ mallMemberVo.setStartTime(startTimeDic.getValue());
DataDictionaryCustom endTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
DataDictionaryEnum.YU_YUE_END_TIME.getType(),
DataDictionaryEnum.YU_YUE_END_TIME.getCode()
);
- DateTime endTime = DateUtil.parseTime(endTimeDic.getValue());
- mallMemberVo.setEndTime(endTime);
+ mallMemberVo.setEndTime(endTimeDic.getValue());
return new FebsResponse().success().data(mallMemberVo);
}
@@ -374,7 +384,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