From 8dc003eb8ae0501afaaaa0095d3d9a33504722ee Mon Sep 17 00:00:00 2001
From: xuanchen <122383162@qq.com>
Date: Tue, 17 Jan 2023 16:53:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Area/AreaCodeController.php   |  2 +-
 app/Api/Routes/area.php                       |  8 +++++-
 config/logging.php                            |  3 ++-
 .../Http/Controllers/Api/OrderController.php  | 27 +++++++++++++++++++
 modules/Mall/Models/Order.php                 |  8 +++---
 modules/Mall/Routes/api.php                   |  1 +
 .../Api/Socialite/WeChatController.php        |  1 +
 7 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/app/Api/Controllers/Area/AreaCodeController.php b/app/Api/Controllers/Area/AreaCodeController.php
index db29cd0..50437e6 100644
--- a/app/Api/Controllers/Area/AreaCodeController.php
+++ b/app/Api/Controllers/Area/AreaCodeController.php
@@ -57,7 +57,7 @@ class AreaCodeController extends Controller
             return $this->failed('缺少提货码');
         }
         $areaCode = AreaCode::query()->where('code', $code)->first();
-        if ($areaCode->status != AreaCode::STATUS_INIT) {
+        if ($areaCode->status != AreaCode::STATUS_USED) {
             return $this->failed('此提货码已提货');
         }
         try {
diff --git a/app/Api/Routes/area.php b/app/Api/Routes/area.php
index b176b1e..85d0edb 100644
--- a/app/Api/Routes/area.php
+++ b/app/Api/Routes/area.php
@@ -19,7 +19,13 @@ Route::group([
     'middleware' => config('api.route.middleware_auth'),
 ], function (Router $router) {
     $router->get('areas/{code}/show', 'AreaCodeController@show');
-    $router->get('areas/code/info', 'AreaCodeController@info');
     $router->post('areas/code/{code}/verify', 'AreaCodeController@verify');
 });
 
+Route::group([
+    'namespace'  => 'Area',
+    'middleware' => config('api.route.middleware_guess'),
+], function (Router $router) {
+    $router->get('areas/code/info', 'AreaCodeController@info');
+});
+
diff --git a/config/logging.php b/config/logging.php
index fad5759..b981fed 100644
--- a/config/logging.php
+++ b/config/logging.php
@@ -102,7 +102,8 @@ return [
     ],
 
     'query' => [
-        'enabled'     => env('LOG_QUERY', env('APP_ENV') === 'local'),
+//        'enabled'     => env('LOG_QUERY', env('APP_ENV') === 'local'),
+        'enabled'     => env('LOG_QUERY', false),
 
         // Only record queries that are slower than the following time
         // Unit: milliseconds
diff --git a/modules/Mall/Http/Controllers/Api/OrderController.php b/modules/Mall/Http/Controllers/Api/OrderController.php
index b8ed7ac..8f36e9b 100644
--- a/modules/Mall/Http/Controllers/Api/OrderController.php
+++ b/modules/Mall/Http/Controllers/Api/OrderController.php
@@ -3,6 +3,7 @@
 namespace Modules\Mall\Http\Controllers\Api;
 
 use App\Api\Controllers\Controller;
+use App\Models\AreaCode;
 use Exception;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -297,4 +298,30 @@ class OrderController extends Controller
         return $this->success(new OrderAreaCodeResource($order));
     }
 
+    /**
+     * Notes: description
+     *
+     * @Author: 玄尘
+     * @Date: 2023/1/17 13:35
+     * @param  Request  $request
+     * @return JsonResponse
+     */
+    public function areaCodeByCode(Request $request)
+    {
+        $code = $request->code;
+        if (! $code) {
+            return $this->failed('缺少提货码');
+        }
+        $areaCode = AreaCode::query()->where('code', $code)->firstOrFail();
+
+
+        $order = $areaCode->order;
+        if (! $order) {
+            return $this->failed('未找到此提货码对应的订单');
+        }
+
+        return $this->success(new OrderAreaCodeResource($order));
+    }
+
+
 }
diff --git a/modules/Mall/Models/Order.php b/modules/Mall/Models/Order.php
index 0a476f3..2853c46 100644
--- a/modules/Mall/Models/Order.php
+++ b/modules/Mall/Models/Order.php
@@ -83,10 +83,10 @@ class Order extends Model
     ];
 
     const STATUS_SAMPLE_MAP = [
-        self::STATUS_INIT      => '未付款',
-        self::STATUS_CANCEL    => '已取消',
-        self::STATUS_PAID      => '待提货',
-        self::STATUS_DELIVERED => '已提货',
+        self::STATUS_INIT   => '未付款',
+        self::STATUS_CANCEL => '已取消',
+        self::STATUS_PAID   => '待提货',
+        self::STATUS_SIGNED => '已提货',
     ];
 
     const CANCEL_BY_USER   = 2; // 买家取消
diff --git a/modules/Mall/Routes/api.php b/modules/Mall/Routes/api.php
index b7d8877..c0f5506 100644
--- a/modules/Mall/Routes/api.php
+++ b/modules/Mall/Routes/api.php
@@ -99,6 +99,7 @@ Route::group([
     // 取消订单
     $router->put('orders/{order}/cancel', 'OrderController@cancel')->where(['order' => '[0-9]+']);
     $router->get('orders/{order}/area_code', 'OrderController@areaCode')->where(['order' => '[0-9]+']);
+    $router->get('orders/area_code', 'OrderController@areaCodeByCode')->where(['order' => '[0-9]+']);
     // 删除订单
     $router->delete('orders/{order}', 'OrderController@destroy')->where(['order' => '[0-9]+']);
     //退款
diff --git a/modules/User/Http/Controllers/Api/Socialite/WeChatController.php b/modules/User/Http/Controllers/Api/Socialite/WeChatController.php
index 35d32bd..b52a943 100644
--- a/modules/User/Http/Controllers/Api/Socialite/WeChatController.php
+++ b/modules/User/Http/Controllers/Api/Socialite/WeChatController.php
@@ -426,6 +426,7 @@ class WeChatController extends Controller
             return $this->success([
                 'token_type'   => 'Bearer',
                 'access_token' => $token,
+                'invite'       => Hashids::connection('code')->encode($user->id),
             ]);
         } catch (\Exception $e) {
             return $this->failed($e->getMessage());