From 6b8e395f307326553bcef431be293c422ac05ef0 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Fri, 11 Aug 2023 09:35:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=89=AB=E6=8F=8F=E5=8F=96?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/repositories/store/order/StoreOrderRepository.php | 2 +-
 app/controller/api/Auth.php                                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index fee69b1b..398fbf6f 100644
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -2640,7 +2640,7 @@ class StoreOrderRepository extends BaseRepository
      * @param $orderSn
      * 更新扫描发货状态
      */
-    public function takeGoods($orderId, $orderSn)
+    public function deliveryGoods($orderId, $orderSn)
     {
         $order = $this->dao->search([], null)->where('order_sn', $orderSn)->where('order_id', $orderId)->where('StoreOrder.is_del', 0)->find();
         if (!$order)
diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index 1d995d3e..fea0c4de 100644
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -889,7 +889,7 @@ class Auth extends BaseController
             return app('json')->fail('参数order_sn不能为空');
         }
         app()->make(StoreOrderRepository::class)->deliveryGoods($id, $orderSn);
-        return app('json')->success('确认收货成功');
+        return app('json')->success('快递员扫描取件成功');
     }
 
 }