|
@@ -221,12 +221,6 @@ class app_payControl extends mbMemberControl
|
|
}
|
|
}
|
|
$order_list = $result['data']['order_list'];
|
|
$order_list = $result['data']['order_list'];
|
|
$result = $logic_payment->updateRealOrder($out_trade_no, $payment, $order_list, $trade_no);
|
|
$result = $logic_payment->updateRealOrder($out_trade_no, $payment, $order_list, $trade_no);
|
|
-
|
|
|
|
- if ($result) {
|
|
|
|
- $logic_delivery = Logic('delivery');
|
|
|
|
- $ret = $logic_delivery->putOrder($out_trade_no, $transaction_id);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
} elseif ($order_type == 'v') {
|
|
} elseif ($order_type == 'v') {
|
|
$result = $logic_payment->getVrOrderInfo($out_trade_no);
|
|
$result = $logic_payment->getVrOrderInfo($out_trade_no);
|
|
if ($result['data']['order_state'] != ORDER_STATE_NEW) {
|
|
if ($result['data']['order_state'] != ORDER_STATE_NEW) {
|
|
@@ -235,6 +229,12 @@ class app_payControl extends mbMemberControl
|
|
$result = $logic_payment->updateVrOrder($out_trade_no, $payment, $result['data'], $trade_no);
|
|
$result = $logic_payment->updateVrOrder($out_trade_no, $payment, $result['data'], $trade_no);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ // 推送到oms
|
|
|
|
+ if ($result) {
|
|
|
|
+ $logic_delivery = Logic('delivery');
|
|
|
|
+ $ret = $logic_delivery->putOrder($out_trade_no, $transaction_id);
|
|
|
|
+ }
|
|
|
|
+
|
|
return $result;
|
|
return $result;
|
|
}
|
|
}
|
|
|
|
|