From 73c7e2a5583c3b4013b89ed71bd29473729a5d77 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Sat, 12 Aug 2023 16:24:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BA=97=E4=B8=BB=E5=A7=93?=
 =?UTF-8?q?=E5=90=8D=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/LogisticsLogic.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/api/logic/LogisticsLogic.php b/app/api/logic/LogisticsLogic.php
index 3158604d..1c520f69 100644
--- a/app/api/logic/LogisticsLogic.php
+++ b/app/api/logic/LogisticsLogic.php
@@ -165,7 +165,7 @@ class LogisticsLogic extends BaseLogic
         //查找订单信息
         $order = Order::alias('s')
                 ->leftjoin('eb_merchant m', 'm.mer_id = s.mer_id')
-                ->field('s.real_name, s.user_phone,s.uid, s.user_address,s.user_address_code,s.logistics_code,m.mer_id,m.mer_name,m.mer_phone,m.mer_address,m.long,m.lat')
+                ->field('s.real_name,s.user_phone,s.uid, s.user_address,s.user_address_code,s.logistics_code,m.mer_id,m.mer_name,m.real_name as mer_user_name,m.mer_phone,m.mer_address,m.long,m.lat')
                 ->where('order_id', $params['order_id'])->where('order_sn', $params['order_sn'])->find();
         if(empty($order['user_address_code'])) return ['code'=>1, 'msg'=>'用户地址信息错误'];
         //匹配配送员
@@ -193,6 +193,7 @@ class LogisticsLogic extends BaseLogic
                 'courier_id' => $courier,
                 'shop_id' => $order['mer_id'],
                 'shop_name' => $order['mer_name'],
+                'shop_user' => $order['mer_user_name'],
                 'shop_phone' => $order['mer_phone'],
                 'shop_address' => $order['mer_address'],
                 'shop_long' => $order['long'],