From 586aa21b412737b346db55beeb850c7378e37c88 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Sun, 1 Dec 2024 12:01:48 +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/impl/OrderServiceImpl.java | 2 ++
 .../main/resources/mapper/material/order/OrderInfoMapper.xml    | 1 +
 2 files changed, 3 insertions(+)

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 8e605e0..7725069 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
@@ -82,6 +82,8 @@ public class OrderServiceImpl implements OrderService {
             } else {
                 throw new Exception("订单状态不一致，请检查订单状态");
             }
+            dto.setStartTime(list.get(0).getRentBeginTime());
+            dto.setEndTime(list.get(0).getRentEndTime());
         }
         return orderInfoDtos;
     }
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 1946487..d43992c 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
@@ -73,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         mdi.person_phone AS personPhone,
         su.phonenumber AS phoneNumber,
         moi.address,
+        sum(hh.costs) cost,
         dept.companyName
         FROM
         ma_order_details hh