订单到期时间确认

biz-ghs/order/services/OrderService.php

@@ -279,8 +279,10 @@ class OrderService extends BaseService
         if ($order['shopId'] != $shopId) {
             util::fail('不是您的订单');
         }
-        if (isset($order['deadline']) && $now > $order['deadline']) {
-            util::fail('订单已过期');
+        if (isset($order['status']) && $order['status'] == OrderClass::ORDER_STATUS_UN_PAY) {
+            if (isset($order['deadline']) && $now > $order['deadline']) {
+                util::fail('订单已过期');
+            }
         }
     }