From b045c5e43b6400589e87de5a611bb12fe86e063f Mon Sep 17 00:00:00 2001 From: weizong song Date: Fri, 2 Aug 2024 10:40:42 +0800 Subject: [PATCH 1/5] up --- app/Http/Controllers/Manager/OrdersController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php index ca5a838..15082ed 100644 --- a/app/Http/Controllers/Manager/OrdersController.php +++ b/app/Http/Controllers/Manager/OrdersController.php @@ -861,7 +861,8 @@ class OrdersController extends CommonController 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"); + //非当月服务的已扣款订单，或服务日期早于修改日5天之内的 + return (date("Ym", strtotime($item->paid_at)) != date("Ym")) && ((time() - strtotime($item->service_date)) < 5 * 24 * 3600); }); $total_increased = $price_changed_paid_items->count() * $request->price - $price_changed_paid_items->sum("total"); @@ -874,7 +875,7 @@ class OrdersController extends CommonController } $manager = $this->guard()->user(); -// if (!$manager->no_lock_ability) { //2023年8月份有开通一个功能，让具有权限的人可以修改往月的已扣款订单，后发现有问题，现在改为只可以对当月已扣款订单进行修改 +// if (!$manager->no_lock_ability) { //2023年8月份有开通一个功能，让具有权限的人可以修改往月的已扣款订单，后发现有问题，现在改为只可以对当月或上月已扣款订单进行修改 foreach ($order_items as $_item) { if ($_item->paid_at && $request->price && $_item->total != $request->price && date("Ym", strtotime($_item->service_date)) < date("Ym", strtotime("-1 month", time()))) { $errors[] = "子订单{$_item->service_date}价格已锁定"; From 45bc3060843936c970b1542560adbe6f8c02137a Mon Sep 17 00:00:00 2001 From: weizong song Date: Fri, 2 Aug 2024 10:47:13 +0800 Subject: [PATCH 2/5] up --- app/Http/Controllers/Manager/OrdersController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php index 15082ed..16da778 100644 --- a/app/Http/Controllers/Manager/OrdersController.php +++ b/app/Http/Controllers/Manager/OrdersController.php @@ -861,8 +861,8 @@ class OrdersController extends CommonController return $request->has("price") && $item->paid_at && ($request->price != $item->total); }); $price_changed_last_month_paid_items = $price_changed_paid_items->filter(function ($item) { - //非当月服务的已扣款订单，或服务日期早于修改日5天之内的 - return (date("Ym", strtotime($item->paid_at)) != date("Ym")) && ((time() - strtotime($item->service_date)) < 5 * 24 * 3600); + //非当月服务的已扣款订单，或服务日期早于修改日6天之内的 + return (date("Ym", strtotime($item->paid_at)) != date("Ym")) && ((time() - strtotime($item->service_date)) < 6 * 24 * 3600); }); $total_increased = $price_changed_paid_items->count() * $request->price - $price_changed_paid_items->sum("total"); From f1a9acdc4b1d306eb9c0e324c13f13b46bd5a453 Mon Sep 17 00:00:00 2001 From: weizong song Date: Fri, 2 Aug 2024 10:51:22 +0800 Subject: [PATCH 3/5] up --- app/Http/Controllers/Manager/OrdersController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php index 16da778..2f53a22 100644 --- a/app/Http/Controllers/Manager/OrdersController.php +++ b/app/Http/Controllers/Manager/OrdersController.php @@ -861,8 +861,8 @@ class OrdersController extends CommonController return $request->has("price") && $item->paid_at && ($request->price != $item->total); }); $price_changed_last_month_paid_items = $price_changed_paid_items->filter(function ($item) { - //非当月服务的已扣款订单，或服务日期早于修改日6天之内的 - return (date("Ym", strtotime($item->paid_at)) != date("Ym")) && ((time() - strtotime($item->service_date)) < 6 * 24 * 3600); + //非当月服务的已扣款订单，或服务日期早于修改日8天之内的 + return (date("Ym", strtotime($item->paid_at)) != date("Ym")) && ((time() - strtotime($item->service_date)) < 8 * 24 * 3600); }); $total_increased = $price_changed_paid_items->count() * $request->price - $price_changed_paid_items->sum("total"); From 406d1ce5ac69fc1b2cac6eac064e6ee2daeb5720 Mon Sep 17 00:00:00 2001 From: weizong song Date: Fri, 2 Aug 2024 10:53:24 +0800 Subject: [PATCH 4/5] up --- app/Http/Controllers/Manager/OrdersController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php index 2f53a22..ca7570a 100644 --- a/app/Http/Controllers/Manager/OrdersController.php +++ b/app/Http/Controllers/Manager/OrdersController.php @@ -861,8 +861,8 @@ class OrdersController extends CommonController return $request->has("price") && $item->paid_at && ($request->price != $item->total); }); $price_changed_last_month_paid_items = $price_changed_paid_items->filter(function ($item) { - //非当月服务的已扣款订单，或服务日期早于修改日8天之内的 - return (date("Ym", strtotime($item->paid_at)) != date("Ym")) && ((time() - strtotime($item->service_date)) < 8 * 24 * 3600); + return false; + //return date("Ym", strtotime($item->paid_at)) != date("Ym"); }); $total_increased = $price_changed_paid_items->count() * $request->price - $price_changed_paid_items->sum("total"); From 582e790744f799cf76c4adfe694617716b1346dc Mon Sep 17 00:00:00 2001 From: weizong song Date: Fri, 2 Aug 2024 11:19:30 +0800 Subject: [PATCH 5/5] up --- app/Http/Controllers/Manager/OrdersController.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php index ca7570a..29bf13b 100644 --- a/app/Http/Controllers/Manager/OrdersController.php +++ b/app/Http/Controllers/Manager/OrdersController.php @@ -861,8 +861,7 @@ class OrdersController extends CommonController 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 false; - //return date("Ym", strtotime($item->paid_at)) != date("Ym"); + return date("Ym", strtotime($item->paid_at)) != date("Ym"); }); $total_increased = $price_changed_paid_items->count() * $request->price - $price_changed_paid_items->sum("total");