From c7b00f56c03263e3dbc23df0f834c25e3ad9f7da Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 21 Nov 2022 16:28:05 +0800
Subject: [PATCH] 20221117
---
src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java
index 525328b..601999f 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java
@@ -154,7 +154,7 @@
// BigDecimal totalProfit = igtOnHookPlanOrder.getProfit();
BigDecimal planAmount = igtOnHookPlanOrder.getPlanAmount();
// BigDecimal avaAmount = igtOnHookPlanOrder.getAvaAmount();
- //更新用户表是否正在挂机状态字段为否
+ //更新用户表是否正在挂机状态字段为结算中
DappMemberEntity dappMember = dappMemberDao.selectById(memberId);
dappMember.setIsOnHook(3);
dappMemberDao.updateById(dappMember);
@@ -174,6 +174,9 @@
long between = DateUtil.between(startTime, DateUtil.date(), DateUnit.MINUTE);
//获得总收益
BigDecimal totalProfit = minuteProfit.multiply(new BigDecimal(between));
+ if(multiply.compareTo(totalProfit) < 0){
+ totalProfit = multiply;
+ }
String refererIds = dappMemberEntity.getRefererIds();
List<String> refererIdList = StrUtil.split(refererIds, ",", -1, true, true);
@@ -279,7 +282,8 @@
Date date = dappOnHookAwardNow.getAwardTime();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
String yyyyMMddHHMM = sdf.format(date);
- List<DappOnHookAward> dappOnHookAwards = dappOnHookAwardDao.selectInfoByByAwardTime(yyyyMMddHHMM);
+// List<DappOnHookAward> dappOnHookAwards = dappOnHookAwardDao.selectInfoByByAwardTime(yyyyMMddHHMM);
+ List<DappOnHookAward> dappOnHookAwards = dappOnHookAwardDao.selectByIdLimitTT(Long.parseLong(onHookAwardRedisId));
if(CollUtil.isNotEmpty(dappOnHookAwards)){
for(DappOnHookAward dappOnHookAward : dappOnHookAwards){
ApiAwardInfoVo apiAwardInfoVo = new ApiAwardInfoVo();
@@ -316,7 +320,9 @@
DateTime dateTime = DateUtil.offsetMinute(awardTime, 5);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
String yyyyMMddHHMM = sdf.format(dateTime);
- DappOnHookAward dappOnHookAwardNext = dappOnHookAwardDao.selectByByAwardTime(yyyyMMddHHMM);
+ long onHookAwardNextId = Long.parseLong(onHookAwardRedisId) + 1;
+// DappOnHookAward dappOnHookAwardNext = dappOnHookAwardDao.selectByByAwardTime(yyyyMMddHHMM);
+ DappOnHookAward dappOnHookAwardNext = dappOnHookAwardDao.selectById(onHookAwardNextId);
//系统挂机总次数 = 时长 * 60 / 5
DataDictionaryCustom maxHoursDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.MAX_HOURS.getType(), DataDictionaryEnum.MAX_HOURS.getCode());
@@ -536,6 +542,7 @@
.multiply(new BigDecimal(0.01)).setScale(4,BigDecimal.ROUND_DOWN);
//获取收益
//获取当前用户每分钟应该获取的收益
+ //预期最大收益
BigDecimal multiply = hangingRevenueLevel.multiply(planAmount);
DataDictionaryCustom maxHoursDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.MAX_HOURS.getType(), DataDictionaryEnum.MAX_HOURS.getCode());
//挂机总时长（分钟）
@@ -547,6 +554,10 @@
long between = DateUtil.between(startTime, DateUtil.date(), DateUnit.MINUTE);
//获得总收益
BigDecimal totalProfit = minuteProfit.multiply(new BigDecimal(between)).setScale(4,BigDecimal.ROUND_DOWN);
+ if(multiply.compareTo(totalProfit) < 0){
+ totalProfit = multiply;
+ }
+
// BigDecimal totalProfit = planAmount.multiply(hangingRevenueLevel).setScale(4,BigDecimal.ROUND_DOWN);
String refererIds = dappMemberEntity.getRefererIds();
--
Gitblit v1.9.1