From 755b398bcb49697639f88146e4dd6220fd62dd59 Mon Sep 17 00:00:00 2001
From: Jing Li <lym125@gmail.com>
Date: Thu, 19 Oct 2023 14:01:38 +0800
Subject: [PATCH] Update

---
 app/Admin/Controllers/PointLogController.php           |  2 ++
 .../Api/Http/Controllers/Order/OrderController.php     | 10 +++++-----
 app/Models/PointLog.php                                |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/Admin/Controllers/PointLogController.php b/app/Admin/Controllers/PointLogController.php
index 24b3bfab..74bb058c 100644
--- a/app/Admin/Controllers/PointLogController.php
+++ b/app/Admin/Controllers/PointLogController.php
@@ -47,6 +47,7 @@ class PointLogController extends AdminController
                 return bcdiv($value, 100, 2);
             });
             $grid->column('remark');
+            $grid->column('administrator.name', '操作人');
             $grid->column('created_at');
 
             $grid->disableActions();
@@ -72,6 +73,7 @@ class PointLogController extends AdminController
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->panel(false);
                 $filter->equal('user.phone')->width(3);
+                $filter->like('administrator.name', '操作人')->width(3);
                 $filter->in('action')->multipleSelect(PointLogAction::options())->width(3);
                 $filter->between('created_at')->dateTime()->width(3);
             });
diff --git a/app/Endpoint/Api/Http/Controllers/Order/OrderController.php b/app/Endpoint/Api/Http/Controllers/Order/OrderController.php
index d84af76f..58087005 100644
--- a/app/Endpoint/Api/Http/Controllers/Order/OrderController.php
+++ b/app/Endpoint/Api/Http/Controllers/Order/OrderController.php
@@ -50,7 +50,7 @@ class OrderController extends Controller
             'shipping_address_id' => ['bail', 'nullable', 'int'],
             'coupon_id' => ['bail', 'nullable', 'int'],
             'note' => ['bail', 'nullable', 'string', 'max:255'],
-            'points' => ['bail', 'nullable', 'int'],
+            'points' => ['bail', 'nullable', 'numeric', 'min:0'],
         ], match (true) {
             $request->filled('order_pre') => [
                 'order_pre' => ['bail','required', 'int'],
@@ -91,7 +91,7 @@ class OrderController extends Controller
                             'desk' => $request->input('desk'),
                             'note' => $request->input('note'),
                             'coupon_id' => $request->input('coupon_id'),
-                            'points' => $request->input('points', 0),
+                            bcmul($request->input('points', 0), 100),
                         ],
                     ),
                     $request->filled('order_pre') => $orderService->createOrderByPre(
@@ -99,7 +99,7 @@ class OrderController extends Controller
                         OrderPre::findOrFail($request->input('order_pre')),
                         $request->input('coupon_id'),
                         $request->input('note'),
-                        $request->input('points', 0),
+                        bcmul($request->input('points', 0), 100),
                     ),
                     $request->filled('product') => $orderService->createQuickOrder(
                         $user,
@@ -108,7 +108,7 @@ class OrderController extends Controller
                         $validated['shipping_address_id'] ?? null,
                         $validated['coupon_id'] ?? null,
                         $validated['note'] ?? null,
-                        $request->input('points', 0),
+                        bcmul($request->input('points', 0), 100),
                     ),
                     default => $orderService->createShoppingCartOrder(
                         $user,
@@ -116,7 +116,7 @@ class OrderController extends Controller
                         $validated['shipping_address_id'] ?? null,
                         $validated['coupon_id'] ?? null,
                         $validated['note'] ?? null,
-                        $request->input('points', 0),
+                        bcmul($request->input('points', 0), 100),
                     ),
                 };
             });
diff --git a/app/Models/PointLog.php b/app/Models/PointLog.php
index 67a1916f..38e0acce 100644
--- a/app/Models/PointLog.php
+++ b/app/Models/PointLog.php
@@ -21,7 +21,7 @@ class PointLog extends Model
         'before_points',
         'after_points',
         'remark',
-        'adminstrator_id',
+        'administrator_id',
     ];
 
     protected $casts = [