订单取消了

biz-hd/purchase/classes/PurchaseClearClass.php

@@ -126,13 +126,16 @@ class PurchaseClearClass extends BaseClass
         if (empty($order)) {
             util::fail('没有找到订单');
         }
-        if (isset($order->status) == false || $order->status != self::STATUS_AWAIT_PAY) {
+        if (isset($order->status) && $order->status == self::STATUS_EXPIRE) {
             if ($order->onlinePay == dict::getDict('onlinePay', 'yes')) {
                 $ghsName = $order->ghsName ?? '';
                 $customName = $order->customName ?? '';
                 $id = $order->id ?? 0;
-                noticeUtil::push("重要提醒：有花店客户线上结账，但结账单却取消了 ghs:{$ghsName} customName:{$customName} id:{$id}", '15280215347');
+                $orderSn = $order->orderSn ?? '';
+                noticeUtil::push("重要提醒：有花店客户线上结账，但结账单却取消了 ghs:{$ghsName} customName:{$customName} id:{$id} orderSn:{$orderSn}", '15280215347');
             }
+        }
+        if (isset($order->status) == false || $order->status != self::STATUS_AWAIT_PAY) {
             util::fail('订单不是待付款状态');
         }
         $order->status = self::STATUS_HAS_PAY;