|
@@ -128,7 +128,7 @@ class Payment extends BaseMall {
|
|
|
//$update = model('order')->editOrder(array('api_pay_time'=>TIMESTAMP),array('order_id'=>$result['data']['order_id']));
|
|
|
//if(!$update) {
|
|
|
// return array('error' => '更新订单信息发生错误,请重新支付');
|
|
|
- //}
|
|
|
+ //}
|
|
|
//计算本次需要在线支付的订单总金额
|
|
|
$pay_amount = $result['data']['order_amount'] - $result['data']['pd_amount'] - $result['data']['rcb_amount'];
|
|
|
$result['data']['api_pay_amount'] = ds_price_format($pay_amount);
|
|
@@ -149,7 +149,7 @@ class Payment extends BaseMall {
|
|
|
}
|
|
|
|
|
|
$result['data']['api_pay_amount'] = ds_price_format($pay_amount);
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
return $result;
|
|
@@ -171,7 +171,7 @@ class Payment extends BaseMall {
|
|
|
$pay_sn=makePaySn(session('member_id'));
|
|
|
$storejoinin_model->editStorejoinin(array('pay_sn'=>$pay_sn), array('member_id' => session('member_id'),'pay_sn'=>''));
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
$logic_payment = model('payment', 'logic');
|
|
|
$result = $logic_payment->getPaymentInfo($payment_code);
|
|
|
if (!$result['code']) {
|
|
@@ -195,7 +195,7 @@ class Payment extends BaseMall {
|
|
|
//转到第三方API支付
|
|
|
$this->_api_pay($result['data'], $payment_info);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 实物商品订单
|
|
|
*/
|
|
@@ -329,7 +329,7 @@ class Payment extends BaseMall {
|
|
|
}catch(\Exception $e){
|
|
|
$this->error($e->getMessage());
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
View::assign('pay_url', $pay_url);
|
|
|
View::assign('nav_list', rkcache('nav', true));
|
|
|
if($payment_info['payment_code']=='wxpay_native'){
|
|
@@ -366,9 +366,9 @@ class Payment extends BaseMall {
|
|
|
}
|
|
|
exit();
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
- * 二维码显示(微信扫码支付)
|
|
|
+ * 二维码显示(微信扫码支付)
|
|
|
*/
|
|
|
public function qrcode() {
|
|
|
$data = base64_decode(input('data'));
|
|
@@ -403,7 +403,7 @@ class Payment extends BaseMall {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- *
|
|
|
+ *
|
|
|
* @param type $payment_code 共用回调方法
|
|
|
* @param type $show_code 实际支付方式名称
|
|
|
*/
|
|
@@ -446,8 +446,8 @@ class Payment extends BaseMall {
|
|
|
public function unionpay_return() {
|
|
|
$this->return_verify('unionpay');
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
public function return_verify($payment_code){
|
|
|
|
|
|
$logic_payment = model('payment', 'logic');
|
|
@@ -472,7 +472,9 @@ class Payment extends BaseMall {
|
|
|
//支付成功后跳转
|
|
|
if ($order_type == 'real_order') {
|
|
|
$pay_ok_url = HOME_SITE_URL . '/buy/pay_ok?pay_sn=' . $out_trade_no . '&pay_amount=' . ds_price_format($order_amount);
|
|
|
- } elseif ($order_type == 'vr_order') {
|
|
|
+ } elseif ($order_type == 'sj_order') {
|
|
|
+ $pay_ok_url = HOME_SITE_URL . '/Seller/index.html';
|
|
|
+ } elseif ($order_type == 'vr_order') {
|
|
|
$pay_ok_url = HOME_SITE_URL . '/buyvirtual/pay_ok?order_sn=' . $out_trade_no . '&order_amount=' . ds_price_format($order_amount);
|
|
|
} elseif ($order_type == 'pd_order') {
|
|
|
$pay_ok_url = HOME_SITE_URL . '/predeposit/index';
|
|
@@ -540,7 +542,7 @@ class Payment extends BaseMall {
|
|
|
public function alipay_h5_notify() {
|
|
|
$this->notify('alipay','alipay_h5');
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
|
|
|
}
|
|
|
|