From e87cd6e99ee1993541badeae4c792db0c34b6cd4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 11 Nov 2022 02:19:04 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 17 ++++++++++-------
1 files changed, 10 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 f6a7c93..8b153ab 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
@@ -597,7 +597,7 @@
* 否则，计算收益占本金的比例。符合条件允许提现
*/
//获取用户的总收益
- BigDecimal totalProfitOut = igtOnHookPlanOrderItemdao.selectTotalProfitByMemberIdAndStateAndIsgoal(memberIdOut,1,2);
+ BigDecimal totalProfitOut = igtOnHookPlanOrderItemdao.selectTotalProfitByMemberIdAndStateAndIsgoal(memberIdOut,2);
if(balance.compareTo(totalProfitOut) > 0){
BigDecimal totalAmount = dappWalletCoinEntityOut.getTotalAmount();
//用户总收益率
@@ -707,7 +707,7 @@
* 否则，计算收益占本金的比例。符合条件允许提现
*/
//获取用户的总收益
- BigDecimal totalProfit = igtOnHookPlanOrderItemdao.selectTotalProfitByMemberIdAndStateAndIsgoal(memberId,1,2);
+ BigDecimal totalProfit = igtOnHookPlanOrderItemdao.selectTotalProfitByMemberIdAndStateAndIsgoal(memberId,2);
if(balance.compareTo(totalProfit) >= 0){
BigDecimal totalAmount = dappWalletCoinEntity.getTotalAmount();
//用户总收益率
@@ -1131,11 +1131,10 @@
if(BigDecimal.ZERO.compareTo(totalProfit)>=0){
return BigDecimal.ZERO;
}
- BigDecimal multiply = totalProfit.multiply(new BigDecimal(0.05));
DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(65L,
- multiply.negate(), "系统", 9,id);
+ totalProfit, "系统", 9,id);
dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
- return multiply;
+ return totalProfit;
}
@Override
@@ -1155,8 +1154,12 @@
public static void main(String[] args) {
- String num = StrUtil.subSuf("01234",1);
- System.out.print(num);
+ DateTime date = DateUtil.date();
+ DateTime endTime = DateUtil.parseTimeToday("09:08:03");
+ if(DateUtil.compare(date,endTime)>=0){
+ //
+ System.out.print(endTime);
+ }
}
private String isIdentity(List<String> refererIds,String levelCode){
--
Gitblit v1.9.1