取消

biz-ghs/order/services/OrderService.php

@@ -246,7 +246,6 @@ class OrderService extends BaseService
     public static function checkBeforePay($order, $userId)
     {
         $now = time();
-        OrderClass::setExpire($order);
         if (empty($order)) {
             util::fail('订单无效');
         }
@@ -256,7 +255,10 @@ class OrderService extends BaseService
         if ($order['status'] != 0) {
             util::fail('订单不是待付款状态');
         }
-        if (!empty($order['deadline']) && $now > $order['deadline']) {
+        if (isset($order['deadline']) && $now > $order['deadline']) {
+            $id = $order['id'];
+            $info = OrderClass::getLockById($id);
+            self::expire($info);
             util::fail('订单已过期');
         }
         if (ceil($order['actPrice']) <= 0) {
@@ -270,13 +272,19 @@ class OrderService extends BaseService
     //商家验证是否有效 ssh 2019.12.15
     public static function valid($order, $shopId)
     {
-        OrderClass::setExpire($order);
+        $now = time();
         if (empty($order)) {
             util::fail('订单无效');
         }
         if ($order['shopId'] != $shopId) {
             util::fail('不是您的订单');
         }
+        if (isset($order['deadline']) && $now > $order['deadline']) {
+            $id = $order['id'];
+            $info = OrderClass::getLockById($id);
+            self::expire($info);
+            util::fail('订单已过期');
+        }
     }
 
     //点评 ssh 2019.12.16