up

app/Models/Orders.php

@@ -47,7 +47,8 @@ class Orders extends SoftDeletesModel
         }
     }
 
-    public function getStatusNameAttribute() {
+    public function getStatusNameAttribute()
+    {
         return $this->getStatusLabelAttribute();
     }
 
@@ -333,7 +334,9 @@ class Orders extends SoftDeletesModel
         $threshold = 50;
         DB::enableQueryLog();
         if ($this->id) {
-            $unGeneratedOrders = (new Orders())->where("id", $this->id)->get();
+            $unGeneratedOrders = (new Orders())->whereDoesntHave("orderItems", function ($query) {
+                $query->whereRaw("DATEDIFF(`service_date`, now()) = 0");
+            })->where("id", $this->id)->get();
         } else {
             //获取正在进行中的订单，即使已经到了截止日，只要状态是在进行中的都继续生成
             $unGeneratedOrders = $this::whereIn("status", [self::STATUS_ONGOING])
@@ -348,6 +351,11 @@ class Orders extends SoftDeletesModel
         foreach ($unGeneratedOrders as $order) {
             $service_date = date("Y-m-d");
             $res = $order->createItem($service_date);
+            if (Carbon::parse($service_date)->greaterThan($order->to_date)) {
+                $order->update([
+                    "to_date" => $service_date
+                ]);
+            }
         }
     }
 
@@ -366,8 +374,6 @@ class Orders extends SoftDeletesModel
             "service_date" => $service_date,
             "patient_quantity" => $patient_quantity,
             "total" => $this->price,
-            "fee" => $this->fee,
-            "paramedic_total" => ($this->price - $this->fee),
             "factors" => $this->factors
         ];
 
@@ -431,7 +437,8 @@ class Orders extends SoftDeletesModel
     }
 
     //获取可用护工
-    public function getAvailableParamedics() {
+    public function getAvailableParamedics()
+    {
         DB::enableQueryLog();
         $request = request();
         $bed = (new Bed())->find($request->bed_id);