From 3f114403185072d9745940d7ff855eedd51c9812 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 21 Oct 2022 18:31:08 +0800
Subject: [PATCH] 20221021

---
 src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
index bdb31bd..0efc173 100644
--- a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
+++ b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
@@ -71,11 +71,6 @@
                 igtOnHookPlanOrderItem.setState(1);
                 igtOnHookPlanOrderItemDao.updateById(igtOnHookPlanOrderItem);
                 if(BigDecimal.ZERO.compareTo(igtOnHookPlanOrderItem.getProfit()) < 0){
-                    //增加挂机主表的挂机总收益和增加挂机剩余金额
-                    Integer updateCount = igtOnHookPlanOrderDao.addAvaAmountAddProfitById(igtOnHookPlanOrder.getId()
-                            ,igtOnHookPlanOrderItem.getProfit()
-                            ,igtOnHookPlanOrderItem.getAmount());
-                }else{
                     //增加挂机主表的挂机总收益和减少挂机剩余金额
                     Integer updateCount = igtOnHookPlanOrderDao.updateAvaAmountById(igtOnHookPlanOrder.getId()
                             ,igtOnHookPlanOrderItem.getProfit()
@@ -135,7 +130,7 @@
                 DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
                 BigDecimal availableAmount = dappWalletCoinEntity.getAvailableAmount();
                 //如果中奖,返回本金加收益加剩余投注金额
-                BigDecimal total = totalProfit.add(totalAmount).add(igtOnHookPlanOrder.getAvaAmount()).setScale(2, BigDecimal.ROUND_DOWN);
+                BigDecimal total = totalProfit.add(totalAmount).add(igtOnHookPlanOrder.getAvaAmount()).setScale(4, BigDecimal.ROUND_DOWN);
                 dappWalletCoinDao.addTotalAndaddAvailableById(memberId,total);
 
                 BigDecimal add = availableAmount.add(total);
@@ -213,14 +208,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