From 32dfc0b0de06b024eb963344ac428b37bb7756d6 Mon Sep 17 00:00:00 2001
From: sxu <1539530615@qq.com>
Date: Tue, 5 Dec 2023 10:56:30 +0800
Subject: [PATCH] fix

---
 .../bonus/zlpt/common/core/domain/order/vo/OrderInfoVo.java   | 4 +---
 .../zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml  | 3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderInfoVo.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderInfoVo.java
index 3630ab2..1d0a765 100644
--- a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderInfoVo.java
+++ b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderInfoVo.java
@@ -16,7 +16,5 @@ public class OrderInfoVo extends OrderInfo {
     private String deviceName;
     private Long maId;
     private String orderPhone;
-
-
-
+    private String supplierCompany;
 }
diff --git a/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml b/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml
index c70ba57..4368085 100644
--- a/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml
+++ b/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml
@@ -23,9 +23,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectOrderInfoList" parameterType="com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo" resultType="com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo">
-        select o.*,d.phone as order_phone,d.ma_id
+        select o.*,d.phone as order_phone,d.ma_id,co.company_name as supplier_company
         from ma_order_info o
         left join ma_order_details d on o.order_id=d.order_id
+        left join bm_company_info co on o.supplier=co.company_id
         <where>  
             <if test="orderId != null "> and o.order_id = #{orderId}</if>
             <if test="pId != null "> and o.p_id = #{pId}</if>