From 45189f71f0eb2c119ea15de98c76839e9ee4b570 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 21 Oct 2022 18:14:48 +0800
Subject: [PATCH] 20221021

---
 src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java |   33 ++++++++++++++++++++++-----------
 1 files changed, 22 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 5d64ce8..ecfc0b9 100644
--- a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
+++ b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
@@ -19,6 +19,7 @@
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.text.Format;
+import java.text.SimpleDateFormat;
 import java.util.List;
 
 @Slf4j
@@ -134,7 +135,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);
@@ -167,7 +168,9 @@
         DateTime aWardTimeStart = DateUtil.parseDateTime(aWardTime + " 00:00:00");
 //        DateTime dateTime = DateUtil.offsetMinute(aWardTimeStart, 5);
 
-        String yyyyMMdd = DateUtil.format(date, "yyyyMMdd");
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+        String yyyyMMdd = sdf.format(date);
         QueryWrapper<DappOnHookAward> dappOnHookAwardQueryWrapper = new QueryWrapper();
         dappOnHookAwardQueryWrapper.like("record_num",yyyyMMdd);
         Integer selectCount = dappOnHookAwardDao.selectCount(dappOnHookAwardQueryWrapper);
@@ -177,7 +180,7 @@
         Format formatCount = new DecimalFormat("000");
         //一般都是将累加的数字当做一些单号的一部分,format要求string
         int dayMillise = (24 * 60) / 5;
-        for(int i= 0;i < dayMillise;i++){
+        for(int i= 1;i <= dayMillise;i++){
             DappOnHookAward dappOnHookAward = new DappOnHookAward();
             int randomInt = RandomUtil.randomInt(10000, 99999);
             dappOnHookAward.setAwardNum(Integer.toString(randomInt));
@@ -194,7 +197,9 @@
     public void updateAwardInfo(){
         Log.info("更新挂架开奖记录");
         DateTime date = DateUtil.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);
         DappOnHookAward dappOnHookAward = dappOnHookAwardDao.selectByByAwardTime(yyyyMMddHHMM);
         dappOnHookAward.setState(1);
         dappOnHookAwardDao.updateById(dappOnHookAward);
@@ -208,14 +213,20 @@
     }
 
     public static void main(String[] args) {
+
         DateTime date = DateUtil.date();
-        String aWardTime = DateUtil.format(date, "yyyy-MM-dd");
-        DateTime aWardTimeStart = DateUtil.parseDateTime(aWardTime + " 00:00:00");
-        int dayMillise = (24 * 60) / 5;
-        for(int i= 0;i < dayMillise;i++){
-            System.out.println(aWardTimeStart);
-            aWardTimeStart = DateUtil.offsetMinute(aWardTimeStart, 5);
-        }
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        String yyyyMMddHHMM = sdf.format(date);
+
+        System.out.println(yyyyMMddHHMM);
+
+        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