From 76f53322abe1a89fa1a6bd9801beceff8b338e06 Mon Sep 17 00:00:00 2001 From: weizong song Date: Tue, 10 Oct 2023 16:20:00 +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 ee72508..40442f3 100644 --- a/app/Http/Controllers/Manager/OrdersController.php +++ b/app/Http/Controllers/Manager/OrdersController.php @@ -858,15 +858,19 @@ 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) && date("Ym", strtotime($item->paid_at)) != date("Ym"); + return $request->has("price") && $item->paid_at && ($request->price != $item->total); }); + $price_changed_last_month_paid_items = $price_changed_paid_items->filter(function ($item) { + return date("Ym", strtotime($item->paid_at)) != date("Ym"); + }); + $total_increased = $price_changed_paid_items->count() * $request->price - $price_changed_paid_items->sum("total"); $warnings = []; $errors = []; - if ($price_changed_paid_items->count()) { - $errors[] = "有" . $price_changed_paid_items->count() . "天已付款的往月子订单已锁定价格,不可修改"; + if ($price_changed_last_month_paid_items->count()) { + $errors[] = "有" . $price_changed_last_month_paid_items->count() . "天已付款的往月子订单已锁定价格,不可修改"; } $manager = $this->guard()->user();