From 12b306fbc3622bf8f794ed35521ee8dc3c37882d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 14 May 2021 10:54:45 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/quartz/job/YdPowerJob.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 8e22b46..49a1c38 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;
@@ -17,7 +17,7 @@
@Slf4j
@Component
-@ConditionalOnProperty(prefix = "app", name = "loop-job", havingValue = "true")
+@ConditionalOnProperty(prefix = "app", name = "xch-job", havingValue = "true")
public class YdPowerJob {
@@ -29,15 +29,16 @@
*/
@Scheduled(cron = "0 0/1 * * * ?")
public void orderWork() {
+ log.info("产品生效任务");
QueryWrapper<YdOrderEntity> objectQueryWrapper = new QueryWrapper<>();
- objectQueryWrapper.eq("",YdOrderEntity.ORDER_STATE_READY);
+ objectQueryWrapper.eq("state",YdOrderEntity.ORDER_STATE_READY);
+ objectQueryWrapper.eq("type",YdOrderEntity.PRODUCT_ORDER);
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);
}
@@ -52,13 +53,13 @@
public void orderEnd() {
QueryWrapper<YdOrderEntity> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("",YdOrderEntity.ORDER_STATE_WORK);
+ objectQueryWrapper.eq("type",YdOrderEntity.PRODUCT_ORDER);
List<YdOrderEntity> ydOrderEntities = ydOrderDao.selectList(objectQueryWrapper);
Date date = new Date();
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);
}
--
Gitblit v1.9.1