Merge branch 'order_cancle_to_payment' into dev

biz-hd/order/classes/OrderClass.php

@@ -542,9 +542,6 @@ class OrderClass extends BaseClass
     // 恢复订单 -- 即：把订单的状态从取消状态变成待付款状态
     public static function recoverOrderToPay($order)
     {
-        if ($order->status != self::ORDER_STATUS_CANCEL) {
-            return false;
-        }
         $now = time();
         $order->status = 1;
         $order->deadline = $now + 86400;
@@ -552,6 +549,7 @@ class OrderClass extends BaseClass
 
         // 重新占用库存（与取消订单时的库存回滚相反）
         $itemList = OrderItemClass::getAllByCondition(['orderSn' => $order->orderSn], null, '*', null, true);
+        Yii::info('oooooooo');
         if (!empty($itemList)) {
             foreach ($itemList as $item) {
                 $ptItemId = $item->ptItemId ?? 0;