up

app/Http/Controllers/Manager/OrdersController.php

@@ -190,7 +190,9 @@ class OrdersController extends CommonController
     {
         $model = $this->_getOrderModel();
         $order = $model->with([
-            "orderItems",
+            "orderItems" => function ($query) {
+                $query->orderBy("service_date", "desc");
+            },
             "recharges",
             "refunds"
         ])->find($id);
@@ -653,7 +655,6 @@ class OrdersController extends CommonController
         }
         $customer = $order_items->first()->customer;
         $price_changed_paid_items = $order_items->filter(function ($item) use ($request) {
-            dump($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");
@@ -661,8 +662,6 @@ class OrdersController extends CommonController
         $warnings = [];
         $errors = [];
 
-        dd($price_changed_paid_items);
-
         if ($price_changed_paid_items->count()) {
             $warnings[] = "将对" . $price_changed_paid_items->count() . "天已付款的子订单进行价格更改";
         }

app/Models/Orders.php

@@ -147,7 +147,7 @@ class Orders extends SoftDeletesModel
                     ->leftJoin("room", "room.id", "=", "bed.room_id")
                     ->addSelect("room.name as room_name", "area.name as area_name", "building.name as building_name");
             }
-        ])->orderBy("service_date","desc");
+        ]);
     }
 
     public function customer()