From 3d4667dc5a0d56ce1ad0283c26595f68263b061f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 21 Oct 2022 10:50:00 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
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 774d39c..7a42308 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
@@ -509,12 +509,26 @@
if(BigDecimal.ZERO.compareTo(balance) >= 0){
return new FebsResponse().fail().message(MessageSourceUtils.getString("balance_err_001"));
}
- if(ObjectUtil.isEmpty(apiTransferInsideDto.getInviteId())){
- return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_001"));
+// if(ObjectUtil.isEmpty(apiTransferInsideDto.getInviteId())){
+// return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_001"));
+// }
+ if(ObjectUtil.isEmpty(apiTransferInsideDto.getUsername())){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0011"));
}
if(ObjectUtil.isEmpty(apiTransferInsideDto.getTransferCode())){
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
}
+ //每日挂机时间段内禁止内转
+ DataDictionaryCustom startTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.START_TIME.getType(), DataDictionaryEnum.START_TIME.getCode());
+ DataDictionaryCustom endTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.END_TIME.getType(), DataDictionaryEnum.END_TIME.getCode());
+ //获取时间对应的秒数
+ Integer dateNow = DateUtil.timeToSecond(DateUtil.formatTime(DateUtil.date()));
+ Integer startTime = DateUtil.timeToSecond(startTimeDic.getValue());
+ Integer endTime = DateUtil.timeToSecond(endTimeDic.getValue());
+ if(startTime <= dateNow && endTime >= dateNow){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
+ }
+
DappMemberEntity dappMemberEntityOut = LoginUserUtil.getAppUser();
Long memberIdOut = dappMemberEntityOut.getId();
@@ -666,7 +680,7 @@
memberCoinWithdrawEntity.setFeeAmount(serviceFee);
if(1 == apiTransferOutsideDto.getType()){
memberCoinWithdrawEntity.setTag("银行卡");
- memberCoinWithdrawEntity.setSymbol("RMB");
+ memberCoinWithdrawEntity.setSymbol("$");
}else{
memberCoinWithdrawEntity.setTag("钱包");
memberCoinWithdrawEntity.setSymbol("USDT");
--
Gitblit v1.9.1