From 3db83ef4add286feabba2d5db4eabfa27d5fc5f1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 25 May 2021 17:13:24 +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 | 7 +++++--
1 files changed, 5 insertions(+), 2 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 f402491..8e0cc3d 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/YdPowerJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/YdPowerJob.java
@@ -27,10 +27,12 @@
/**
* 产品生效
*/
- @Scheduled(cron = "* */1 * * * ?")
+ @Scheduled(cron = "0 0/1 * * * ?")
public void orderWork() {
+ log.info("产品生效任务");
QueryWrapper<YdOrderEntity> objectQueryWrapper = new QueryWrapper<>();
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)){
@@ -50,7 +52,8 @@
@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)){
--
Gitblit v1.9.1