pdkj
/
jiqu-library-server
6
0
Fork 0
Code Releases Activity

Update

base
Jing Li 2023-10-19 14:01:38 +08:00
parent 95bb9c7822
commit 755b398bcb
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Admin/Controllers/PointLogController.php
View File

@ -47,6 +47,7 @@ class PointLogController extends AdminController
return bcdiv($value, 100, 2); return bcdiv($value, 100, 2);
}); });
$grid->column('remark'); $grid->column('remark');
$grid->column('administrator.name', '操作人');
$grid->column('created_at'); $grid->column('created_at');
$grid->disableActions(); $grid->disableActions();
@ -72,6 +73,7 @@ class PointLogController extends AdminController
$grid->filter(function (Grid\Filter $filter) { $grid->filter(function (Grid\Filter $filter) {
$filter->panel(false); $filter->panel(false);
$filter->equal('user.phone')->width(3); $filter->equal('user.phone')->width(3);
$filter->like('administrator.name', '操作人')->width(3);
$filter->in('action')->multipleSelect(PointLogAction::options())->width(3); $filter->in('action')->multipleSelect(PointLogAction::options())->width(3);
$filter->between('created_at')->dateTime()->width(3); $filter->between('created_at')->dateTime()->width(3);
}); });

10
app/Endpoint/Api/Http/Controllers/Order/OrderController.php
View File

@ -50,7 +50,7 @@ class OrderController extends Controller
'shipping_address_id' => ['bail', 'nullable', 'int'], 'shipping_address_id' => ['bail', 'nullable', 'int'],
'coupon_id' => ['bail', 'nullable', 'int'], 'coupon_id' => ['bail', 'nullable', 'int'],
'note' => ['bail', 'nullable', 'string', 'max:255'], 'note' => ['bail', 'nullable', 'string', 'max:255'],
'points' => ['bail', 'nullable', 'int'], 'points' => ['bail', 'nullable', 'numeric', 'min:0'],
], match (true) { ], match (true) {
$request->filled('order_pre') => [ $request->filled('order_pre') => [
'order_pre' => ['bail','required', 'int'], 'order_pre' => ['bail','required', 'int'],
@ -91,7 +91,7 @@ class OrderController extends Controller
'desk' => $request->input('desk'), 'desk' => $request->input('desk'),
'note' => $request->input('note'), 'note' => $request->input('note'),
'coupon_id' => $request->input('coupon_id'), 'coupon_id' => $request->input('coupon_id'),
'points' => $request->input('points', 0), bcmul($request->input('points', 0), 100),
], ],
), ),
$request->filled('order_pre') => $orderService->createOrderByPre( $request->filled('order_pre') => $orderService->createOrderByPre(
@ -99,7 +99,7 @@ class OrderController extends Controller
OrderPre::findOrFail($request->input('order_pre')), OrderPre::findOrFail($request->input('order_pre')),
$request->input('coupon_id'), $request->input('coupon_id'),
$request->input('note'), $request->input('note'),
$request->input('points', 0), bcmul($request->input('points', 0), 100),
), ),
$request->filled('product') => $orderService->createQuickOrder( $request->filled('product') => $orderService->createQuickOrder(
$user, $user,
@ -108,7 +108,7 @@ class OrderController extends Controller
$validated['shipping_address_id'] ?? null, $validated['shipping_address_id'] ?? null,
$validated['coupon_id'] ?? null, $validated['coupon_id'] ?? null,
$validated['note'] ?? null, $validated['note'] ?? null,
$request->input('points', 0), bcmul($request->input('points', 0), 100),
), ),
default => $orderService->createShoppingCartOrder( default => $orderService->createShoppingCartOrder(
$user, $user,
@ -116,7 +116,7 @@ class OrderController extends Controller
$validated['shipping_address_id'] ?? null, $validated['shipping_address_id'] ?? null,
$validated['coupon_id'] ?? null, $validated['coupon_id'] ?? null,
$validated['note'] ?? null, $validated['note'] ?? null,
$request->input('points', 0), bcmul($request->input('points', 0), 100),
), ),
}; };
}); });

2
app/Models/PointLog.php
View File

@ -21,7 +21,7 @@ class PointLog extends Model
'before_points', 'before_points',
'after_points', 'after_points',
'remark', 'remark',
'adminstrator_id', 'administrator_id',
]; ];
protected $casts = [ protected $casts = [