From 0ca75d4910049043e05d49ddbdf83a83dc7354ae Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 22 四月 2021 13:36:27 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/common/service/task/OrderScheduler.java | 43 +++++++++++++++++++++++++++++++++++++++++++
src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java | 2 +-
src/main/webapp/views/order/order.html | 2 +-
3 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java b/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
index 4f829bc..a82b817 100644
--- a/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
+++ b/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
@@ -624,7 +624,7 @@
existNumbers.add(result0.getNumber());
}
for (String number : existNumbers) {
- if (!orderService.updateSettle(number, 3L)) {
+ if (!orderService.updateSettle(number, 5L)) {
// throw new CoolException("淇敼璁㈠崟鐘舵�佸け璐�");
}
}
diff --git a/src/main/java/zy/cloud/wms/common/service/task/OrderScheduler.java b/src/main/java/zy/cloud/wms/common/service/task/OrderScheduler.java
new file mode 100644
index 0000000..3dfd51d
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/common/service/task/OrderScheduler.java
@@ -0,0 +1,43 @@
+package zy.cloud.wms.common.service.task;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.exception.CoolException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.transaction.annotation.Transactional;
+import zy.cloud.wms.manager.entity.Order;
+import zy.cloud.wms.manager.service.OrderService;
+
+import java.util.List;
+
+/**
+ * 璁㈠崟澶勭悊鍣�
+ * Created by vincent on 2021/4/22
+ */
+@Slf4j
+//@Component
+public class OrderScheduler {
+
+ @Autowired
+ private OrderService orderService;
+
+ /**
+ * 鍙栨秷璁㈠崟澶勭悊鍣�
+ */
+ @Transactional
+ @Scheduled(cron = "0/10 * * * * ? ")
+ public void cancelOrderExecute(){
+ List<Order> cancelOrders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 5));
+ for (Order order : cancelOrders) {
+
+
+
+ if (!orderService.updateSettle(order.getOrderNo(), 3L)) {
+ throw new CoolException("淇敼璁㈠崟鐘舵�佸け璐�");
+ }
+ }
+
+ }
+
+}
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 5579883..59dc43a 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -132,7 +132,7 @@
class="layui-badge layui-badge-gray"
{{# } else if(d.settle === 4){ }}
class="layui-badge layui-badge-green"
- {{# } else if(d.settle === 6){ }}
+ {{# } else { }}
class="layui-badge layui-badge-gray"
{{# } }}
>{{d.settle$}}</span>
--
Gitblit v1.9.1