|
@@ -412,10 +412,10 @@ class RefillBase
|
|
|
public function query($order_id)
|
|
|
{
|
|
|
$mod_order = Model('vr_order');
|
|
|
- $order_info = $mod_order->getOrderInfo(['order_id' => $order_id,'inner_status' => 0]);
|
|
|
+ $order_info = $mod_order->getOrderInfo(['order_id' => $order_id]);
|
|
|
|
|
|
if(empty($order_info)) return false;
|
|
|
- if($order_info['order_state'] != ORDER_STATE_SEND || $order_info['is_retrying'] == 1) {
|
|
|
+ if($order_info['order_state'] != ORDER_STATE_SEND) {
|
|
|
return true;
|
|
|
}
|
|
|
|
|
@@ -432,7 +432,7 @@ class RefillBase
|
|
|
{
|
|
|
$tran = new trans_wapper($mod_order,'query order state trans');
|
|
|
$order_info = $mod_order->getOrderInfo(['order_id' => $order_id],'*',true,true);
|
|
|
- if($order_info['is_retrying'] == 1) {
|
|
|
+ if($refill_info['is_retrying'] == 1) {
|
|
|
$query_able = false;
|
|
|
}
|
|
|
elseif($order_info['order_state'] == ORDER_STATE_SEND) {
|