From afdf7d86cffe39c24b55936321bd3b3133adaf40 Mon Sep 17 00:00:00 2001
From: bfwms <1>
Date: 星期六, 29 三月 2025 16:51:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 20 +++++++++++++++++++-
1 files changed, 19 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 d096517..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()));
@@ -219,4 +224,17 @@
return result;
}
+ /**
+ * 鏌ヨ涓婃姤瀹岀粨鍘嗗彶妗�
+ * @return
+ */
+ @Override
+ public List<Order> selectToBeHistoryOrder() {
+ return this.baseMapper.selectToBeHistoryOrder();
+ }
+
+ @Override
+ public List<Order> selectOrderNoL(String orderNo) {
+ return this.baseMapper.selectOrderNoL(orderNo);
+ }
}
--
Gitblit v1.9.1