From ffcf87710c84ba534ae9298e6932067536b53e3d Mon Sep 17 00:00:00 2001
From: bfwms <1>
Date: 星期六, 17 八月 2024 09:53:08 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 8c7a776..c9d2f09 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -60,6 +60,11 @@
     }
 
     @Override
+    public List<OrderDetl> selectTotalDetls(Long orderId) {
+        return orderDetlMapper.selectTotalDetls(orderId);
+    }
+
+    @Override
     public boolean updateSettle(Long orderId, Long settle, Long userId) {
         return this.baseMapper.updateSettle(orderId, settle, userId) > 0;
     }
@@ -67,7 +72,7 @@
     @Override
     public void checkComplete(String orderNo) {
         Order order = this.selectByNo(orderNo);
-        if (order.getSettle() >= 4L) {
+        if (order==null || order.getSettle() >= 4L) {
             return;
         }
         List<OrderDetl> orderDetls = orderDetlMapper.selectList(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()));
@@ -227,4 +232,9 @@
     public List<Order> selectToBeHistoryOrder() {
         return this.baseMapper.selectToBeHistoryOrder();
     }
+
+    @Override
+    public List<Order> selectOrderNoL(String orderNo) {
+        return this.baseMapper.selectOrderNoL(orderNo);
+    }
 }

--
Gitblit v1.9.1