From 7003875c503a211f85986e1b880728f8fbe7458d Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Thu, 28 Sep 2023 15:03:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=94=B6=E8=B4=A7=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/Auth.php                   | 12 ------------
 app/controller/merchant/store/order/Order.php | 15 +++++++++++++++
 route/api.php                                 |  1 -
 route/merchant/order.php                      |  4 ++++
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index 34f8eeaa..0c0983f3 100644
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -1511,16 +1511,4 @@ class Auth extends BaseController
         $data = $repository->getResult($type);
         return app('json')->success($data);
     }
-
-    public function merlogisticsCode($mer_id, $id)
-    {
-        $storeInfo = Db::name('store_service')->where('mer_id', $mer_id)->find();
-        if (!$storeInfo)
-            return app('json')->fail('商户信息有误');
-        $make = app()->make(StoreOrderRepository::class);
-        $order = $make->getWhere(['order_id' => $id, 'mer_id' => $storeInfo['mer_id'], 'is_del' => 0]);
-        if (!$order)
-            return app('json')->fail('订单状态有误');
-        return app('json')->success(['qrcode' => $make->logisticsQrcode($id, $order->order_sn)]);
-    }
 }
diff --git a/app/controller/merchant/store/order/Order.php b/app/controller/merchant/store/order/Order.php
index c4e6ecfc..169c685f 100644
--- a/app/controller/merchant/store/order/Order.php
+++ b/app/controller/merchant/store/order/Order.php
@@ -375,6 +375,21 @@ class Order extends BaseController
         return app('json')->success($this->repository->express($id, $this->request->merId()));
     }
 
+    /**
+     * 设置取货码
+     */
+    public function qrcode($id)
+    {
+        $storeInfo = Db::name('store_service')->where('mer_id', $this->request->merId())->find();
+        if (!$storeInfo)
+            return app('json')->fail('商户信息有误');
+        $make = app()->make(StoreOrderRepository::class);
+        $order = $make->getWhere(['order_id' => $id, 'mer_id' => $storeInfo['mer_id'], 'is_del' => 0]);
+        if (!$order)
+            return app('json')->fail('订单状态有误');
+        return app('json')->success(['qrcode' => $make->logisticsQrcode($id, $order->order_sn)]);
+    }
+
     /**
      * TODO
      * @param $id
diff --git a/route/api.php b/route/api.php
index cfa8b157..dd45b58a 100644
--- a/route/api.php
+++ b/route/api.php
@@ -21,7 +21,6 @@ use think\facade\Route;
 
 Route::group('api/', function () {
     Route::any('test', 'api.Auth/test');
-    Route::get('mer/:mer_id/logistics_code/:id', 'api.Auth/merlogisticsCode');
     Route::any('dotest', 'api.Auth/dotest');
     Route::post('merchant/syncStatus/:id', 'api.Auth/merchantStatus');
     Route::get('business/agree', 'api.Auth/businessAgree');
diff --git a/route/merchant/order.php b/route/merchant/order.php
index d66feac4..75480e02 100644
--- a/route/merchant/order.php
+++ b/route/merchant/order.php
@@ -52,6 +52,10 @@ Route::group(function () {
             '_alias' => '列表',
         ]);
 
+        Route::get('qrcode/:id', 'Order/qrcode')->name('merchantStoreOrderQrcode')->option([
+            '_alias' => '订单收货码',
+        ]);
+
         Route::get('express/:id', 'Order/express')->name('merchantStoreOrderExpress')->option([
             '_alias' => '快递查询',
         ]);