From f2e39fd91af540e9b2c48cbca023721c28ef51f7 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Tue, 11 Mar 2025 16:23:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/material/order/domain/OrderInfoDto.java  | 14 ++++++++++++++
 .../order/service/impl/OrderServiceImpl.java       |  4 ++++
 .../material/basic/BmCompanyAddressMapper.xml      |  1 +
 3 files changed, 19 insertions(+)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java
index e8017af..1e9b647 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java
@@ -156,4 +156,18 @@ public class OrderInfoDto {
     private String keyWord;
 
     private String deviceNames;
+
+    @ApiModelProperty(value = "接单人")
+    private String receivingUser;
+
+    @ApiModelProperty(value = "接单时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private String receivingTime;
+
+    @ApiModelProperty(value = "出库人")
+    private String preOutboundUser;
+
+    @ApiModelProperty(value = "出库时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private String preOutboundTime;
 }
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 0a93db3..9f9cec0 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
@@ -261,6 +261,10 @@ public class OrderServiceImpl implements OrderService {
         orderInfoDto.setPhoneNumber(Sm4Utils.decrypt(orderInfoDto.getPhoneNumber()));
         orderInfoDto.setStartTime(list.get(0).getRentBeginTime());
         orderInfoDto.setEndTime(list.get(0).getRentEndTime());
+        orderInfoDto.setPreOutboundUser(list.get(0).getPreOutboundUser());
+        orderInfoDto.setPreOutboundTime(list.get(0).getPreOutboundTime());
+        orderInfoDto.setReceivingUser(list.get(0).getReceivingUser());
+        orderInfoDto.setReceivingTime(list.get(0).getReceivingTime());
         for (OrderDetailDto orderDetailDto : list) {
             orderDetailDto.setTotalCost(orderDetailDto.getCosts());
             // 出库时间设置为租赁开始时间
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmCompanyAddressMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmCompanyAddressMapper.xml
index 1f8e962..9d4fc06 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmCompanyAddressMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmCompanyAddressMapper.xml
@@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="areaCode != null "> and bca.area_code = #{areaCode}</if>
             <if test="address != null  and address != ''"> and bca.address = #{address}</if>
         </where>
+        ORDER BY bca.create_time DESC
     </select>
     
     <select id="selectBmCompanyAddressById" parameterType="Long" resultMap="BmCompanyAddressResult">