From b500351cd2eddfe3e8f8b3e05d3e677a20b67e06 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 22 四月 2021 16:40:30 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/common/service/task/OrderScheduler.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
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
index 17b97c5..fd9a5b7 100644
--- a/src/main/java/zy/cloud/wms/common/service/task/OrderScheduler.java
+++ b/src/main/java/zy/cloud/wms/common/service/task/OrderScheduler.java
@@ -1,13 +1,17 @@
package zy.cloud.wms.common.service.task;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
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.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import zy.cloud.wms.manager.entity.Order;
+import zy.cloud.wms.manager.entity.Pakout;
import zy.cloud.wms.manager.service.OrderService;
+import zy.cloud.wms.manager.service.PakoutService;
import java.util.List;
@@ -16,11 +20,13 @@
* Created by vincent on 2021/4/22
*/
@Slf4j
-//@Component
+@Component
public class OrderScheduler {
@Autowired
private OrderService orderService;
+ @Autowired
+ private PakoutService pakoutService;
/**
* 鍙栨秷璁㈠崟澶勭悊鍣�
@@ -30,11 +36,16 @@
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("淇敼璁㈠崟鐘舵�佸け璐�");
+ if (!pakoutService.delete(new EntityWrapper<Pakout>().eq("doc_num", order.getOrderNo()))) {
+ throw new CoolException("鍒犻櫎鎷ｈ揣鍗曞け璐�");
+ }
+ // 鍙栨秷閿�鍞鍗�
+ List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", order.getOrderNo()));
+ if (Cools.isEmpty(pakouts)){
+ // 淇敼鍗曟嵁鐘舵��
+ if (!orderService.updateSettle(order.getOrderNo(), 3L)) {
+ throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
+ }
}
}
--
Gitblit v1.9.1