From 00d4233e95dd39ac8948c1bec7a25ba01058ac2c Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 11 Dec 2024 15:38:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E7=8B=AC=E9=80=80=E7=A7=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/service/impl/OrderServiceImpl.java        | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java
index 377b632..16e22b9 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java
@@ -102,7 +102,7 @@ public class OrderServiceImpl implements OrderService {
                     .min((p1, p2) -> Integer.compare(Integer.parseInt(p1.getOrderStatus()), Integer.parseInt(p2.getOrderStatus())));
             if (minOrderStatus.isPresent()) {
                 dto.setOrderStatus(minOrderStatus.get().getOrderStatus());
-            }//TODO外层订单状态
+            }
             dto.setStartTime(list.get(0).getRentBeginTime());
             dto.setEndTime(list.get(0).getRentEndTime());
             //根据订单id去lease_repair_record表中查询是否已填写退租检修信息
@@ -120,12 +120,11 @@ public class OrderServiceImpl implements OrderService {
     public OrderInfoDto getOrderDetailsById(OrderDetailDto dto) throws Exception {
         OrderInfoDto orderInfoDto = orderMapper.getOrderDetailsById(dto);
         List<OrderDetailDto> list = orderMapper.selectOrderDetailsByOderId(dto.getOrderId().toString());
-        boolean orderStatus = list.stream()
-                .map(OrderDetailDto::getOrderStatus)
-                .allMatch(name -> name.equals(list.get(0).getOrderStatus()));
-        if (orderStatus) {
-            orderInfoDto.setOrderStatus(list.get(0).getOrderStatus());
-        }//TODO外层订单状态
+        Optional<OrderDetailDto> minOrderStatus = list.stream()
+                .min((p1, p2) -> Integer.compare(Integer.parseInt(p1.getOrderStatus()), Integer.parseInt(p2.getOrderStatus())));
+        if (minOrderStatus.isPresent()) {
+            orderInfoDto.setOrderStatus(minOrderStatus.get().getOrderStatus());
+        }
         orderInfoDto.setStartTime(list.get(0).getRentBeginTime());
         orderInfoDto.setEndTime(list.get(0).getRentEndTime());
         orderInfoDto.setDetailsList(list);