Merge branch 'order_cancle_to_payment' into dev

biz-hd/order/classes/OrderClass.php

@@ -542,7 +542,7 @@ class OrderClass extends BaseClass
     // 恢复订单 -- 即：把订单的状态从取消状态变成待付款状态
     public static function recoverOrderToPay($order)
     {
-        if ($order->status != 5) {
+        if ($order->status != self::ORDER_STATUS_CANCEL) {
             return false;
         }
         $now = time();