weizong song 5 years ago
parent 6e53439c90
commit 135772b61f

@ -662,7 +662,7 @@ class OrdersController extends CommonController
} }
$customer = $order_items->first()->customer; $customer = $order_items->first()->customer;
$price_changed_paid_items = $order_items->filter(function ($item) use ($request) { $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"); $total_increased = $price_changed_paid_items->count() * $request->price - $price_changed_paid_items->sum("total");
@ -678,14 +678,13 @@ class OrdersController extends CommonController
} }
//todo:价格低于指导价的提示 //todo:价格低于指导价的提示
if (count($errors)) { if (count($errors)) {
return response()->json([ return response()->json([
"errorcode" => "105", "errorcode" => "105",
"errormsg" => implode("", $errors) "errormsg" => implode("", $errors)
]); ]);
} }
if (count($errors) && !$request->skip_warnings) { if (count($warnings) && !$request->skip_warnings) {
return response()->json([ return response()->json([
"has_warnings" => true, "has_warnings" => true,
"errormsg" => implode("", $warnings) "errormsg" => implode("", $warnings)

Loading…
Cancel
Save