|
@@ -62,7 +62,7 @@ class RefillBase
|
|
}
|
|
}
|
|
|
|
|
|
if ($order_id !== false) {
|
|
if ($order_id !== false) {
|
|
- return $this->proc_notify($order_id, $success, $can_try, $chname);
|
|
|
|
|
|
+ return $this->proc_notify($order_id, $success, $can_try, $chname,$input);
|
|
} else {
|
|
} else {
|
|
Log::record("{$chname} callback 系统无此订单ID:{$order_id}", Log::ERR);
|
|
Log::record("{$chname} callback 系统无此订单ID:{$order_id}", Log::ERR);
|
|
}
|
|
}
|
|
@@ -75,7 +75,7 @@ class RefillBase
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
|
|
|
|
- private function proc_notify($order_id,$success, $can_try,$chname)
|
|
|
|
|
|
+ private function proc_notify($order_id,$success, $can_try,$chname,$input=[])
|
|
{
|
|
{
|
|
$mod_order = Model('vr_order');
|
|
$mod_order = Model('vr_order');
|
|
$order_info = $mod_order->getOrderInfo(['order_id' => $order_id]);
|
|
$order_info = $mod_order->getOrderInfo(['order_id' => $order_id]);
|
|
@@ -93,7 +93,16 @@ class RefillBase
|
|
|
|
|
|
$order_info = $mod_order->getOrderInfo(['order_id' => $order_id],'*',true,true);
|
|
$order_info = $mod_order->getOrderInfo(['order_id' => $order_id],'*',true,true);
|
|
$order_state = intval($order_info['order_state']);
|
|
$order_state = intval($order_info['order_state']);
|
|
- if ($order_state != ORDER_STATE_SEND) {
|
|
|
|
|
|
+
|
|
|
|
+ if ($order_state == ORDER_STATE_PAY)
|
|
|
|
+ {
|
|
|
|
+ if(!empty($input)) {
|
|
|
|
+ util::push_notify($chname,$input);
|
|
|
|
+ }
|
|
|
|
+ $tran->commit();
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
|
|
+ elseif ($order_state == ORDER_STATE_SUCCESS || $order_state == ORDER_STATE_CANCEL) {
|
|
$tran->commit();
|
|
$tran->commit();
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|