调整接口

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 {

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');
+});
+

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

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));
+    }
+
+
 }

modules/Mall/Models/Order.php

@@ -83,10 +83,10 @@ class Order extends Model
     ];
 
     const STATUS_SAMPLE_MAP = [
-        self::STATUS_INIT      => '未付款',
+        self::STATUS_INIT   => '未付款',
-        self::STATUS_CANCEL    => '已取消',
+        self::STATUS_CANCEL => '已取消',
-        self::STATUS_PAID      => '待提货',
+        self::STATUS_PAID   => '待提货',
-        self::STATUS_DELIVERED => '已提货',
+        self::STATUS_SIGNED => '已提货',
     ];
 
     const CANCEL_BY_USER   = 2; // 买家取消

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]+']);
     //退款

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());