From 477009c0202730e7cdefedff520fbc6d5f676c0e Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Wed, 29 Jun 2022 15:39:29 +0800
Subject: [PATCH] fixed data

---
 beike/Helpers.php                   | 32 ++++++++++++++++++++++++++++-
 beike/Shop/Services/CartService.php |  3 ++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/beike/Helpers.php b/beike/Helpers.php
index 8f3aa32a..26989f30 100644
--- a/beike/Helpers.php
+++ b/beike/Helpers.php
@@ -131,7 +131,37 @@ function image_resize($image, int $width = 100, int $height = 100)
     return asset($image);
 }
 
-function current_language_id()
+/**
+ * 当前语言ID
+ * @return int
+ */
+function current_language_id(): int
 {
     return 1;
 }
+
+/**
+ * 返回json序列化结果
+ */
+function json_success($message, $data = []): array
+{
+    $result = [
+        'status' => 'success',
+        'message' => $message,
+        'data' => $data,
+    ];
+    return $result;
+}
+
+/**
+ * 返回json序列化结果
+ */
+function json_fail($message, $data = []): array
+{
+    $result = [
+        'status' => 'fail',
+        'message' => $message,
+        'data' => $data,
+    ];
+    return $result;
+}
diff --git a/beike/Shop/Services/CartService.php b/beike/Shop/Services/CartService.php
index f39c8ffc..09c390b3 100644
--- a/beike/Shop/Services/CartService.php
+++ b/beike/Shop/Services/CartService.php
@@ -130,12 +130,13 @@ class CartService
         $selected = collect($carts)->where('selected', 1);
         $quantity = $selected->sum('quantity');
         $amount = $selected->sum('subtotal');
+
         $data = [
             'carts' => $carts,
             'quantity' => $quantity,
             'amount' => $amount,
             'amount_format' => currency_format($amount)
         ];
-        return $data;
+        return json_success('获取成功', $data);
     }
 }