From ee332179e2e6f6aaa8c420b2f8fc8f44e6e971cc Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 26 五月 2023 13:14:41 +0800
Subject: [PATCH] #订单历史档完成

---
 src/main/java/com/zy/asrs/controller/OrderController.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 788843b..244d8de 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -36,6 +36,8 @@
     private WaitPakinService waitPakinService;
     @Autowired
     private LocOwnerService locOwnerService;
+    @Autowired
+    private OrderLogService orderLogService;
 
     @RequestMapping(value = "/order/nav/list/auth")
     @ManagerAuth
@@ -105,9 +107,13 @@
             param.setOrderNo(prefix + snowflakeIdWorker.nextId());
         }
         Order order = orderService.selectByNo(param.getOrderNo());
+        OrderLog orderLog = orderLogService.selectByNo(param.getOrderNo());
         if (order != null) {
             return R.error("鍗曟嵁缂栧彿宸插瓨鍦�");
         }
+        if (orderLog != null) {
+            return R.error("鍗曟嵁缂栧彿鍦ㄥ巻鍙叉。涓凡瀛樺湪");
+        }
         Date now = new Date();
         order = new Order(
                 String.valueOf(snowflakeIdWorker.nextId()),    // 缂栧彿[闈炵┖]

--
Gitblit v1.9.1