From 2ea6cdd49b9f955b7887cdaf43f411ec5c7a3aa3 Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@guangda.work>
Date: Tue, 13 Jun 2023 15:20:38 +0800
Subject: [PATCH] Optimize checkout confirm.

---
 beike/Helpers.php                                  |  5 +++--
 beike/Shop/Http/Controllers/CheckoutController.php | 12 ++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/beike/Helpers.php b/beike/Helpers.php
index 90b6e74d..96a24639 100644
--- a/beike/Helpers.php
+++ b/beike/Helpers.php
@@ -520,13 +520,14 @@ function quantity_format($quantity)
 /**
  * 返回json序列化结果
  */
-function json_success($message, $data = []): array
+function json_success($message, $data = [], $status=422): \Illuminate\Http\JsonResponse
 {
-    return [
+    $data = [
         'status'  => 'success',
         'message' => $message,
         'data'    => $data,
     ];
+    return response()->json($data, $status);
 }
 
 /**
diff --git a/beike/Shop/Http/Controllers/CheckoutController.php b/beike/Shop/Http/Controllers/CheckoutController.php
index 419eb7b7..c5fc22d3 100644
--- a/beike/Shop/Http/Controllers/CheckoutController.php
+++ b/beike/Shop/Http/Controllers/CheckoutController.php
@@ -33,9 +33,9 @@ class CheckoutController extends Controller
      * 更改结算信息
      *
      * @param Request $request
-     * @return array
+     * @return mixed
      */
-    public function update(Request $request): array
+    public function update(Request $request): mixed
     {
         try {
             $requestData = $request->all();
@@ -56,9 +56,13 @@ class CheckoutController extends Controller
      */
     public function confirm()
     {
-        $data = (new CheckoutService)->confirm();
+        try {
+            $data = (new CheckoutService)->confirm();
 
-        return hook_filter('checkout.confirm.data', $data);
+            return hook_filter('checkout.confirm.data', $data);
+        } catch (\Exception $e) {
+            return json_fail($e->getMessage());
+        }
     }
 
     public function success()