浏览代码

sunguidong

zhangguidong 2 年之前
父节点
当前提交
6348724b2a
共有 2 个文件被更改,包括 3 次插入5 次删除
  1. 1 1
      app/api/controller/Pay.php
  2. 2 4
      app/model/system/Pay.php

+ 1 - 1
app/api/controller/Pay.php

@@ -43,7 +43,7 @@ class Pay extends BaseApi
 		if ($token['code'] < 0) return $this->response($token);
 		$pay_type = $this->params['pay_type'];
 		$out_trade_no = $this->params['out_trade_no'];
-//        $return_url = $this->params['return_url'];
+        $return_url = $this->params['return_url'];
         $pay = new PayModel();
         $info = $pay->getPayInfo($out_trade_no);
 		$app_type = 'pc';

+ 2 - 4
app/model/system/Pay.php

@@ -35,16 +35,14 @@ class Pay extends BaseModel
      * @param unknown $app_type  支付端口场景
      * @return Ambigous <>
      */
-    public function pay($pay_type, $out_trade_no, $app_type, $member_id,$event){
+    public function pay($pay_type, $out_trade_no, $app_type, $member_id,$event,$return_url){
         if(REWRITE_MODULE)
         {
             $notify_url = addon_url("pay/pay/".$event);
         }else{
             $notify_url = request()->domain().'/pay.php';
         }
-//        if(empty($return_url)) {
-            $return_url = 'http://yueshengshop.zhousi.hdlkeji.com/dist/#/index';
-//        }
+//        $return_url = 'http://yueshengshop.zhousi.hdlkeji.com/dist/#/index';
         $pay_info = $this->getPayInfo($out_trade_no);
         $data = $pay_info['data'];
         $data['app_type'] = $app_type;