Merge branch 'master' of /mnt/git/v2.tiantianxinye.365care

3 years ago · 2145d1b177
parent 4878f5114f 7fee40da09
commit 2145d1b177
1 changed files with 3 additions and 3 deletions
--- a/app/Http/Controllers/Manager/OrdersController.php
+++ b/app/Http/Controllers/Manager/OrdersController.php
@ -865,9 +865,9 @@ class OrdersController extends CommonController
            $warnings[] = "将对" . $price_changed_paid_items->count() . "天已付款的子订单进行价格更改";
        }

-        foreach ($price_changed_paid_items as $price_changed_paid_item) {
-            if (date("Ym", strtotime($price_changed_paid_item->service_date)) < date("Ym", strtotime("-1 month", time()))) {
-                $errors[] = "子订单{$price_changed_paid_item->id}超期价格锁定";
+        foreach ($order_items as $_item) {
+            if (date("Ym", strtotime($_item->service_date)) < date("Ym", strtotime("-1 month", time()))) {
+                $errors[] = "子订单{$_item->id}已锁定";
            }
        }