From e6f6094a3b1173954cd9979e637a6f1b3bafaf0b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 29 Oct 2022 15:17:37 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/dapp/service/impl/AdminOperationServiceImpl.java | 2 +-
src/main/java/cc/mrbird/febs/dapp/enumerate/DataDictionaryEnum.java | 4 +++-
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 6 +++++-
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 2 +-
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/enumerate/DataDictionaryEnum.java b/src/main/java/cc/mrbird/febs/dapp/enumerate/DataDictionaryEnum.java
index a042cfa..ad6e015 100644
--- a/src/main/java/cc/mrbird/febs/dapp/enumerate/DataDictionaryEnum.java
+++ b/src/main/java/cc/mrbird/febs/dapp/enumerate/DataDictionaryEnum.java
@@ -28,12 +28,14 @@
* 1、没有手续费
* 2、转出账号得盈利满30%
* 3、只允许上下级互转
- * 4、每日提现次数
+ * 4、每日内转提现次数
+ * 5、每日提现次数
*/
SERVICE_FEE("TRANSFER_INSIDE_RULE","SERVICE_FEE"),
OUT_ACCOUNT_PROFIT("TRANSFER_INSIDE_RULE","OUT_ACCOUNT_PROFIT"),
ACCOUNT_RELATION("TRANSFER_INSIDE_RULE","ACCOUNT_RELATION"),
WITHDRAW_TIMES("TRANSFER_INSIDE_RULE","WITHDRAW_TIMES"),
+ WITHDRAW_OUT_TIMES("TRANSFER_INSIDE_RULE","WITHDRAW_OUT_TIMES"),
/**
* 挂机方案
* value格式：{"amount":"0","multipleTimes":"2","state":2}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/AdminOperationServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/AdminOperationServiceImpl.java
index bbed7f8..854312c 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/AdminOperationServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/AdminOperationServiceImpl.java
@@ -68,7 +68,7 @@
//转出账户生成一条账户资金变化记录
DappAccountMoneyChangeEntity dappAccountMoneyChangeEntityOut = new DappAccountMoneyChangeEntity(memberIdOut,
dappWalletCoinEntityOut.getTotalAmount().setScale(4,BigDecimal.ROUND_DOWN),
- amount,
+ amount.negate(),
dappWalletCoinEntityOut.getTotalAmount().setScale(4,BigDecimal.ROUND_DOWN).subtract(amount),
content,
type);
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index 91f6a1c..495074f 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -594,7 +594,7 @@
}else{
memberInfoVo.setInviteId(dappMemberEntity.getInviteId());
memberInfoVo.setIdentityCode(identity);
- memberInfoVo.setIdentity("会员");
+ memberInfoVo.setIdentity("Member");
memberInfoVo.setUsername(dappMemberEntity.getUsername());
}
if(ObjectUtil.isNotEmpty(dappMemberEntity.getTransferCode())){
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
index c42167f..5c36ee3 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -698,8 +698,12 @@
}
}
//（2）每24小时只能提现一次
+ // 提现次数
+ DataDictionaryCustom withdrawOutTimesDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.OUT_ACCOUNT_PROFIT.getType(), DataDictionaryEnum.OUT_ACCOUNT_PROFIT.getCode());
+ String withdrawOutTimesStr = withdrawOutTimesDic.getValue() == null ? "1" : withdrawOutTimesDic.getValue();
+ int withdrawOutTimes = Integer.parseInt(withdrawOutTimesStr);
Integer withdrawTimesReal = memberCoinWithdrawDao.selectByMemberIdAndCreateTime(memberId,DateUtil.format(DateUtil.date(),"yyyy-MM-dd"));
- if(1 > withdrawTimesReal){
+ if(withdrawOutTimes < withdrawTimesReal){
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0014"));
}
--
Gitblit v1.9.1