From 6a0e1564efae8aa6069bddedef749bf5c8b9b0c4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 28 May 2021 15:52:36 +0800
Subject: [PATCH] Merge branch 'yunding' of http://120.27.238.55:7000/r/exchange into yunding
---
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 19e7d3c..8e0cc3d 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;
@@ -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);
}
@@ -51,14 +52,14 @@
@Scheduled(cron = "0 0/1 * * * ?")
public void orderEnd() {
QueryWrapper<YdOrderEntity> objectQueryWrapper = new QueryWrapper<>();
- objectQueryWrapper.eq("",YdOrderEntity.ORDER_STATE_WORK);
+ objectQueryWrapper.eq("state",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