From da7ad052e9a6569eb8583016791bb37a99a24c4a Mon Sep 17 00:00:00 2001
From: weizong song <sdswz@qq.com>
Date: Sun, 11 Apr 2021 22:14:32 +0800
Subject: [PATCH] up

---
 app/Models/OrderItems.php |  3 ---
 app/Models/Orders.php     | 14 ++++++--------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/app/Models/OrderItems.php b/app/Models/OrderItems.php
index 9e604d2..ab30477 100755
--- a/app/Models/OrderItems.php
+++ b/app/Models/OrderItems.php
@@ -157,7 +157,6 @@ class OrderItems extends SoftDeletesModel
             ->orderBy("id")
             ->limit($threshold)
             ->get();
-        dump("count:" . $unpaid_order_items->count());
         if (!$unpaid_order_items->count()) {
             cache(['last_auto_checkout_order_item_id' => null], now()->addSeconds(90));
             return;
@@ -167,7 +166,6 @@ class OrderItems extends SoftDeletesModel
             cache(['last_auto_checkout_order_item_id' => $item->id], now()->addSeconds(90));
             $customer = $item->order->customer;
             if ($customer->balance < $item->total || $item->total == 0) {
-                dump("balance not enough");
                 continue;
             }
 
@@ -190,7 +188,6 @@ class OrderItems extends SoftDeletesModel
             ]);
 
             $item->order->refreshTotal();
-            dump($item->id . ":" . $item->service_date);
         }
     }
 
diff --git a/app/Models/Orders.php b/app/Models/Orders.php
index 61ad564..10874d0 100755
--- a/app/Models/Orders.php
+++ b/app/Models/Orders.php
@@ -249,6 +249,9 @@ class Orders extends SoftDeletesModel
         $order_items = $this->orderItems()->get();
 
         switch ($this->status) {
+            case self::STATUS_FINISHED:
+                $total = $order_items->sum("total");
+                break;
             case self::STATUS_UNCONFIRMED:
             case self::STATUS_UNASSIGNED:
             case self::STATUS_ONGOING:
@@ -257,20 +260,15 @@ class Orders extends SoftDeletesModel
                 $price = $this->price;
                 if ($order_items->last()) {
                     $days = max(0, Carbon::parse($order_items->last()->service_date)->diffInDays($this->to_date, false));
+                    if (Carbon::parse($order_items->last()->service_date)->greaterThan($this->to_date)) {
+                        $this->to_date = $order_items->last()->service_date;
+                    }
                 } else {
                     $days = max(0, Carbon::parse($this->from_date)->diffInDays($this->to_date, false) + 1);
                 }
                 $un_generated_total = $price * $days;
                 $total = $items_total + $un_generated_total;
                 break;
-            case self::STATUS_FINISHED:
-                $total = $order_items->sum("total");
-        }
-
-        if ($order_items->last()) {
-            if (Carbon::parse($order_items->last()->service_date)->greaterThan($this->to_date)) {
-                $this->to_date = $order_items->last()->service_date;
-            }
         }
 
         $paid_total = $order_items->filter(function ($item) {