From 9cc3cf1059d45956f2def7b2b4beb7a112e85c85 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 22 Oct 2022 18:24:28 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 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 41e93a7..cbd8c16 100644
--- a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
+++ b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
@@ -70,15 +70,13 @@
if(ObjectUtil.isNotEmpty(igtOnHookPlanOrderItem)){
igtOnHookPlanOrderItem.setState(1);
igtOnHookPlanOrderItemDao.updateById(igtOnHookPlanOrderItem);
- if(BigDecimal.ZERO.compareTo(igtOnHookPlanOrderItem.getProfit()) < 0){
- //增加挂机主表的挂机总收益和增加挂机剩余金额
- Integer updateCount = igtOnHookPlanOrderDao.addAvaAmountAddProfitById(igtOnHookPlanOrder.getId()
- ,igtOnHookPlanOrderItem.getProfit()
- ,igtOnHookPlanOrderItem.getAmount());
+ if(2 == igtOnHookPlanOrderItem.getIsGoal()){
+ //如果中奖，增加挂机主表的挂机总收益
+ Integer updateCount = igtOnHookPlanOrderDao.AddProfitById(igtOnHookPlanOrder.getId()
+ ,igtOnHookPlanOrderItem.getProfit());
}else{
- //增加挂机主表的挂机总收益和减少挂机剩余金额
+ //如果不中奖，减少挂机剩余金额即减少本金
Integer updateCount = igtOnHookPlanOrderDao.updateAvaAmountById(igtOnHookPlanOrder.getId()
- ,igtOnHookPlanOrderItem.getProfit()
,igtOnHookPlanOrderItem.getAmount());
}
}
@@ -117,7 +115,7 @@
IgtOnHookPlanOrderItem igtOnHookPlanOrderItem = igtOnHookPlanOrderItemDao.selectByOrderIdAndMemberIdAndState(orderId,memberId,2);
if(ObjectUtil.isEmpty(igtOnHookPlanOrderItem)){
BigDecimal totalProfit = igtOnHookPlanOrderItemDao.selectTotalProfitByByOrderIdAndMemberIdAndState(orderId,memberId,1,2);
- BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByByOrderIdAndMemberIdAndState(orderId,memberId,1,2);
+ BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByByOrderIdAndMemberIdAndState(orderId,memberId,1,1);
igtOnHookPlanOrder.setState(2);
//一次挂机剩余的全部金额
BigDecimal totalMoney = totalAmount.add(totalProfit).add(avaAmount);
@@ -134,13 +132,14 @@
DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
BigDecimal availableAmount = dappWalletCoinEntity.getAvailableAmount();
- //如果中奖，返回本金加收益加剩余投注金额
+
+ //如果中奖，返回收益，如果没中奖，则返回本金,最后加上剩余总挂机金额
BigDecimal total = totalProfit.add(totalAmount).add(igtOnHookPlanOrder.getAvaAmount()).setScale(4, BigDecimal.ROUND_DOWN);
- dappWalletCoinDao.addTotalAndaddAvailableById(memberId,total);
+ dappWalletCoinDao.addTotalAndaddAvailableById(dappWalletCoinEntity.getId(),total);
BigDecimal add = availableAmount.add(total);
-
- DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberId, availableAmount, total, add, "投注盈利", 5);
+ BigDecimal subtract = add.subtract(totalAmount);
+ DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberId, subtract, totalProfit, add, "投注盈利", 5);
dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
}
@@ -213,14 +212,20 @@
}
public static void main(String[] args) {
+
DateTime date = DateUtil.date();
- System.out.println(date);
- String yyyyMMddHHMM = DateUtil.format(date, "yyyy-MM-dd hh:mm");
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ String yyyyMMddHHMM = sdf.format(date);
+
System.out.println(yyyyMMddHHMM);
- SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
- String yyyyMMdd = sdf.format(date);
- System.out.println(yyyyMMdd);
+ DateTime date1 = DateUtil.date();
+
+ SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ String yyyyMMddHHMM1 = sdf1.format(date1);
+
+ System.out.println(yyyyMMddHHMM1);
}
}
--
Gitblit v1.9.1