From a65df41c3243877352fe6822b65c1836ddc3c19d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 12 May 2021 14:51:14 +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 | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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 737e800..8e22b46 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/YdPowerJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/YdPowerJob.java
@@ -1,6 +1,7 @@
package com.xcong.excoin.quartz.job;
import cn.hutool.core.collection.CollUtil;
+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;
@@ -26,7 +27,7 @@
/**
* 产品生效
*/
- @Scheduled(cron = "0/10 * * * * ?")
+ @Scheduled(cron = "0 0/1 * * * ?")
public void orderWork() {
QueryWrapper<YdOrderEntity> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("",YdOrderEntity.ORDER_STATE_READY);
@@ -35,9 +36,10 @@
if(CollUtil.isNotEmpty(ydOrderEntities)){
for(YdOrderEntity ydOrderEntity : ydOrderEntities){
Date workTime = ydOrderEntity.getWorkTime();
- if(DateUtil.compare_date(date.toString(),workTime.toString()) == 1){
- ydOrderEntity.setState(YdOrderEntity.ORDER_STATE_WORK);
- ydOrderDao.updateById(ydOrderEntity);
+ if(DateUtil.compare_date(date.toString(),workTime.toString()) == 1
+ && ObjectUtil.isNotEmpty(workTime)){
+ Long id = ydOrderEntity.getId();
+ ydOrderDao.UpdateByIdAndState(id,YdOrderEntity.ORDER_STATE_WORK);
}
}
}
@@ -46,7 +48,7 @@
/**
* 产品终止
*/
- @Scheduled(cron = "0/10 * * * * ?")
+ @Scheduled(cron = "0 0/1 * * * ?")
public void orderEnd() {
QueryWrapper<YdOrderEntity> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("",YdOrderEntity.ORDER_STATE_WORK);
@@ -55,9 +57,10 @@
if(CollUtil.isNotEmpty(ydOrderEntities)){
for(YdOrderEntity ydOrderEntity : ydOrderEntities){
Date endTime = ydOrderEntity.getEndTime();
- if(DateUtil.compare_date(date.toString(),endTime.toString()) == 1) {
- ydOrderEntity.setState(YdOrderEntity.ORDER_STATE_END);
- ydOrderDao.updateById(ydOrderEntity);
+ if(DateUtil.compare_date(date.toString(),endTime.toString()) == 1
+ && ObjectUtil.isNotEmpty(endTime)) {
+ Long id = ydOrderEntity.getId();
+ ydOrderDao.UpdateByIdAndState(id,YdOrderEntity.ORDER_STATE_END);
}
}
}
--
Gitblit v1.9.1