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 | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
index 45a3f81..9f6930a 100644
--- a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
+++ b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
@@ -206,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())
@@ -238,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