取消订单

app-ghs/controllers/OrderController.php

@@ -693,7 +693,7 @@ class OrderController extends BaseController
         $id = Yii::$app->request->get('id', 0);
         $order = OrderClass::getLockById($id);
         OrderClass::valid($order, $this->shopId);
-        OrderService::expire($order);
+        OrderService::expire($order, true);
         util::complete();
     }
 

biz-ghs/order/services/OrderService.php

@@ -502,10 +502,10 @@ class OrderService extends BaseService
     }
 
     //订单失效后的操作 shish 2021.5.14
-    public static function expire($order)
+    public static function expire($order, $force = false)
     {
         $date = date("Y-m-d H:i:s");
-        if ($order->status == OrderClass::ORDER_STATUS_UN_PAY && $order->deadline <= $date) {
+        if ($force == true || $order->status == OrderClass::ORDER_STATUS_UN_PAY && $order->deadline <= $date) {
             $id = $order->id;
             $order = OrderClass::cancel($id);
             $purchaseId = $order->purchaseId;