From af37910c62dc3b36a7c08ae943ff29bb6a33ffb1 Mon Sep 17 00:00:00 2001
From: weizong song <sdswz@qq.com>
Date: Tue, 10 Oct 2023 15:51:39 +0800
Subject: [PATCH] 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 83dc1ca..ee72508 100644
--- a/app/Http/Controllers/Manager/OrdersController.php
+++ b/app/Http/Controllers/Manager/OrdersController.php
@@ -858,7 +858,7 @@ 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);
+            return $request->has("price") && $item->paid_at && ($request->price != $item->total) && date("Ym", strtotime($item->paid_at)) != date("Ym");
         });
         $total_increased = $price_changed_paid_items->count() * $request->price - $price_changed_paid_items->sum("total");
 
@@ -866,7 +866,7 @@ class OrdersController extends CommonController
         $errors = [];
 
         if ($price_changed_paid_items->count()) {
-            $errors[] = "有" . $price_changed_paid_items->count() . "天已付款的子订单已锁定价格，不可修改";
+            $errors[] = "有" . $price_changed_paid_items->count() . "天已付款的往月子订单已锁定价格，不可修改";
         }
 
         $manager = $this->guard()->user();