From 135772b61f27d93d93a4200a8782717309a71e53 Mon Sep 17 00:00:00 2001 From: weizong song Date: Tue, 13 Apr 2021 19:12:28 +0800 Subject: [PATCH] up --- app/Http/Controllers/Manager/OrdersController.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php index 559051a..309be40 100644 --- a/app/Http/Controllers/Manager/OrdersController.php +++ b/app/Http/Controllers/Manager/OrdersController.php @@ -662,7 +662,7 @@ class OrdersController extends CommonController } $customer = $order_items->first()->customer; $price_changed_paid_items = $order_items->filter(function ($item) use ($request) { - return $request->has("price") && $item->paid_at && $request->price != $item->total; + return $request->has("price") && $item->paid_at && ($request->price != $item->total); }); $total_increased = $price_changed_paid_items->count() * $request->price - $price_changed_paid_items->sum("total"); @@ -678,14 +678,13 @@ class OrdersController extends CommonController } //todo:价格低于指导价的提示 - if (count($errors)) { return response()->json([ "errorcode" => "105", "errormsg" => implode(";", $errors) ]); } - if (count($errors) && !$request->skip_warnings) { + if (count($warnings) && !$request->skip_warnings) { return response()->json([ "has_warnings" => true, "errormsg" => implode(";", $warnings)