修改cancelOrder

app/JsonRpc/OrderService.php

@@ -245,8 +245,12 @@ class OrderService implements OrderServiceInterface
     */
     public function cancelOrder(array $data): array
     {   
-        $order = Order::where('id',$data['order_id'])->where('status',6)->update(['status' => 3]);
-        $ads = OrderAd::where('order_id',$data['order_id'])->where('status',6)->update(['status' => 3]);
+        date_default_timezone_set('Asia/Shanghai');
+        $time = time(); 
+        $timestamp = date('YmdHis',$time);
+        $time = ['edtime','>=',$timestamp];
+        $order = Order::where('id',$data['order_id'])->where('status',6)->where('edtime','<=',$timestamp)->update(['status' => 3]);
+        $ads = OrderAd::where('order_id',$data['order_id'])->where('status',6)->where('totime','<=',$timestamp)->update(['status' => 3]);
         if(!$order || !$ads){
             return Result::error("订单id错误");
         }