From 921e36c7ac21de2bd8615b6d5a839e297a8c547c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 29 Oct 2022 21:10:19 +0800
Subject: [PATCH] 20221021

---
 src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java |   36 +++++++++++++++++++-----------------
 1 files changed, 19 insertions(+), 17 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..45a3f81 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)){

--
Gitblit v1.9.1