From d45c948e87332e08ff536e4812dc33f45d5146d6 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Thu, 10 Aug 2023 16:28:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=A9=E6=B5=81=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=89=AB=E6=8F=8F=E6=94=B6=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/Auth.php | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index a58ee5ad..bcb9e364 100644
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -72,16 +72,6 @@ class Auth extends BaseController
         return app('json')->success($logisticsInfo);
     }
 
-    public function takeGoods($id)
-    {
-        $orderSn = $this->request->param('order_sn');
-        if (empty($orderSn)) {
-            return app('json')->fail('参数order_sn不能为空');
-        }
-        app()->make(StoreOrderRepository::class)->takeGoods($id, $orderSn);
-        return app('json')->success('确认收货成功');
-    }
-
     public function test()
     {
         $type = $this->request->param('type');
@@ -891,4 +881,15 @@ class Auth extends BaseController
         return app('json')->success('短信发送成功');
     }
 
+    //物流系统扫码取货确认商家发货
+    public function takeGoods($id)
+    {
+        $orderSn = $this->request->param('order_sn');
+        if (empty($orderSn)) {
+            return app('json')->fail('参数order_sn不能为空');
+        }
+        app()->make(StoreOrderRepository::class)->takeGoods($id, $orderSn);
+        return app('json')->success('确认收货成功');
+    }
+
 }