diff --git a/Application/Sdk/Controller/PayH5Controller.class.php b/Application/Sdk/Controller/PayH5Controller.class.php index bb1becd6..94f9b122 100644 --- a/Application/Sdk/Controller/PayH5Controller.class.php +++ b/Application/Sdk/Controller/PayH5Controller.class.php @@ -605,7 +605,7 @@ ADD COLUMN `pay_url` text NULL AFTER `check_sign`; $user_id = $request['user_id']; if($request['price']*1<=0 || $request['price'] > C('WX_PAY_LIMIT')) { // $this->set_message(0,"fail","充值金额有误"); - redirect(U('Spend/notice',array('user_id'=>$user_id,'msg'=>'充值金额有误', 'game_id' => $game_id, 'user_token' => $this->userToken)));exit; + redirect(U('Spend/notice',array('user_id'=>$user_id, 'is_platform' => 1, 'msg'=>'充值金额有误', 'game_id' => $game_id, 'user_token' => $this->userToken)));exit; } $pay_amount = $request['price']; @@ -631,7 +631,7 @@ ADD COLUMN `pay_url` text NULL AFTER `check_sign`; redirect($json_data['url']); } }else{ - redirect(U('Spend/notice',array('user_id'=>$user_id,'game_id'=>$game_id,'msg'=>'支付失败', 'user_token' => $this->userToken)));exit; + redirect(U('Spend/notice',array('user_id'=>$user_id, 'is_platform' => 1,'game_id'=>$game_id,'msg'=>'支付失败', 'user_token' => $this->userToken)));exit; } }elseif(get_wx_pay_type() == 1){ $request['pay_way'] = 4; // 威富通wx diff --git a/Application/Sdk/Controller/SpendController.class.php b/Application/Sdk/Controller/SpendController.class.php index e6f50cd0..e5bfe836 100644 --- a/Application/Sdk/Controller/SpendController.class.php +++ b/Application/Sdk/Controller/SpendController.class.php @@ -188,6 +188,7 @@ class SpendController extends Controller { $this->assign ( 'paystatus', $result ['pay_status'] ); $this->display (); } + public function pay_success2() { $orderno = $_GET ['orderno'] == "" ? $_GET ['out_trade_no'] : $_GET ['orderno']; $pay_where = substr ( $orderno, 0, 2 ); @@ -230,8 +231,8 @@ class SpendController extends Controller { $this->assign ('Scheme', $Scheme?$Scheme:'txplatformsdk'); $this->display (); } - public function notice($user_id = 0, $game_id = 0, $msg = '') { - if (!$game_id) { + public function notice($user_id = 0, $game_id = 0, $is_platform=0, $msg = '') { + if ($is_platform) { $this->assign("gourl", U('UserH/get_user_money',array('user_id'=>I('user_id'),'game_id'=>I('game_id'), 'user_token' => I('user_token')))); } else { $this->assign("gourl", U('Spend/pay_way',array('user_id'=>I('user_id'),'game_id'=>I('game_id'), 'user_token' => I('user_token')))); @@ -250,7 +251,7 @@ ADD COLUMN `pay_url` varchar(255) NOT NULL DEFAULT '' AFTER `check_sign`; $pay_where = substr($orderno, 0, 2); $Scheme = file_get_contents("./Application/Sdk/Scheme/" . $_GET ['game_id'] . ".txt"); $map ['pay_order_number'] = $orderno; - $paytype = I('request.paytype', 0); // 支付方式 weixin alipay + $paytype = I('request.paytype', 0); // 支付方式 weixinpay alipay $gopay = I('request.gopay'); switch ($pay_where) {