|
@@ -32,8 +32,8 @@ class Pay extends Common
|
|
|
$order_sn = $this->request->post('order_sn');
|
|
|
$payment = $this->request->post('payment');
|
|
|
$openid = $this->request->post('openid', '');
|
|
|
- $money = $this->request->post('money', 0);
|
|
|
- $money = $money > 0 ? $money : 0;
|
|
|
+ /*$money = $this->request->post('money', 0);
|
|
|
+ $money = $money > 0 ? $money : 0;*/
|
|
|
$platform = $this->request->post('platform');
|
|
|
|
|
|
list($order, $order_type) = $this->getOrderInstance($order_sn);
|
|
@@ -62,6 +62,7 @@ class Pay extends Common
|
|
|
// pay 实例
|
|
|
$payOper = new PayOper();
|
|
|
|
|
|
+ $money = false;
|
|
|
if ($money && $order_type == 'order') {
|
|
|
// 余额混合支付
|
|
|
$order = Db::transaction(function () use ($payOper, $order, $order_type, $money) {
|
|
@@ -117,7 +118,7 @@ class Pay extends Common
|
|
|
$this->success('订单支付成功', $order);
|
|
|
}
|
|
|
|
|
|
- // 微信支付宝(第三方)付款
|
|
|
+ // 微信支付宝(第三方)付款, 在这里执行了addPay
|
|
|
$payModel = $payOper->{$payment}($order, $order->remain_pay_fee, $order_type);
|
|
|
|
|
|
$order_data = [
|
|
@@ -155,6 +156,10 @@ class Pay extends Common
|
|
|
$order_data['subject'] = '商城订单支付';
|
|
|
}
|
|
|
|
|
|
+ //加这个主要是因为退款时,找不到值
|
|
|
+ $order->platform = $platform;
|
|
|
+ $order->save();
|
|
|
+
|
|
|
//下单
|
|
|
$params = [
|
|
|
'type' => $payment,
|