From e2fd269da3eafdc7251317a69c6bffbf9c9fca73 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sun, 30 Oct 2022 03:51:10 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java | 51 +++++++++++++++++++++++++++++++--------------------
1 files changed, 31 insertions(+), 20 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
index 9f257c3..9f6930a 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());
- Float maxHours = Float.parseFloat(maxHoursDic.getValue());
- maxHours = maxHours * 60 / 5;
List<IgtOnHookPlanOrderItem> igtOnHookPlanOrderItemsOld = igtOnHookPlanOrderItemDao.selectByIgtIdAndMemberId(igtOnHookPlanOrder.getId(),igtOnHookPlanOrder.getMemberId());
//如果没有中奖记录则是新增一条1挂机方案的挂机子表记录
if(CollUtil.isEmpty(igtOnHookPlanOrderItemsOld)){
@@ -204,6 +206,11 @@
DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCodeAndDesc(
DataDictionaryEnum.PLAN_A.getType(),
Integer.toString(Integer.parseInt(plan)+1));
+ if(ObjectUtil.isEmpty(dataDictionaryCustom)){
+ igtOnHookPlanOrder.setState(3);
+ igtOnHookPlanOrderDao.updateById(igtOnHookPlanOrder);
+ return;
+ }
String dataDictionaryCustomValue = dataDictionaryCustom.getValue();
JSONObject levelMemberValueParse = JSONUtil.parseObj(dataDictionaryCustomValue);
BigDecimal amountPlanA = new BigDecimal(levelMemberValueParse.get("amount").toString())
@@ -236,11 +243,15 @@
igtOnHookPlanOrderItemDao.insert(igtOnHookPlanOrderItem);
if(2 == igtOnHookPlanOrderItem.getIsGoal()){
-
//返还两次中奖之间的本金
- Date startTime = igtOnHookPlanOrderItemsOld.get(0).getCreateTime();
Date endTime = igtOnHookPlanOrderItem.getCreateTime();
- BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByCreateTimeAndOrderId(startTime,endTime,igtOnHookPlanOrder.getId());
+ Date startTime = null;
+ //返回上次中奖的记录
+ IgtOnHookPlanOrderItem igtOld = igtOnHookPlanOrderItemDao.selectByCreateTimeAndIsgoaAndOrderId(endTime,2,igtOnHookPlanOrder.getId());
+ if(ObjectUtil.isNotEmpty(igtOld)){
+ startTime = igtOld.getCreateTime();
+ }
+ BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByCreateTimeAndOrderId(startTime,endTime,igtOnHookPlanOrderItem.getOrderId());
//如果中奖，增加挂机主表的挂机总收益,返还两次中奖之间的本金
igtOnHookPlanOrderDao.AddProfitById(igtOnHookPlanOrder.getId()
,igtOnHookPlanOrderItem.getProfit());
--
Gitblit v1.9.1