强制取消

app-hd/controllers/OrderController.php

@@ -47,7 +47,7 @@ class OrderController extends BaseController
         if ($diff < 60) {
             util::fail('60秒会自动取消');
         }
-        OrderClass::setExpire($order);
+        OrderClass::setExpire($order, true);
         util::complete();
     }
 

biz-hd/order/classes/OrderClass.php

@@ -411,10 +411,10 @@ class OrderClass extends BaseClass
     }
 
     //订单取消 ssh 20220516
-    public static function setExpire($order)
+    public static function setExpire($order, $force = false)
     {
         $now = time();
-        if ($order->deadline > $now) {
+        if ($order->deadline > $now && $force == false) {
             return false;
         }
         if ($order->status != 1) {
@@ -553,7 +553,7 @@ class OrderClass extends BaseClass
             $content .= '--------------------------------<BR>';
             $content .= date("Y-m-d", strtotime($order->addTime)) . '<BR>';
         } else {
-            $content = '<CB>' . $fromTypeName .' '. $respond['sendNum'] . '</CB><BR>';
+            $content = '<CB>' . $fromTypeName . ' ' . $respond['sendNum'] . '</CB><BR>';
             $content .= '--------------------------------<BR>';
         }