czg_team
/
video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/dev' into test 

# Conflicts:
#	src/main/java/com/sqx/modules/job/task/TempOrdersTask.java
This commit is contained in:
张松 2024-12-26 17:41:42 +08:00
parent 372754bb65 54778f4078
commit 3b925f5070
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/sqx/modules/job/task/TempOrdersTask.java
View File

@ -2,6 +2,7 @@ package com.sqx.modules.job.task;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.thread.ThreadUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@ -71,11 +72,16 @@ public class TempOrdersTask implements ITask {
@Override @Override
public void run(String params) { public void run(String params) {
logger.info("订单表数据处理开始"); logger.info("订单表数据处理开始");
List<Orders> orders = ordersDao.selectList(Wrappers.<Orders>lambdaQuery().eq(Orders::getStatus, 0)); List<Orders> orders = ordersDao.selectList(Wrappers.<Orders>lambdaQuery()
.eq(Orders::getStatus, 0)
.lt(Orders::getCreateTime, DateUtil.offsetMinute(DateUtil.date(), -5)));
if (CollUtil.isEmpty(orders)) { if (CollUtil.isEmpty(orders)) {
return; return;
} }
for (Orders order : orders) { for (Orders order : orders) {
ThreadUtil.sleep(100);
PayDetails payDetails = payDetailsDao.selectByOrderId(order.getOrdersNo()); PayDetails payDetails = payDetailsDao.selectByOrderId(order.getOrdersNo());
if (payDetails == null) { if (payDetails == null) {
order.setStatus(3); order.setStatus(3);
@ -97,12 +103,18 @@ public class TempOrdersTask implements ITask {
updateOrderStatus(payDetails, order); updateOrderStatus(payDetails, order);
}else { }else {
order.setStatus(3); order.setStatus(3);
updateOrderStatus(payDetails, order); payDetails.setState(3);
ordersDao.updateById(order);
payDetailsDao.updateById(payDetails);
} }
} }
logger.info("订单表数据处理完毕"); logger.info("订单表数据处理完毕");
} }
public static void main(String[] args) {
WuyouPay.queryOrder("1000001323859732", "0.5", "Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1 Edg/131.0.0.0");
}
private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
private void updateOrderStatus(PayDetails payDetails, Orders order) { private void updateOrderStatus(PayDetails payDetails, Orders order) {