|
@@ -70,7 +70,7 @@ class app_payControl extends mbMemberControl
|
|
|
}
|
|
|
} else {
|
|
|
$output['need_pay'] = 0;
|
|
|
- self::update_order($pay_sn, '10000', 'bonus'); // 更新订单
|
|
|
+ self::update_order($pay_sn, '10000', 'bonus', $this->member_info['member_id']); // 更新订单
|
|
|
}
|
|
|
joutput_data($output);
|
|
|
}
|
|
@@ -194,9 +194,10 @@ class app_payControl extends mbMemberControl
|
|
|
* @param $out_trade_no
|
|
|
* @param $trade_no
|
|
|
* @param $payment
|
|
|
+ * @param $transaction_id
|
|
|
* @return array
|
|
|
*/
|
|
|
- public static function update_order($out_trade_no, $trade_no, $payment)
|
|
|
+ public static function update_order($out_trade_no, $trade_no, $payment, $transaction_id)
|
|
|
{
|
|
|
$logic_payment = Logic('payment');
|
|
|
|
|
@@ -220,6 +221,12 @@ class app_payControl extends mbMemberControl
|
|
|
}
|
|
|
$order_list = $result['data']['order_list'];
|
|
|
$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') {
|
|
|
$result = $logic_payment->getVrOrderInfo($out_trade_no);
|
|
|
if ($result['data']['order_state'] != ORDER_STATE_NEW) {
|