优化
This commit is contained in:
parent
acf145a792
commit
10a7df704c
@ -17,7 +17,8 @@ class TaskController extends Controller
|
|||||||
/**
|
/**
|
||||||
* Display a listing of the resource.
|
* Display a listing of the resource.
|
||||||
*
|
*
|
||||||
* @param Request $request
|
* @param Request $request
|
||||||
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
*/
|
*/
|
||||||
public function index(Request $request): JsonResponse
|
public function index(Request $request): JsonResponse
|
||||||
@ -30,15 +31,15 @@ public function index(Request $request): JsonResponse
|
|||||||
/**
|
/**
|
||||||
* Store a newly created resource in storage.
|
* Store a newly created resource in storage.
|
||||||
*
|
*
|
||||||
* @param Request $request
|
* @param Request $request
|
||||||
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
*
|
*
|
||||||
* @throws ValidationException
|
* @throws ValidationException
|
||||||
*/
|
*/
|
||||||
public function store(Request $request): JsonResponse
|
public function store(Request $request): JsonResponse
|
||||||
{
|
{
|
||||||
//
|
$request->validate([
|
||||||
$this->validate($request, [
|
|
||||||
'title' => 'required|max:255',
|
'title' => 'required|max:255',
|
||||||
'progress' => 'nullable|integer|max:100',
|
'progress' => 'nullable|integer|max:100',
|
||||||
'status' => 'required|in:pending,processing,need_operation,done,success,failed,error,canceled',
|
'status' => 'required|in:pending,processing,need_operation,done,success,failed,error,canceled',
|
||||||
@ -52,16 +53,16 @@ public function store(Request $request): JsonResponse
|
|||||||
/**
|
/**
|
||||||
* Update the specified resource in storage.
|
* Update the specified resource in storage.
|
||||||
*
|
*
|
||||||
* @param Request $request
|
* @param Request $request
|
||||||
* @param Task $task
|
* @param Task $task
|
||||||
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
*
|
*
|
||||||
* @throws ValidationException
|
* @throws ValidationException
|
||||||
*/
|
*/
|
||||||
public function update(Request $request, Task $task): JsonResponse
|
public function update(Request $request, Task $task): JsonResponse
|
||||||
{
|
{
|
||||||
//
|
$request->validate([
|
||||||
$this->validate($request, [
|
|
||||||
'progress' => 'sometimes|integer|max:100',
|
'progress' => 'sometimes|integer|max:100',
|
||||||
'status' => 'sometimes|in:pending,processing,need_operation,done,success,failed,error,canceled',
|
'status' => 'sometimes|in:pending,processing,need_operation,done,success,failed,error,canceled',
|
||||||
]);
|
]);
|
||||||
|
@ -14,7 +14,7 @@ class UserController extends Controller
|
|||||||
{
|
{
|
||||||
public function index(Request $request): JsonResponse
|
public function index(Request $request): JsonResponse
|
||||||
{
|
{
|
||||||
$this->validate($request, [
|
$request->validate([
|
||||||
'user_id' => 'sometimes|integer',
|
'user_id' => 'sometimes|integer',
|
||||||
'email' => 'sometimes|email',
|
'email' => 'sometimes|email',
|
||||||
'name' => 'sometimes|string',
|
'name' => 'sometimes|string',
|
||||||
@ -24,15 +24,15 @@ public function index(Request $request): JsonResponse
|
|||||||
|
|
||||||
// 搜索 name, email, balance
|
// 搜索 name, email, balance
|
||||||
if ($request->has('name')) {
|
if ($request->has('name')) {
|
||||||
$users->where('name', 'like', '%'.$request->input('name').'%');
|
$users->where('name', 'like', '%' . $request->input('name') . '%');
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($request->has('email')) {
|
if ($request->has('email')) {
|
||||||
$users->where('email', 'like', '%'.$request->input('email').'%');
|
$users->where('email', 'like', '%' . $request->input('email') . '%');
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($request->has('balance')) {
|
if ($request->has('balance')) {
|
||||||
$users->where('balance', 'like', '%'.$request->input('balance').'%');
|
$users->where('balance', 'like', '%' . $request->input('balance') . '%');
|
||||||
}
|
}
|
||||||
|
|
||||||
$users = $users->simplePaginate(100);
|
$users = $users->simplePaginate(100);
|
||||||
@ -42,7 +42,7 @@ public function index(Request $request): JsonResponse
|
|||||||
|
|
||||||
public function store(Request $request): JsonResponse
|
public function store(Request $request): JsonResponse
|
||||||
{
|
{
|
||||||
$this->validate($request, [
|
$request->validate([
|
||||||
'name' => 'required|string',
|
'name' => 'required|string',
|
||||||
'email' => 'required|email|unique:users',
|
'email' => 'required|email|unique:users',
|
||||||
'password' => 'required|string|min:6',
|
'password' => 'required|string|min:6',
|
||||||
@ -71,7 +71,7 @@ public function hosts(User $user): JsonResponse
|
|||||||
|
|
||||||
public function update(Request $request, User $user): JsonResponse
|
public function update(Request $request, User $user): JsonResponse
|
||||||
{
|
{
|
||||||
$this->validate($request, [
|
$request->validate([
|
||||||
'balance' => 'required|numeric|min:-10000|max:10000',
|
'balance' => 'required|numeric|min:-10000|max:10000',
|
||||||
'description' => 'required|string',
|
'description' => 'required|string',
|
||||||
]);
|
]);
|
||||||
@ -84,8 +84,7 @@ public function update(Request $request, User $user): JsonResponse
|
|||||||
// 使用 bc,取 balance 绝对值
|
// 使用 bc,取 balance 绝对值
|
||||||
$balance = bcsub(0, $balance, 4);
|
$balance = bcsub(0, $balance, 4);
|
||||||
|
|
||||||
// 如果用户余额不足,抛出异常,使用 bc 函数判断
|
if ($user->hasBalance($balance) === false) {
|
||||||
if (bccomp($user->balance, $balance, 2) === -1) {
|
|
||||||
return $this->error('用户余额不足。');
|
return $this->error('用户余额不足。');
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -94,8 +93,7 @@ public function update(Request $request, User $user): JsonResponse
|
|||||||
'user_id' => $user->id,
|
'user_id' => $user->id,
|
||||||
]);
|
]);
|
||||||
} else {
|
} else {
|
||||||
// 如果模块余额不足,抛出异常,使用 bc 函数判断
|
if ($module->hasBalance($balance) === false) {
|
||||||
if (bccomp($module->balance, $balance, 2) === -1) {
|
|
||||||
return $this->error('模块余额不足。');
|
return $this->error('模块余额不足。');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@ public function show(WorkOrder $workOrder): JsonResponse
|
|||||||
*/
|
*/
|
||||||
public function update(WorkOrderRequest $request, WorkOrder $workOrder): JsonResponse
|
public function update(WorkOrderRequest $request, WorkOrder $workOrder): JsonResponse
|
||||||
{
|
{
|
||||||
$this->validate($request, [
|
$request->validate([
|
||||||
'status' => 'nullable|sometimes|string|in:open,closed,on_hold,in_progress,read',
|
'status' => 'nullable|sometimes|string|in:open,closed,on_hold,in_progress,read',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user