From f46ac1d0e7c29118ac23c283a3fd7ff51721e5a5 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 30 Oct 2022 00:25:42 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java | 135 +++++++++++++++++++++++---------------------
1 files changed, 70 insertions(+), 65 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
index 5d2e952..3abb8a5 100644
--- a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
+++ b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
@@ -74,6 +74,25 @@
if(CollUtil.isEmpty(igtOnHookPlanOrders)){
return;
}
+ String redisKey = "";
+ if("prod".equals(active)){
+ redisKey = "on_hook_award_id";
+ }else{
+ redisKey = "on_hook_award_id_test";
+ }
+ String onHookAwardRedisId = redisUtils.getString(redisKey);
+ DappOnHookAward dappOnHookAward = dappOnHookAwardDao.selectById(Long.parseLong(onHookAwardRedisId));
+ Date awardTime = dappOnHookAward.getAwardTime();
+ 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);
+
+ //系统挂机总次数 = 时长 * 60 / 5
+ DataDictionaryCustom maxHoursDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.MAX_HOURS.getType(), DataDictionaryEnum.MAX_HOURS.getCode());
+ Float maxHours = Float.parseFloat(maxHoursDic.getValue());
+ maxHours = maxHours * 60 / 5;
+
for(IgtOnHookPlanOrder igtOnHookPlanOrder : igtOnHookPlanOrders){
BigDecimal avaAmount = igtOnHookPlanOrder.getAvaAmount();
if(avaAmount.compareTo(BigDecimal.ZERO) > 0){
@@ -82,24 +101,7 @@
* 生成一条开奖字表记录
* 计算收益
*/
- String redisKey = "";
- if("prod".equals(active)){
- redisKey = "on_hook_award_id";
- }else{
- redisKey = "on_hook_award_id_test";
- }
- String onHookAwardRedisId = redisUtils.getString(redisKey);
- DappOnHookAward dappOnHookAward = dappOnHookAwardDao.selectById(Long.parseLong(onHookAwardRedisId));
- Date awardTime = dappOnHookAward.getAwardTime();
- 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);
- //系统挂机总次数 = 时长 * 60 / 5
- DataDictionaryCustom maxHoursDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.MAX_HOURS.getType(), DataDictionaryEnum.MAX_HOURS.getCode());
- Integer maxHours = Integer.parseInt(maxHoursDic.getValue());
- maxHours = maxHours * 60 / 5;
List<IgtOnHookPlanOrderItem> igtOnHookPlanOrderItemsOld = igtOnHookPlanOrderItemDao.selectByIgtIdAndMemberId(igtOnHookPlanOrder.getId(),igtOnHookPlanOrder.getMemberId());
//如果没有中奖记录则是新增一条1挂机方案的挂机子表记录
if(CollUtil.isEmpty(igtOnHookPlanOrderItemsOld)){
@@ -123,7 +125,7 @@
.multiply(new BigDecimal(0.01)).setScale(4,BigDecimal.ROUND_DOWN);
//获取收益
BigDecimal profit = amountPlanA.multiply(hangingRevenueLevel).setScale(4,BigDecimal.ROUND_DOWN);
- igtOnHookPlanOrderItem.setProfit(profit.multiply(new BigDecimal(igtOnHookPlanOrder.getPlanCode())).setScale(4,BigDecimal.ROUND_DOWN));
+ igtOnHookPlanOrderItem.setProfit(profit.setScale(4,BigDecimal.ROUND_DOWN));
igtOnHookPlanOrderItem.setState(1);
igtOnHookPlanOrderItem.setPlanCode(igtOnHookPlanOrder.getPlanCode());
@@ -171,7 +173,7 @@
.multiply(new BigDecimal(0.01)).setScale(4,BigDecimal.ROUND_DOWN);
//获取收益
BigDecimal profit = amountPlanA.multiply(hangingRevenueLevel).setScale(4,BigDecimal.ROUND_DOWN);
- igtOnHookPlanOrderItem.setProfit(profit.multiply(new BigDecimal(igtOnHookPlanOrder.getPlanCode())).setScale(4,BigDecimal.ROUND_DOWN));
+ igtOnHookPlanOrderItem.setProfit(profit.setScale(4,BigDecimal.ROUND_DOWN));
igtOnHookPlanOrderItem.setState(1);
igtOnHookPlanOrderItem.setPlanCode(igtOnHookPlanOrder.getPlanCode());
@@ -184,7 +186,7 @@
igtOnHookPlanOrderItemDao.insert(igtOnHookPlanOrderItem);
if(2 == igtOnHookPlanOrderItem.getIsGoal()){
-
+
//如果中奖，增加挂机主表的挂机总收益
Integer updateCount = igtOnHookPlanOrderDao.AddProfitById(igtOnHookPlanOrder.getId()
,igtOnHookPlanOrderItem.getProfit());
@@ -203,7 +205,6 @@
//获取挂机方案
DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCodeAndDesc(
DataDictionaryEnum.PLAN_A.getType(),
- DataDictionaryEnum.PLAN_A.getCode(),
Integer.toString(Integer.parseInt(plan)+1));
String dataDictionaryCustomValue = dataDictionaryCustom.getValue();
JSONObject levelMemberValueParse = JSONUtil.parseObj(dataDictionaryCustomValue);
@@ -224,7 +225,7 @@
.multiply(new BigDecimal(0.01)).setScale(4,BigDecimal.ROUND_DOWN);
//获取收益
BigDecimal profit = amountPlanA.multiply(hangingRevenueLevel).setScale(4,BigDecimal.ROUND_DOWN);
- igtOnHookPlanOrderItem.setProfit(profit.multiply(new BigDecimal(igtOnHookPlanOrder.getPlanCode())).setScale(4,BigDecimal.ROUND_DOWN));
+ igtOnHookPlanOrderItem.setProfit(profit.setScale(4,BigDecimal.ROUND_DOWN));
igtOnHookPlanOrderItem.setState(1);
igtOnHookPlanOrderItem.setPlanCode(igtOnHookPlanOrder.getPlanCode());
@@ -237,10 +238,14 @@
igtOnHookPlanOrderItemDao.insert(igtOnHookPlanOrderItem);
if(2 == igtOnHookPlanOrderItem.getIsGoal()){
-
//返还两次中奖之间的本金
- Date startTime = igtOnHookPlanOrderItemsOld.get(0).getCreateTime();
Date endTime = igtOnHookPlanOrderItem.getCreateTime();
+ Date startTime = null;
+ //返回上次中奖的记录
+ IgtOnHookPlanOrderItem igtOld = igtOnHookPlanOrderItemDao.selectByCreateTimeAndIsgoaAndOrderId(endTime,2,igtOnHookPlanOrder.getId());
+ if(ObjectUtil.isNotEmpty(igtOld)){
+ startTime = igtOld.getCreateTime();
+ }
BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByCreateTimeAndOrderId(startTime,endTime,igtOnHookPlanOrder.getId());
//如果中奖，增加挂机主表的挂机总收益,返还两次中奖之间的本金
igtOnHookPlanOrderDao.AddProfitById(igtOnHookPlanOrder.getId()
@@ -265,54 +270,54 @@
Log.info("开始更新挂机主表状态");
List<IgtOnHookPlanOrder> igtOnHookPlanOrders = igtOnHookPlanOrderDao.selectByState(3);
- if(CollUtil.isEmpty(igtOnHookPlanOrders)){
- return;
- }
- for(IgtOnHookPlanOrder igtOnHookPlanOrder : igtOnHookPlanOrders){
- Long orderId = igtOnHookPlanOrder.getId();
- Long memberId = igtOnHookPlanOrder.getMemberId();
- BigDecimal planAmount = igtOnHookPlanOrder.getPlanAmount();
- BigDecimal avaAmount = igtOnHookPlanOrder.getAvaAmount();
- //总盈利
+ if(CollUtil.isNotEmpty(igtOnHookPlanOrders)){
+ for(IgtOnHookPlanOrder igtOnHookPlanOrder : igtOnHookPlanOrders){
+ Long orderId = igtOnHookPlanOrder.getId();
+ Long memberId = igtOnHookPlanOrder.getMemberId();
+ BigDecimal planAmount = igtOnHookPlanOrder.getPlanAmount();
+ BigDecimal avaAmount = igtOnHookPlanOrder.getAvaAmount();
+ //总盈利
// BigDecimal totalProfit = igtOnHookPlanOrderItemDao.selectTotalProfitByByOrderIdAndMemberIdAndState(orderId,memberId,1,2);
- BigDecimal totalProfit = igtOnHookPlanOrder.getProfit();
+ BigDecimal totalProfit = igtOnHookPlanOrder.getProfit();
- DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
- String refererIds = dappMemberEntity.getRefererIds();
- List<String> refererIdList = StrUtil.split(refererIds, ",", -1, true, true);
- //生成流水佣金和盈利分成和流水记录，返回剩余盈利
- BigDecimal profitSharingTotal = dappWalletService.updateLSYJYLFC(refererIdList, totalProfit);
- //平台分成，返回剩余盈利
- BigDecimal systemTotal = dappWalletService.updatePTFC(memberId,totalProfit);
- totalProfit = totalProfit.subtract(profitSharingTotal).subtract(systemTotal);
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
+ String refererIds = dappMemberEntity.getRefererIds();
+ List<String> refererIdList = StrUtil.split(refererIds, ",", -1, true, true);
+ //生成流水佣金和盈利分成和流水记录，返回剩余盈利
+ BigDecimal profitSharingTotal = dappWalletService.updateLSYJYLFC(refererIdList, totalProfit);
+ //平台分成，返回剩余盈利
+ BigDecimal systemTotal = dappWalletService.updatePTFC(memberId,totalProfit);
+ totalProfit = totalProfit.subtract(profitSharingTotal).subtract(systemTotal);
- //获取用户信息的是否盈利字段
- DappMemberEntity dappMember = dappMemberDao.selectById(memberId);
- Integer isProfit = dappMember.getIsProfit() == null ? 1 : dappMember.getIsProfit();
+ //获取用户信息的是否盈利字段
+ DappMemberEntity dappMember = dappMemberDao.selectById(memberId);
+ Integer isProfit = dappMember.getIsProfit() == null ? 1 : dappMember.getIsProfit();
- igtOnHookPlanOrder.setState(2);
- //一次挂机剩余的全部金额
- BigDecimal totalMoney = totalProfit.add(avaAmount);
- if(totalMoney.compareTo(planAmount)<=0){
- igtOnHookPlanOrder.setProfitState(2);
- }else{
- igtOnHookPlanOrder.setProfitState(1);
+ igtOnHookPlanOrder.setState(2);
+ //一次挂机剩余的全部金额
+ BigDecimal totalMoney = totalProfit.add(avaAmount);
+ if(totalMoney.compareTo(planAmount)<=0){
+ igtOnHookPlanOrder.setProfitState(2);
+ }else{
+ igtOnHookPlanOrder.setProfitState(1);
+ }
+ igtOnHookPlanOrder.setProfit(totalProfit);
+ igtOnHookPlanOrderDao.updateById(igtOnHookPlanOrder);
+ dappMemberEntity.setIsOnHook(3);
+ dappMemberDao.updateById(dappMemberEntity);
+
+ DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
+ BigDecimal availableAmount = dappWalletCoinEntity.getAvailableAmount();
+ dappWalletCoinDao.addTotalAndaddAvailableById(dappWalletCoinEntity.getId(),totalMoney);
+
+ BigDecimal add = availableAmount.add(totalMoney);
+ BigDecimal subtract = add.subtract(totalProfit);
+ DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberId, subtract, totalProfit, add, "投注盈利", 5);
+ dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
}
- igtOnHookPlanOrder.setProfit(totalProfit);
- igtOnHookPlanOrderDao.updateById(igtOnHookPlanOrder);
- dappMemberEntity.setIsOnHook(3);
- dappMemberDao.updateById(dappMemberEntity);
-
- DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
- BigDecimal availableAmount = dappWalletCoinEntity.getAvailableAmount();
- dappWalletCoinDao.addTotalAndaddAvailableById(dappWalletCoinEntity.getId(),totalMoney);
-
- BigDecimal add = availableAmount.add(totalMoney);
- BigDecimal subtract = add.subtract(totalProfit);
- DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberId, subtract, totalProfit, add, "投注盈利", 5);
- dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
}
+
}
--
Gitblit v1.9.1