From 112b6a2ca8a55f056cc259b6bd9ed554fcc263f7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 31 Oct 2022 14:58:04 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 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 550810f..2a71bb4 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
@@ -603,9 +603,9 @@
//提现次数
DataDictionaryCustom withdrawTimesDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WITHDRAW_TIMES.getType(), DataDictionaryEnum.WITHDRAW_TIMES.getCode());
Integer withdrawTimes = Integer.parseInt(withdrawTimesDic.getValue());
- Integer withdrawTimesReal = memberCoinWithdrawDao.selectByMemberIdAndCreateTime(memberIdOut,DateUtil.format(DateUtil.date(),"yyyy-MM-dd"));
+ Integer withdrawTimesReal = memberCoinWithdrawDao.selectByMemberIdAndCreateTime(memberIdOut,DateUtil.format(DateUtil.date(),"yyyy-MM-dd"),"Y");
if(withdrawTimesReal >= withdrawTimes){
- return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_004"));
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0016"));
}
//转出账户,余额减少,冻结增加
Integer countOut = dappWalletCoinDao.addFrozenAndDelAvailableById(dappWalletCoinEntityOut.getId(), balance);
@@ -700,11 +700,12 @@
}
//（2）每24小时只能提现一次
// 提现次数
- DataDictionaryCustom withdrawOutTimesDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.OUT_ACCOUNT_PROFIT.getType(), DataDictionaryEnum.OUT_ACCOUNT_PROFIT.getCode());
+ DataDictionaryCustom withdrawOutTimesDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WITHDRAW_OUT_TIMES.getType()
+ , DataDictionaryEnum.WITHDRAW_OUT_TIMES.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(withdrawOutTimes < withdrawTimesReal){
+ Integer withdrawTimesReal = memberCoinWithdrawDao.selectByMemberIdAndCreateTime(memberId,DateUtil.format(DateUtil.date(),"yyyy-MM-dd"),"N");
+ if(withdrawOutTimes <= withdrawTimesReal){
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0014"));
}
@@ -716,10 +717,10 @@
DataDictionaryCustom serviceFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SERVICE_FEE.getType(), DataDictionaryEnum.SERVICE_FEE.getCode());
BigDecimal serviceFee = new BigDecimal(serviceFeeDic.getValue());
- //转出账户生成一条内部转账记录
+ //转出账户生成一条记录
MemberCoinWithdrawEntity memberCoinWithdrawEntity = new MemberCoinWithdrawEntity();
memberCoinWithdrawEntity.setAddress(address);
- memberCoinWithdrawEntity.setAmount(balance);
+ memberCoinWithdrawEntity.setAmount(balance.negate());
memberCoinWithdrawEntity.setFeeAmount(serviceFee);
if(1 == apiTransferOutsideDto.getType()){
memberCoinWithdrawEntity.setTag("银行卡");
@@ -1112,6 +1113,7 @@
@Override
public Integer isGoal(String num) {
Set set = new HashSet();
+ num = StrUtil.subSuf(num,1);
char[] chars = num.toCharArray();
for(char c:chars) {
set.add(c);
@@ -1123,6 +1125,12 @@
}
}
+ public static void main(String[] args) {
+
+ String num = StrUtil.subSuf("01234",1);
+ System.out.print(num);
+ }
+
private String isIdentity(List<String> refererIds,String levelCode){
String flag = levelCode;
for(String str : refererIds){
--
Gitblit v1.9.1