From aa22308eba3b6d80839cd15676089be27878f45e Mon Sep 17 00:00:00 2001 From: weizong song Date: Tue, 13 Apr 2021 23:09:59 +0800 Subject: [PATCH] up --- app/Http/Controllers/Manager/OrdersController.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php index d7b75cc..3d14111 100644 --- a/app/Http/Controllers/Manager/OrdersController.php +++ b/app/Http/Controllers/Manager/OrdersController.php @@ -563,7 +563,12 @@ class OrdersController extends CommonController $product_item = request()->has("product_item_id") ? (new ProductItems())->find(request()->product_item_id) : $order->productItem; $price = $product_item->price + $product_paramedic_level->price; - $factors = (new Orders())->requestFactorsToOrderFactors(); + if (request()->has("factors")) { + $factors = (new Orders())->requestFactorsToOrderFactors(); + } else { + $factors = json_decode($order->factors); + } + $price += collect($factors)->sum("price"); if (request()->has("price") && request()->price < $price) { @@ -592,9 +597,8 @@ class OrdersController extends CommonController $update["mobile"] = request()->patient_mobile; } if (request()->has("factors")) { - $update["factors"] = $factors; + $update["factors"] = json_encode($factors); } - $update["factors"] = $factors; $order->update($update); DB::commit(); return response()->json($order->toArray());