Merge branch 'master' of /data/git/tiantian2

app/Http/Controllers/Manager/OrdersController.php

@@ -465,7 +465,6 @@ class OrdersController extends CommonController
             $product_item = (new ProductItems())->find(request()->product_item_id);
             $price = $product_item->price + $product_paramedic_level->price;
 
-            Log::info(request()->factors);
             $factors = (new Orders())->requestFactorsToOrderFactors();
             $price += collect($factors)->sum("price");
             if (request()->price < $price) {
@@ -564,9 +563,7 @@ 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;
 
-            Log::info(request()->factors);
-            $factors = request()->has("factors") ? (new Orders())->requestFactorsToOrderFactors() : json_decode($order->factors);
-
+            $factors = (new Orders())->requestFactorsToOrderFactors();
             $price += collect($factors)->sum("price");
 
             if (request()->has("price") && request()->price < $price) {
@@ -597,6 +594,7 @@ class OrdersController extends CommonController
             if (request()->has("factors")) {
                 $update["factors"] = $factors;
             }
+            $update["factors"] = $factors;
             $order->update($update);
             DB::commit();
             return response()->json($order->toArray());