|
@@ -69,8 +69,20 @@ class app_payControl extends mbMemberControl
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
$output['need_pay'] = 0;
|
|
$output['need_pay'] = 0;
|
|
- self::update_order($pay_sn, '10000', 'bonus', $this->member_info['member_id']); // 更新订单
|
|
|
|
|
|
+ $result = self::update_order($pay_sn, $this->member_info['member_id'], 'bonus'); // 更新订单
|
|
|
|
+
|
|
|
|
+ // 推送到oms
|
|
|
|
+ if (isset($result) && $result['state'])
|
|
|
|
+ {
|
|
|
|
+ $logic_delivery = Logic('delivery');
|
|
|
|
+ $ret = $logic_delivery->putOrder($pay_sn, $this->member_info['member_id']);
|
|
|
|
+
|
|
|
|
+ if(empty($ret)) {
|
|
|
|
+ Log::record("Put order to oms error: pay_sn={$pay_sn},bonus pay.");
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+
|
|
joutput_data($output);
|
|
joutput_data($output);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -196,7 +208,7 @@ class app_payControl extends mbMemberControl
|
|
* @param $transaction_id
|
|
* @param $transaction_id
|
|
* @return array
|
|
* @return array
|
|
*/
|
|
*/
|
|
- public static function update_order($out_trade_no, $trade_no, $payment, $transaction_id)
|
|
|
|
|
|
+ public static function update_order($out_trade_no, $trade_no, $payment)
|
|
{
|
|
{
|
|
$logic_payment = Logic('payment');
|
|
$logic_payment = Logic('payment');
|
|
|
|
|
|
@@ -228,12 +240,6 @@ 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 (isset($result) && $result['state']) {
|
|
|
|
- $logic_delivery = Logic('delivery');
|
|
|
|
- $ret = $logic_delivery->putOrder($out_trade_no, $transaction_id);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
return $result;
|
|
return $result;
|
|
}
|
|
}
|
|
|
|
|