From 6c7612602096ce01b19f511afa472b76f4b0c2bd Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Sun, 1 Dec 2024 12:52:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/material/order/service/OrderService.java | 2 +- .../material/order/service/impl/OrderServiceImpl.java | 10 +++++++++- .../mapper/material/order/OrderInfoMapper.xml | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/OrderService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/OrderService.java index 258fec2..b8a943e 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/OrderService.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/OrderService.java @@ -15,5 +15,5 @@ public interface OrderService { List getOrderDetails(OrderInfoDto orderInfoDto) throws Exception; - OrderInfoDto getOrderDetailsById(OrderDetailDto dto); + OrderInfoDto getOrderDetailsById(OrderDetailDto dto) throws Exception; } 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 664ab26..81c7be8 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 @@ -89,9 +89,17 @@ public class OrderServiceImpl implements OrderService { } @Override - public OrderInfoDto getOrderDetailsById(OrderDetailDto dto) { + public OrderInfoDto getOrderDetailsById(OrderDetailDto dto) throws Exception { OrderInfoDto orderInfoDto = orderMapper.getOrderDetailsById(dto); List 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()); + } else { + throw new Exception("订单状态不一致，请检查订单状态"); + } orderInfoDto.setStartTime(list.get(0).getRentBeginTime()); orderInfoDto.setEndTime(list.get(0).getRentEndTime()); orderInfoDto.setDetailsList(list); diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml index ab2a850..77289b1 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml @@ -152,6 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mdi.person_phone AS personPhone, su.phonenumber AS phoneNumber, su.nick_name AS nickName, + sum(hh.costs) cost, moi.address, dept.companyName FROM