From 5a1cf0ab5d9b7880fcb8695cd5de4258906646cd Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 16 Dec 2024 18:07:31 +0800
Subject: [PATCH] order info improvement

---
 .../java/com/bonus/material/order/domain/OrderInfoDto.java   | 5 +++++
 .../main/resources/mapper/material/order/OrderInfoMapper.xml | 3 +++
 2 files changed, 8 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 a05329e..b48b674 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
@@ -62,6 +62,11 @@ public class OrderInfoDto {
 
     @ApiModelProperty(value = "买方承租方用户id")
     private Integer buyerId;
+    @ApiModelProperty(value = "买方承租方用户名字")
+    private Integer buyerName;
+    @ApiModelProperty(value = "卖方出租方用户名字")
+    private Integer sellerName;
+
     @ApiModelProperty(value = "买方承租方公司id")
     private Integer buyerCompany;
     @ApiModelProperty(value = "卖方出租方公司id")
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 039ceef..7be760b 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
@@ -101,6 +101,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         up.dept_name AS czcompanyName,
         mdi.person_phone AS personPhone,
         su.phonenumber AS phoneNumber,
+        su.nick_name as buyerName,
+        su2.nick_name as sellerName,
         moi.address,
         moi.order_id,
         sum(hh.costs) cost,
@@ -111,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN ma_dev_info mdi ON hh.ma_id = mdi.ma_id
         LEFT JOIN ma_type mt ON mdi.type_id = mt.type_id
         LEFT JOIN sys_user su ON su.user_id = moi.buyer_id
+        LEFT JOIN sys_user su2 ON su2.user_id = mdi.own_id
         left join sys_dept dept on dept.dept_id = moi.buyer_company
         left join sys_dept up on up.dept_id = mdi.own_co
         WHERE