From d4c22835024bf5bd05f0658314c087e56fec2155 Mon Sep 17 00:00:00 2001
From: weizong song <sdswz@qq.com>
Date: Tue, 13 Apr 2021 20:11:30 +0800
Subject: [PATCH] up

---
 app/Console/Commands/CreateTodayOrderItems.php    | 2 +-
 app/Http/Controllers/Manager/OrdersController.php | 5 +----
 app/Models/OrderItems.php                         | 2 +-
 app/Models/Orders.php                             | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/Console/Commands/CreateTodayOrderItems.php b/app/Console/Commands/CreateTodayOrderItems.php
index 7f62a92..d2122c0 100644
--- a/app/Console/Commands/CreateTodayOrderItems.php
+++ b/app/Console/Commands/CreateTodayOrderItems.php
@@ -56,7 +56,7 @@ class CreateTodayOrderItems extends Command
 
         foreach ($unGeneratedOrders as $order) {
             $service_date = date("Y-m-d");
-            if (Carbon::parse($service_date)->greaterThan($order->to_date)) {
+            if (Carbon::parse($order->to_date)->diffInDays($service_date, true) > 0) {
                 DB::table((new Orders())->getTable())->where("id", $order->id)->update([
                     "to_date" => $service_date,
                     "updated_at" => date("Y-m-d H:i:s")
diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php
index cb7bce6..36fb29c 100644
--- a/app/Http/Controllers/Manager/OrdersController.php
+++ b/app/Http/Controllers/Manager/OrdersController.php
@@ -989,9 +989,6 @@ class OrdersController extends CommonController
      */
     public function checkoutOrder($id, Request $request)
     {
-        dump(Carbon::parse("2021-04-18")->to());
-        dd(Carbon::parse("2021-04-18")->greaterThan("2021-04-18 23:59:59"));
-
         $order = Orders::with("customer")->find($id);
         if ($order->status != Orders::STATUS_ONGOING) {
             return response()->json([
@@ -1009,7 +1006,7 @@ class OrdersController extends CommonController
 
         //结算日早于最后一个已扣款的日期，退回先处理好子订单再结算
         if ($last_paid_order_item) {
-            if (Carbon::parse($last_paid_order_item->service_date)->greaterThan($request->to_date)) {
+            if (Carbon::parse($request->to_date)->diffInDays($last_paid_order_item->service_date, false) > 0) {
                 return response()->json([
                     "errorcode" => 30006,
                     "errormsg" => "结算日不能早于最后一个已服务且扣款的子订单{$last_paid_order_item->service_date}:$request->to_date"
diff --git a/app/Models/OrderItems.php b/app/Models/OrderItems.php
index 66651d6..4f025ab 100755
--- a/app/Models/OrderItems.php
+++ b/app/Models/OrderItems.php
@@ -16,7 +16,7 @@ class OrderItems extends SoftDeletesModel
 
     public function getPaidStatusAttribute()
     {
-        if (!($this->total) > 0) {
+        if (!$this->total) {
             return "未服务";
         }
         if ($this->paid_at) {
diff --git a/app/Models/Orders.php b/app/Models/Orders.php
index 10874d0..2ca8336 100755
--- a/app/Models/Orders.php
+++ b/app/Models/Orders.php
@@ -260,7 +260,7 @@ 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)) {
+                    if (Carbon::parse($this->to_date)->diffInDays($order_items->last()->service_date, false) > 0) {
                         $this->to_date = $order_items->last()->service_date;
                     }
                 } else {