From dd3c5e2e6e3423655724d82c9dde5e729381fff0 Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Thu, 8 Sep 2022 16:48:03 +0800
Subject: [PATCH] order

---
 .../Order/OrderVerifyController.php           | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/app/Endpoint/Api/Http/Controllers/Order/OrderVerifyController.php b/app/Endpoint/Api/Http/Controllers/Order/OrderVerifyController.php
index 02b4bca4..82dba21b 100644
--- a/app/Endpoint/Api/Http/Controllers/Order/OrderVerifyController.php
+++ b/app/Endpoint/Api/Http/Controllers/Order/OrderVerifyController.php
@@ -3,6 +3,7 @@
 namespace App\Endpoint\Api\Http\Controllers\Order;
 
 use App\Endpoint\Api\Http\Controllers\Controller;
+use App\Exceptions\BizException;
 use App\Models\OrderPre;
 use App\Models\ProductSku;
 use App\Services\OrderService;
@@ -19,6 +20,22 @@ class OrderVerifyController extends Controller
      */
     public function __invoke(Request $request, OrderService $orderService)
     {
+        $user = $request->user();
+
+        if ($request->filled('order_pre')) {
+            $pre = OrderPre::find($request->input('order_pre'));
+            if (!$pre) {
+                throw new BizException('临时订单不存在');
+            }
+            $products = [];
+            foreach($pre->products as $item) {
+                array_push($products, [
+                    'sku' => ProductSku::findOrFail($item['sku_id']),
+                    'quantity' => $item['quantity']
+                ]);
+            }
+            return response()->json($orderService->verifyOrder($user, $products, $request->input('shipping_address_id'),  $request->input('coupon_id'), null));
+        }
         $rules = [
             'coupon_id' => ['bail', 'nullable', 'int'],
             'shipping_address_id' => ['bail', 'nullable', 'int'],
@@ -46,20 +63,6 @@ class OrderVerifyController extends Controller
             'bargain_order_id'=> '砍价',
         ]);
 
-        $user = $request->user();
-
-        if ($request->filled('order_pre')) {
-            $pre = OrderPre::find($request->input('order_pre'));
-            $products = [];
-            foreach($pre->products as $item) {
-                array_push($products, [
-                    'sku' => ProductSku::findOrFail($item['sku_id']),
-                    'quantity' => $item['quantity']
-                ]);
-            }
-            return response()->json($orderService->verifyOrder($user, $products, $request->input('shipping_address_id'),  $request->input('coupon_id'), null));
-        }
-
         return response()->json(
             $isQuick
                 ? $orderService->verifyQuickOrder(