From c8c499a916335c804af383a3d52080c9f0c2a01b Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Mon, 7 Aug 2023 17:43:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E7=89=A9=E6=B5=81=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=97=B6=E5=A2=9E=E5=8A=A0=E4=B9=B0=E5=AE=B6id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/LogisticsController.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/api/controller/LogisticsController.php b/app/api/controller/LogisticsController.php
index 02bfce17..8dc1e9b6 100644
--- a/app/api/controller/LogisticsController.php
+++ b/app/api/controller/LogisticsController.php
@@ -161,7 +161,7 @@ class LogisticsController extends BaseApiController
         //查找订单信息
         $order = Db::connect('mysql2')->table('eb_store_order')->alias('s')
             ->leftjoin('eb_merchant m', 'm.mer_id = s.mer_id')
-            ->field('s.real_name, s.user_phone, s.user_address,s.user_address_code,m.mer_name, m.mer_phone, m.mer_address')
+            ->field('s.real_name, s.user_phone,s.uid, s.user_address,s.user_address_code,m.mer_name, m.mer_phone, m.mer_address')
             ->where('order_id', $order_id)->where('order_sn', $order_sn)->find();
         if (!$order) return $this->fail('订单信息不存在');
         $addressCode = explode(',', $order['user_address_code']);
@@ -189,6 +189,7 @@ class LogisticsController extends BaseApiController
                 'shop_name' => $order['mer_name'],
                 'shop_phone' => $order['mer_phone'],
                 'shop_address' => $order['mer_address'],
+                'user_id' => $order['uid'],
                 'user_name' => $order['real_name'],
                 'user_phone' => $order['user_phone'],
                 'user_address' => $order['user_address'],
@@ -290,8 +291,9 @@ class LogisticsController extends BaseApiController
     {
         //获取参数
         $logistics_id = input('logistics_id', 0, 'intval');
+        $user_id = input('user_id', 0, 'intval');
         //获取物流信息
-        $logistics = Db::name('logistics')->where('id', $logistics_id)->find();
+        $logistics = Db::name('logistics')->where('id', $logistics_id)->where('user_id',$user_id)->find();
         if (!$logistics) return $this->fail('物流信息不存在');
         if ($logistics['status'] == 4) return $this->fail('不可更改物流状态');
         //设置记录信息
@@ -322,8 +324,9 @@ class LogisticsController extends BaseApiController
     {
         //获取参数
         $logistics_id = input('logistics_id', 0, 'intval');
+        $user_id = input('user_id', 0, 'intval');
         //获取物流信息
-        $logistics = Db::name('logistics')->where('id', $logistics_id)->find();
+        $logistics = Db::name('logistics')->where('id', $logistics_id)->where('user_id',$user_id)->find();
         if (!$logistics) return $this->fail('物流信息不存在');
         if ($logistics['status'] == 2 || $logistics['status'] == 3 || $logistics['status'] == 4) return $this->fail('订单已完成不能取消订单');
         //设置记录信息