From 71a5b265af7b8046cbfd65986d4d0adf785d8cbc Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 13 May 2021 18:56:13 +0800
Subject: [PATCH] modify

---
 src/test/java/com/xcong/excoin/XchTest.java               |   15 ++++++++++++---
 src/main/java/com/xcong/excoin/quartz/job/YdPowerJob.java |   12 +++++-------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/quartz/job/YdPowerJob.java b/src/main/java/com/xcong/excoin/quartz/job/YdPowerJob.java
index 19e7d3c..f402491 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/YdPowerJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/YdPowerJob.java
@@ -1,9 +1,9 @@
 package com.xcong.excoin.quartz.job;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.xcong.excoin.modules.blackchain.service.DateUtil;
 import com.xcong.excoin.modules.yunding.dao.YdOrderDao;
 import com.xcong.excoin.modules.yunding.entity.YdOrderEntity;
 import lombok.extern.slf4j.Slf4j;
@@ -27,17 +27,16 @@
     /**
      * 产品生效
      */
-    @Scheduled(cron = "0 0/1 * * * ?")
+    @Scheduled(cron = "* */1 * * * ?")
     public void orderWork() {
         QueryWrapper<YdOrderEntity> objectQueryWrapper = new QueryWrapper<>();
-        objectQueryWrapper.eq("",YdOrderEntity.ORDER_STATE_READY);
+        objectQueryWrapper.eq("state",YdOrderEntity.ORDER_STATE_READY);
         List<YdOrderEntity> ydOrderEntities = ydOrderDao.selectList(objectQueryWrapper);
         Date date = new Date();
         if(CollUtil.isNotEmpty(ydOrderEntities)){
             for(YdOrderEntity ydOrderEntity : ydOrderEntities){
                 Date workTime = ydOrderEntity.getWorkTime();
-                if(DateUtil.compare_date(date.toString(),workTime.toString()) == 1
-                        && ObjectUtil.isNotEmpty(workTime)){
+                if(ObjectUtil.isNotEmpty(workTime) && DateUtil.compare(date, workTime) > -1){
                     Long id = ydOrderEntity.getId();
                     ydOrderDao.UpdateByIdAndState(id,YdOrderEntity.ORDER_STATE_WORK);
                 }
@@ -57,8 +56,7 @@
         if(CollUtil.isNotEmpty(ydOrderEntities)){
             for(YdOrderEntity ydOrderEntity : ydOrderEntities){
                 Date endTime = ydOrderEntity.getEndTime();
-                if(DateUtil.compare_date(date.toString(),endTime.toString()) == 1
-                        && ObjectUtil.isNotEmpty(endTime)) {
+                if(ObjectUtil.isNotEmpty(endTime) && DateUtil.compare(date, endTime) > -1) {
                     Long id = ydOrderEntity.getId();
                     ydOrderDao.UpdateByIdAndState(id,YdOrderEntity.ORDER_STATE_END);
                 }
diff --git a/src/test/java/com/xcong/excoin/XchTest.java b/src/test/java/com/xcong/excoin/XchTest.java
index 1e62deb..1a70038 100644
--- a/src/test/java/com/xcong/excoin/XchTest.java
+++ b/src/test/java/com/xcong/excoin/XchTest.java
@@ -4,6 +4,7 @@
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import com.xcong.excoin.modules.yunding.service.XchProfitService;
+import com.xcong.excoin.quartz.job.YdPowerJob;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -21,9 +22,9 @@
 
     @Test
     public void dateUtilTest() {
-        String day1 = "2021-05-11 23:00:00";
-        String day2 = "2021-05-12 23:01:00";
-        System.out.println(DateUtil.between(DateUtil.parse(day1), DateUtil.parse(day2), DateUnit.DAY));
+        String day1 = "2021-05-12 22:00:00";
+        String day2 = "2021-05-12 23:00:00";
+        System.out.println(DateUtil.compare(DateUtil.parse(day1, "yyyy-MM-dd HH:mm:ss"), DateUtil.parse(day2, "yyyy-MM-dd HH:mm:ss")));
     }
 
     @Test
@@ -35,4 +36,12 @@
     public void orderUsdtProfitTest() {
         xchProfitService.usdtProfitDistributorByOrderId(7L);
     }
+
+    @Autowired
+    private YdPowerJob ydPowerJob;
+
+    @Test
+    public void ydPowerTest() {
+        ydPowerJob.orderWork();
+    }
 }

--
Gitblit v1.9.1