From d3bae0a78890ab4ac9b191c2b7c5380917652a39 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 12 May 2021 10:26:18 +0800
Subject: [PATCH] 20210510 云顶
---
src/main/resources/mapper/yunding/YdOrderDao.xml | 7 +++++++
src/main/java/com/xcong/excoin/quartz/job/YdPowerJob.java | 19 +++++++++++--------
src/main/java/com/xcong/excoin/modules/yunding/dao/YdOrderDao.java | 2 ++
3 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/dao/YdOrderDao.java b/src/main/java/com/xcong/excoin/modules/yunding/dao/YdOrderDao.java
index bc94fec..f83fcf7 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/dao/YdOrderDao.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/dao/YdOrderDao.java
@@ -15,4 +15,6 @@
IPage<YdOrderVo> getOrderList(Page<YdOrderVo> page, @Param("record") YdOrderEntity ydOrderEntity);
List<YdOrderEntity> selectNeedReturnOrders();
+
+ void UpdateByIdAndState(@Param("id")Long id, @Param("state")int state);
}
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);
}
}
}
diff --git a/src/main/resources/mapper/yunding/YdOrderDao.xml b/src/main/resources/mapper/yunding/YdOrderDao.xml
index f8c2e8a..f332bfe 100644
--- a/src/main/resources/mapper/yunding/YdOrderDao.xml
+++ b/src/main/resources/mapper/yunding/YdOrderDao.xml
@@ -27,4 +27,11 @@
where a.state=2 and a.return_state=1
</select>
+ <update id="UpdateByIdAndState">
+ UPDATE yd_order s
+ SET s.state = #{state}
+ WHERE
+ id = #{id}
+ </update>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1