From 8e114d16c415cd936cd0cd5732e604ae77e75e0b Mon Sep 17 00:00:00 2001
From: TL <mengwb@opencart.cn>
Date: Thu, 11 Aug 2022 16:56:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=B4=A7=E5=B8=81=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Http/Controllers/CurrencyController.php   | 25 ++++---------------
 beike/Admin/Http/Requests/CurrencyRequest.php |  2 ++
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/beike/Admin/Http/Controllers/CurrencyController.php b/beike/Admin/Http/Controllers/CurrencyController.php
index 33f8c261..a26da3db 100644
--- a/beike/Admin/Http/Controllers/CurrencyController.php
+++ b/beike/Admin/Http/Controllers/CurrencyController.php
@@ -30,11 +30,6 @@ class CurrencyController extends Controller
         return view('admin::pages.currencies.index', $data);
     }
 
-    public function create()
-    {
-        return view('admin::pages.currencies.form');
-    }
-
     public function store(CurrencyRequest $request)
     {
         $data = [
@@ -46,22 +41,12 @@ class CurrencyController extends Controller
             'value' => (float)$request->get('value', 1),
             'status' => (int)$request->get('status', 0),
         ];
-        CurrencyRepo::create($data);
+        $currency = CurrencyRepo::create($data);
 
-        return redirect($this->getRedirect())->with('success', '货币创建成功！');
+        return json_success('货币创建成功！', $currency);
     }
 
-    public function edit(Request $request, int $id)
-    {
-        $data = [
-            'currency' => CurrencyRepo::find($id),
-            '_redirect' => $this->getRedirect(),
-        ];
-
-        return view('admin::pages.currencies.form', $data);
-    }
-
-    public function update(CurrencyRequest $request, int $currencyId)
+    public function update(CurrencyRequest $request, int $id)
     {
         $data = [
             'name' => $request->get('name', ''),
@@ -72,9 +57,9 @@ class CurrencyController extends Controller
             'value' => (float)$request->get('value', 1),
             'status' => (int)$request->get('status', 0),
         ];
-        CurrencyRepo::update($currencyId, $data);
+        $currency = CurrencyRepo::update($id, $data);
 
-        return redirect($this->getRedirect())->with('success', '货币更新成功！');
+        return json_success('货币更新成功！', $currency);
     }
 
     public function destroy(Request $request, int $currencyId)
diff --git a/beike/Admin/Http/Requests/CurrencyRequest.php b/beike/Admin/Http/Requests/CurrencyRequest.php
index 162a8542..55f2511d 100644
--- a/beike/Admin/Http/Requests/CurrencyRequest.php
+++ b/beike/Admin/Http/Requests/CurrencyRequest.php
@@ -29,6 +29,7 @@ class CurrencyRequest extends FormRequest
             'symbol_left' => 'max:16',
             'symbol_right' => 'max:16',
             'value' => 'required',
+            'decimal_place' => 'max:9',
         ];
     }
 
@@ -40,6 +41,7 @@ class CurrencyRequest extends FormRequest
             'symbol_left' => '左符号',
             'symbol_right' => '右符号',
             'value' => '汇率值',
+            'decimal_place' => '小数位数',
         ];
     }
 }