From 355c15b76a4720f24d02ee1f6d222476b467e5ad Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Fri, 11 Aug 2023 09:27:01 +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=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/order/StoreOrderRepository.php      | 57 ++++++-------------
 app/controller/api/Auth.php                   |  4 +-
 app/controller/api/server/StoreOrder.php      | 11 ++++
 route/api.php                                 |  2 +-
 4 files changed, 31 insertions(+), 43 deletions(-)

diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index 5e860628..fee69b1b 100644
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -785,46 +785,6 @@ class StoreOrderRepository extends BaseRepository
         event('order.take', compact('order'));
     }
 
-    /**
-     * @param $id
-     * @param User $user
-     * @throws DataNotFoundException
-     * @throws DbException
-     * @throws ModelNotFoundException
-     * @author xaboy
-     * @day 2020/6/17
-     */
-    public function takeGoods($id, $orderSn)
-    {
-        $order = $this->dao->search([], null)->where('order_sn', $orderSn)->where('order_id', $id)->where('StoreOrder.is_del', 0)->find();
-        if (!$order)
-            throw new ValidateException('订单不存在');
-        if ($order['status'] != 1 || $order['order_type'])
-            throw new ValidateException('订单状态有误');
-        $func = 'createUserLog';
-        $user = $order->user;
-        $order->status = 2;
-        $order->verify_time = date('Y-m-d H:i:s');
-        /*
-        event('order.take.before', compact('order'));
-        //订单记录
-        $storeOrderStatusRepository = app()->make(StoreOrderStatusRepository::class);
-        $orderStatus = [
-            'order_id' => $order->order_id,
-            'order_sn' => $order->order_sn,
-            'type' => $storeOrderStatusRepository::TYPE_ORDER,
-            'change_message' => '已收货',
-            'change_type' => $storeOrderStatusRepository::ORDER_STATUS_TAKE,
-        ];
-        Db::transaction(function () use ($order, $user,$storeOrderStatusRepository,$orderStatus,$func) {
-            $this->takeAfter($order, $user);
-            $order->save();
-            $storeOrderStatusRepository->{$func}($orderStatus);
-        });
-        event('order.take', compact('order'));
-        */
-    }
-
 
     /**
      *  获取订单列表头部统计数据
@@ -2675,4 +2635,21 @@ class StoreOrderRepository extends BaseRepository
         return $return;
     }
 
+    /**
+     * @param $orderId
+     * @param $orderSn
+     * 更新扫描发货状态
+     */
+    public function takeGoods($orderId, $orderSn)
+    {
+        $order = $this->dao->search([], null)->where('order_sn', $orderSn)->where('order_id', $orderId)->where('StoreOrder.is_del', 0)->find();
+        if (!$order)
+            throw new ValidateException('订单不存在');
+        if ($order['status'] != 0 || $order['order_type'])
+            throw new ValidateException('订单状态有误');
+        $order->status = 1;
+        $order->mark   = '快递员扫描取件';
+        $order->save();
+    }
+
 }
diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index bcb9e364..1d995d3e 100644
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -882,13 +882,13 @@ class Auth extends BaseController
     }
 
     //物流系统扫码取货确认商家发货
-    public function takeGoods($id)
+    public function deliveryGoods($id)
     {
         $orderSn = $this->request->param('order_sn');
         if (empty($orderSn)) {
             return app('json')->fail('参数order_sn不能为空');
         }
-        app()->make(StoreOrderRepository::class)->takeGoods($id, $orderSn);
+        app()->make(StoreOrderRepository::class)->deliveryGoods($id, $orderSn);
         return app('json')->success('确认收货成功');
     }
 
diff --git a/app/controller/api/server/StoreOrder.php b/app/controller/api/server/StoreOrder.php
index e2f52866..bcb876cc 100644
--- a/app/controller/api/server/StoreOrder.php
+++ b/app/controller/api/server/StoreOrder.php
@@ -200,6 +200,17 @@ class StoreOrder extends BaseController
         return app('json')->success('发货成功');
     }
 
+    /**
+     * TODO 扫描发货
+     * @param $orderId
+     * @param $orderSn
+     */
+    public function deliveryGoods($orderId, $orderSn, StoreOrderRepository $repository)
+    {
+        app()->make(StoreOrderRepository::class)->takeGoods($orderId, $orderSn);
+        return app('json')->success('扫描发货成功');
+    }
+
     public function payPrice($merId, StoreOrderRepository $repository)
     {
         list($start, $stop, $month) = $this->request->params([
diff --git a/route/api.php b/route/api.php
index 095c57dc..75f907ad 100644
--- a/route/api.php
+++ b/route/api.php
@@ -22,7 +22,7 @@ use think\facade\Route;
 Route::group('api/', function () {
     Route::any('test', 'api.Auth/test');
     Route::any('dotest', 'api.Auth/dotest');
-    Route::post('goods/take/:id', 'api.Auth/takeGoods');
+    Route::post('goods/take/:id', 'api.Auth/deliveryGoods');
     Route::resource('upload', 'api.Upload');
     Route::post('articleCatch', 'api.Upload/article');
     //强制登录