From 29de3eeb21cdd3c72cc57ebc831d45e74d24e658 Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Tue, 10 Dec 2019 17:56:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=8E=BB=E6=8E=89=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=9A=82=E6=97=B6=E4=BF=A1=E6=81=AF=20=E5=88=86?= =?UTF-8?q?=E5=B8=83=E5=BC=8F=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sdk/Controller/AppleController.class.php | 24 +++- .../Sdk/Controller/BaseController.class.php | 21 ++++ .../Controller/ExchangeController.class.php | 12 +- .../Sdk/Controller/PayH5Controller.class.php | 114 ++++++++---------- .../Sdk/Controller/SpendController.class.php | 73 +++++++---- .../Sdk/Controller/WapPayController.class.php | 10 +- 6 files changed, 156 insertions(+), 98 deletions(-) diff --git a/Application/Sdk/Controller/AppleController.class.php b/Application/Sdk/Controller/AppleController.class.php index dfc47754..7b983342 100644 --- a/Application/Sdk/Controller/AppleController.class.php +++ b/Application/Sdk/Controller/AppleController.class.php @@ -90,8 +90,14 @@ class AppleController extends BaseController{ public function apple_alipay_pay($user_id,$game_id){ #获取SDK上POST方式传过来的数据 然后base64解密 然后将json字符串转化成数组 //echo json_encode(['code'=>0,'msg'=> $user_id."game:".$game_id]);exit; - $file=file_get_contents("./Application/Sdk/OrderNo/".$user_id."-".$game_id.".txt"); - $request = json_decode(think_decrypt($file),true); + $request = $this->get_sdk_request($game_id); + $request['pay_order_number'] = "SP_".date('Ymd').date('His').sp_random_string(4); + $request['pay_status'] = 0; + $request['pay_way'] = C("PAY_WAY.ALIPAY"); + $request['spend_ip'] = get_client_ip(); + + /* $file=file_get_contents("./Application/Sdk/OrderNo/".$user_id."-".$game_id.".txt"); + $request = json_decode(think_decrypt($file),true); */ C(api('Config/lists')); /* $request['user_id'] = 1; @@ -183,7 +189,7 @@ class AppleController extends BaseController{ $data['order_no'] = $request['pay_order_number']; $data['paymenttype'] = "ZFBZF"; $data['MerRemark'] = "mark"; - $data['subject'] = "游戏充值"; + $data['subject'] = "消费-".$request["pay_order_number"]; $data['notifyurl'] = C('PAY_DOMAIN')."/callback.php/Notify/sq_callback";//通知 $data['returnurl'] = $returl; $data['mchAppId'] = "wmtxkj.com"; @@ -354,8 +360,14 @@ class AppleController extends BaseController{ */ public function apple_weixin_pay($user_id,$game_id) { - $file=file_get_contents("./Application/Sdk/OrderNo/".$user_id."-".$game_id.".txt"); - $request = json_decode(think_decrypt($file),true); + $request = $this->get_sdk_request($game_id); + $request['pay_order_number'] = "SP_".date('Ymd').date('His').sp_random_string(4); + $request['pay_status'] = 0; + $request['pay_way'] = C("PAY_WAY.WEIXIN"); + $request['spend_ip'] = get_client_ip(); + + /* $file=file_get_contents("./Application/Sdk/OrderNo/".$user_id."-".$game_id.".txt"); + $request = json_decode(think_decrypt($file),true); */ // Log::write("wxpay:".serialize($request)); /*$request['user_id'] = 1; $request['game_id'] = 1; @@ -405,7 +417,7 @@ class AppleController extends BaseController{ //0 官方 1威富通 2俊付通 if (get_wx_pay_type() == 0) { $weixn = new Weixin(); - $is_pay = json_decode($weixn->weixin_pay("充值", $request['pay_order_number'], $pay_amount, 'MWEB'), true); + $is_pay = json_decode($weixn->weixin_pay(isset($request['title']) ? $request['title']: "充值", $request['pay_order_number'], $pay_amount, 'MWEB'), true); if($is_pay['status']==1){ if($request['code']==1){ diff --git a/Application/Sdk/Controller/BaseController.class.php b/Application/Sdk/Controller/BaseController.class.php index c89c199b..8c5597f9 100644 --- a/Application/Sdk/Controller/BaseController.class.php +++ b/Application/Sdk/Controller/BaseController.class.php @@ -870,4 +870,25 @@ class BaseController extends RestController{ return $request; //$this->set_message(1089,"fail",$request['price']."新支付".$pay_amount); } + + /** + * 获取cp传过来的订单号等信息在exchange接口 + */ + public function get_sdk_request($game_id) { + if (!$this->userId) { + return ; + } + $payInfo = M("pay_info", "tab_")->where([ + 'user_id' => $this->userId, + 'game_id' => $game_id + ])->order('id desc')->find(); + if (!$payInfo || !$payInfo['info']) { + return ; + } + $request = json_decode($payInfo['info'], true); + + return $request; + } + + } diff --git a/Application/Sdk/Controller/ExchangeController.class.php b/Application/Sdk/Controller/ExchangeController.class.php index fec9bd81..9d8102dc 100644 --- a/Application/Sdk/Controller/ExchangeController.class.php +++ b/Application/Sdk/Controller/ExchangeController.class.php @@ -89,6 +89,7 @@ class ExchangeController extends BaseController{ $this->set_message(0,"fail","未上传角色，不允许充值"/* .M("user_play_info", "tab_")->_sql() */); } + $user_entity = get_user_entity($request['user_id']); M("pay_info", "tab_")->add([ 'user_id' => $request['user_id'], 'game_id' => $request['game_id'], @@ -98,7 +99,16 @@ class ExchangeController extends BaseController{ 'type' => '', // 'info' => json_encode($request), 'status' => 'normal', - 'create_time' => time() + 'create_time' => time(), + 'user_account' => $user_entity['account'], + 'game_player_name' => $request['game_player_name'], + 'game_name' => $request['game_name'], + 'server_id' => $request['server_id'], + 'server_name' => $request['server_name'], + 'promote_id' => $user_entity['promote_id'], + 'game_player_id' => $request['game_player_id'], + 'sdk_version' => $request['sdk_version'], + 'promote_account' => $user_entity['promote_account'], ]); /* if (!isset($request['api_ver'])) { $payPage = "pay_way_v1"; diff --git a/Application/Sdk/Controller/PayH5Controller.class.php b/Application/Sdk/Controller/PayH5Controller.class.php index 4474b95b..f01b286f 100644 --- a/Application/Sdk/Controller/PayH5Controller.class.php +++ b/Application/Sdk/Controller/PayH5Controller.class.php @@ -274,19 +274,15 @@ class PayH5Controller extends BaseController{ */ public function ali_pay($user_id,$game_id){ #获取SDK上POST方式传过来的数据 然后base64解密 然后将json字符串转化成数组 - //echo json_encode(['code'=>0,'msg'=> $user_id."game:".$game_id]);exit; - $file=file_get_contents("./Application/Sdk/OrderNo/".$user_id."-".$game_id.".txt"); - $request = json_decode(think_decrypt($file),true); + $request = $this->get_sdk_request($game_id); + $request['pay_order_number'] = "SP_".date('Ymd').date('His').sp_random_string(4); + $request['pay_status'] = 0; + $request['pay_way'] = C("PAY_WAY.ALIPAY"); + $request['spend_ip'] = get_client_ip(); + /* $file=file_get_contents("./Application/Sdk/OrderNo/".$user_id."-".$game_id.".txt"); + $request = json_decode(think_decrypt($file),true); */ C(api('Config/lists')); - /* - $request['user_id'] = 1; - $request['game_id'] = 1; - $request['price'] = 1.01; - $request['extend'] = 21111184; - $request['pay_order_number'] = 21111183; - $request['sdk_version'] = 2; - $request['code'] =1; -*/ + if (empty($request)) { echo json_encode(['code'=>0,'msg'=>'登录数据不能为空']);exit; } @@ -296,7 +292,6 @@ class PayH5Controller extends BaseController{ if (!$payCheck['code']) { echo json_encode(['code'=>0,'msg'=> $payCheck['msg']]);exit; } - $game = M('Game','tab_')->where(['id'=>$request['game_id']])->field('pay_status')->find(); if($game['pay_status'] == 0){ echo json_encode(['code'=>0,'msg'=>'该游戏暂时无法充值，请联系客服！']);exit; @@ -320,15 +315,14 @@ class PayH5Controller extends BaseController{ $request['signtype']= "MD5"; $request['server'] = "alipay.wap.create.direct.pay.by.user"; $request['payway'] = 1; - $request['title']=$request['price']; - $request['body']=$request['price']; + $request['title'] = "消费-".$request["pay_order_number"]; + $request['body'] = $request['price']; //$request['callback'] = 'http://'.$_SERVER['HTTP_HOST']. "/sdk.php/Spend/pay_success/orderno/".$request['pay_order_number'].'/game_id/'.$request['game_id']; //$request['notifyurl'] = 'http://'.$_SERVER['HTTP_HOST']. "/callback.php/Notify/notify/apitype/alipay/method/notify"; $pay_url=$this->pay($request); $request['pay_url'] = $pay_url['url']."&tx_client=hideopen"; $orderno = $pay_url['out_trade_no']; -// pp($request['pay_url']); todo: 又问提 死循环。。。 //echo json_encode(['code'=>200,'msg'=>'','data'=>['url'=>$pay_url['url'],'wap'=>1]]);exit; } else {/* app */ $game_set_data = get_game_set_info($request['game_id']); @@ -635,12 +629,7 @@ ADD COLUMN `pay_url` text NULL AFTER `check_sign`; // 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 - if($request['code']==1){ - $this->add_spend($request,1); - }else{ - $this->add_deposit($request, 1); - } + $request['pay_way'] = C('PAY_WAY.WFT_PAY'); // 威富通wx $pay['agent_id'] = C('heepay.partner');//商户号 $pay['order_no'] = $request['pay_order_number']; @@ -649,16 +638,17 @@ ADD COLUMN `pay_url` text NULL AFTER `check_sign`; $pay['amount'] = $request['price']; $pay['user_ip'] = get_client_ip(); $pay['sign_key'] = C('heepay.key');//密钥 - $pay['payerName'] = "cs"; + $pay['payerName'] = "万盟天下"; $pay['number'] = 1; - $pay['goods_note']="cs"; + $pay['goods_note']= "消费-".$request["pay_order_number"]; $pay['device'] = "wap"; $pay['bank_card_type'] = 0; - $pay['return_url'] ='http://' . $_SERVER ['HTTP_HOST'] . "/sdk.php/Spend/pay_success/orderno/".$pay['order_no'].'/game_id/'.$request['game_id']; + $pay['return_url'] = C('PAY_DOMAIN')."sdk.php/Spend/paycallback/orderno/{$request['pay_order_number']}/user_token/".$this->userToken."/paytype/weixinpay/game_id/{$game_id}"; $heepay = new Heepay(); $url = $heepay->wxh5_pay($pay); - $json_data['url'] = $url; - + $request['pay_url'] = $url."&tx_client=hideopen"; + + $this->add_deposit($request, 1); }elseif(get_wx_pay_type() == 2){ if($request['code']==1){ @@ -842,8 +832,8 @@ ADD COLUMN `pay_url` text NULL AFTER `check_sign`; $data['order_no'] = $request['pay_order_number']; $data['paymenttype'] = "UNION"; $data['MerRemark'] = "mark"; - $data['subject'] = "游戏充值"; - $data['notifyurl'] = "http://"."api.wmtxkj.com"."/callback.php/Notify/sq_callback";//通知 + $data['subject'] = "消费-".$request["pay_order_number"]; + $data['notifyurl'] = C("PAY_DOMAIN")."/callback.php/Notify/sq_callback";//通知 $data['returnurl'] = $returl; $data['mchAppId'] = "wmtxkj.com"; $data['mchAppName'] = "mchAppName"; @@ -1226,17 +1216,15 @@ ADD COLUMN `pay_url` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL AFTER */ public function weixin_pay($user_id,$game_id) { - $file=file_get_contents("./Application/Sdk/OrderNo/".$user_id."-".$game_id.".txt"); - $request = json_decode(think_decrypt($file),true); - // Log::write("wxpay:".serialize($request)); - /*$request['user_id'] = 1; - $request['game_id'] = 1; - $request['price'] = 157.01; - $request['extend'] = 21111178; - $request['pay_order_number'] = 21111178; - $request['sdk_version'] = 2; - $request['code'] =1;fd - */ + /* $file=file_get_contents("./Application/Sdk/OrderNo/".$user_id."-".$game_id.".txt"); + $request = json_decode(think_decrypt($file),true); */ + + $request = $this->get_sdk_request($game_id); + $request['pay_order_number'] = "SP_".date('Ymd').date('His').sp_random_string(4); + $request['pay_status'] = 0; + $request['pay_way'] = C("PAY_WAY.WEIXIN"); + $request['spend_ip'] = get_client_ip(); + if (empty($request)) { // $this->set_message(0, "fail", "登录数据不能为空"); redirect(U('Spend/notice',array('user_id'=>$user_id,'game_id'=>$game_id,'msg'=>'登录数据不能为空', 'user_token' => $this->userToken)));exit; @@ -1278,7 +1266,7 @@ ADD COLUMN `pay_url` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL AFTER //0 官方 1威富通 2俊付通 if (get_wx_pay_type() == 0) { $weixn = new Weixin(); - $is_pay = json_decode($weixn->weixin_pay("充值", $request['pay_order_number'], $pay_amount, 'MWEB'), true); + $is_pay = json_decode($weixn->weixin_pay(isset($request['title']) ? $request['title']: "充值", $request['pay_order_number'], $pay_amount, 'MWEB'), true); if($is_pay['status']==1){ @@ -1295,30 +1283,26 @@ ADD COLUMN `pay_url` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL AFTER redirect(U('Spend/notice',array('user_id'=>$user_id,'game_id'=>$game_id,'msg'=>'支付失败', 'user_token' => $this->userToken)));exit; } }elseif(get_wx_pay_type() == 1){ - $request['pay_way'] = 4; // 威富通wx - if($request['code']==1){ - $this->add_spend($request,1); - }else{ - $this->add_deposit($request, 1); - } - - $pay['agent_id'] = C('heepay.partner');//商户号 - $pay['order_no'] = $request['pay_order_number']; - $pay['time'] = date('YmdHis', time()); - $pay['pay_type'] = 30; - $pay['amount'] = $request['price']; - $pay['user_ip'] = get_client_ip(); - $pay['sign_key'] = C('heepay.key');//密钥 - $pay['payerName'] = "cs"; - $pay['number'] = 1; - $pay['goods_note']="cs"; - $pay['device'] = "wap"; - $pay['bank_card_type'] = 0; - $pay['return_url'] ='http://' . $_SERVER ['HTTP_HOST'] . "/sdk.php/Spend/pay_success/orderno/".$pay['order_no'].'/game_id/'.$request['game_id']; - $heepay = new Heepay(); - $url = $heepay->wxh5_pay($pay); - $json_data['url'] = $url; - + $request['pay_way'] = C('PAY_WAY.WFT_PAY'); // 威富通wx + + $pay['agent_id'] = C('heepay.partner');//商户号 + $pay['order_no'] = $request['pay_order_number']; + $pay['time'] = date('YmdHis', time()); + $pay['pay_type'] = 30; + $pay['amount'] = $request['price']; + $pay['user_ip'] = get_client_ip(); + $pay['sign_key'] = C('heepay.key');//密钥 + $pay['payerName'] = "万盟天下"; + $pay['number'] = 1; + $pay['goods_note']= "消费-".$request["pay_order_number"]; + $pay['device'] = "wap"; + $pay['bank_card_type'] = 0; + $pay['return_url'] = C('PAY_DOMAIN')."sdk.php/Spend/paycallback/orderno/{$request['pay_order_number']}/user_token/".$this->userToken."/paytype/weixinpay/game_id/{$game_id}"; + $heepay = new Heepay(); + $url = $heepay->wxh5_pay($pay); + $request['pay_url'] = $url."&tx_client=hideopen"; + + $this->add_spend($request,1); }elseif(get_wx_pay_type() == 2){ if($request['code']==1){ diff --git a/Application/Sdk/Controller/SpendController.class.php b/Application/Sdk/Controller/SpendController.class.php index 617d215d..31c65765 100644 --- a/Application/Sdk/Controller/SpendController.class.php +++ b/Application/Sdk/Controller/SpendController.class.php @@ -61,10 +61,16 @@ class SpendController extends Controller { die(); } C(BaseController::get_tool()); -// pp(BaseController::get_tool()); - $file = file_get_contents ( "./Application/Sdk/OrderNo/" . $user_id . "-" . $game_id . ".txt" ); - $request = json_decode ( think_decrypt ( $file ), true ); + $pay_info = M('pay_info', 'tab_')->where([ + 'user_id' => $user_id, + 'game_id' => $game_id + ])->order("id desc")->find(); + $request = json_decode($pay_info['info'], true); + + /* $file = file_get_contents ( "./Application/Sdk/OrderNo/" . $user_id . "-" . $game_id . ".txt" ); + $request = json_decode ( think_decrypt ( $file ), true ); */ + $data = array( 'coin' => $request ['body'], 'price' => $request ['price'], @@ -121,8 +127,14 @@ class SpendController extends Controller { $user_id = I ('user_id'); $game_id = I ('game_id'); - $file = file_get_contents ( "./Application/Sdk/OrderNo/" . $user_id . "-" . $game_id . ".txt" ); - $request = json_decode ( think_decrypt ( $file ), true ); + $pay_info = M('pay_info', 'tab_')->where([ + 'user_id' => $user_id, + 'game_id' => $game_id + ])->order("id desc")->find(); + $request = json_decode($pay_info['info'], true); + + /* $file = file_get_contents ( "./Application/Sdk/OrderNo/" . $user_id . "-" . $game_id . ".txt" ); + $request = json_decode ( think_decrypt ( $file ), true ); */ C(BaseController::get_tool()); @@ -205,13 +217,14 @@ class SpendController extends Controller { public function pay_success() { - $orderno = $_GET ['orderno'] == "" ? $_GET ['out_trade_no'] : $_GET ['orderno']; - if (! empty ( $_GET ['jinzhue'] )) { - sleep ( 3 ); - $orderno = $_GET ['jinzhue']; - } - $pay_where = substr ( $orderno, 0, 2 ); - $Scheme = file_get_contents ( "./Application/Sdk/Scheme/" . $_GET ['game_id'] . ".txt" ); + $orderno = I('request.orderno'); + if (!$orderno) $orderno = I('request.out_trade_no'); + + $pay_where = substr($orderno, 0, 2); + $pay_info = M('pay_info', 'tab_')->where(['order_id' => $orderno])->find(); + $json = json_decode($pay_info['info'], true); + $Scheme = $json['scheme']; +// $Scheme = file_get_contents ( "./Application/Sdk/Scheme/" . $_GET ['game_id'] . ".txt" ); $map ['pay_order_number'] = $orderno; switch ($pay_where) { case 'SP' : @@ -235,9 +248,17 @@ class SpendController extends Controller { } public function pay_success2() { - $orderno = $_GET ['orderno'] == "" ? $_GET ['out_trade_no'] : $_GET ['orderno']; + $orderno = I('request.orderno'); + if (!$orderno) $orderno = I('request.out_trade_no'); + + $pay_where = substr($orderno, 0, 2); + $pay_info = M('pay_info', 'tab_')->where(['order_id' => $orderno])->find(); + $json = json_decode($pay_info['info'], true); + $Scheme = $json['scheme']; + + //$orderno = $_GET ['orderno'] == "" ? $_GET ['out_trade_no'] : $_GET ['orderno']; $pay_where = substr ( $orderno, 0, 2 ); - $Scheme = file_get_contents ( "./Application/Sdk/Scheme/" . $_GET ['game_id'] . ".txt" ); + //$Scheme = file_get_contents ( "./Application/Sdk/Scheme/" . $_GET ['game_id'] . ".txt" ); $map ['pay_order_number'] = $orderno; switch ($pay_where) { case 'SP' : @@ -259,10 +280,13 @@ class SpendController extends Controller { $this->display (); } public function pay_success3() { - $orderno = $_GET ['orderno'] == "" ? $_GET ['out_trade_no'] : $_GET ['orderno']; - if (! empty ( $_GET ['jinzhue'] )) { - $orderno = $_GET ['jinzhue']; - } + $orderno = I('request.orderno'); + if (!$orderno) $orderno = I('request.out_trade_no'); + +// $orderno = $_GET ['orderno'] == "" ? $_GET ['out_trade_no'] : $_GET ['orderno']; +// if (! empty ( $_GET ['jinzhue'] )) { +// $orderno = $_GET ['jinzhue']; +// } $pay_where = substr ( $orderno, 0, 2 ); $map ['pay_order_number'] = $orderno; $result = M ( 'Spend', 'tab_' )->field ( "pay_status" )->where ( $map )->find (); @@ -296,7 +320,9 @@ ADD COLUMN `pay_url` varchar(255) NOT NULL DEFAULT '' AFTER `check_sign`; */ public function paycallback() { $userToken = I('user_token'); - $orderno = $_GET['orderno'] == "" ? $_GET ['out_trade_no'] : $_GET ['orderno']; + $orderno = I('request.orderno'); + if (!$orderno) $orderno = I('request.out_trade_no'); +// $orderno = $_GET['orderno'] == "" ? $_GET ['out_trade_no'] : $_GET ['orderno']; $pay_where = substr($orderno, 0, 2); // $Scheme = file_get_contents("./Application/Sdk/Scheme/" . $_GET ['game_id'] . ".txt"); $gameId = $_GET ['game_id']; @@ -400,10 +426,15 @@ ADD COLUMN `pay_url` varchar(255) NOT NULL DEFAULT '' AFTER `check_sign`; // 快捷支付通知 public function shortcut_notice() { $status = $_GET['status']; - $orderno = $_GET ['orderno'] == "" ? $_GET ['out_trade_no'] : $_GET ['orderno']; + $orderno = I('request.orderno'); + if (!$orderno) $orderno = I('request.out_trade_no'); $pay_where = substr($orderno, 0, 2); - $Scheme = file_get_contents ( "./Application/Sdk/Scheme/" . $_GET ['game_id'] . ".txt" ); + $pay_info = M('pay_info', 'tab_')->where(['order_id' => $orderno])->find(); + $json = json_decode($pay_info['info'], true); + $Scheme = $json['scheme']; + +// $Scheme = file_get_contents ( "./Application/Sdk/Scheme/" . $_GET ['game_id'] . ".txt" ); $map ['pay_order_number'] = $orderno; switch ($pay_where) { case 'SP' : diff --git a/Application/Sdk/Controller/WapPayController.class.php b/Application/Sdk/Controller/WapPayController.class.php index 3a1006a2..2c044d78 100644 --- a/Application/Sdk/Controller/WapPayController.class.php +++ b/Application/Sdk/Controller/WapPayController.class.php @@ -144,7 +144,7 @@ class WapPayController extends BaseController{ $data['order_no'] = $request['pay_order_number']; $data['paymenttype'] = "ZFBZF"; $data['MerRemark'] = "mark"; - $data['subject'] = "游戏充值"; + $data['subject'] = "消费-".$request["pay_order_number"]; $data['notifyurl'] = C('PAY_DOMAIN')."/callback.php/Notify/sq_callback";//通知 $data['returnurl'] = $returl; $data['mchAppId'] = "wmtxkj.com"; @@ -452,8 +452,8 @@ class WapPayController extends BaseController{ 'payAmount' => $payInfo['price'], 'secret' => C('sqpay.key'), 'merOrderNo' => $payInfo['order_id'], - 'NotifyURL' => "http://api.wmtxkj.cn"."/callback.php?Notify/sq_callback", - 'purpose' => '游戏充值' + 'NotifyURL' => C("PAY_DOMAIN")."/callback.php?Notify/sq_callback", + 'purpose' => "消费-".$payInfo['order_id'], )); //echo "发送短信==》".time()."
"; if ($ret['resFlag'] == 'success') { @@ -795,7 +795,7 @@ class WapPayController extends BaseController{ $this->set_message(1009, "fail", "支付参数未配置"); } $weixn = new Weixin(); - $is_pay = json_decode($weixn->weixin_pay("充值", $request['pay_order_number'], $pay_amount, 'MWEB'), true); + $is_pay = json_decode($weixn->weixin_pay(isset($request['title']) ? $request['title']: "充值", $request['pay_order_number'], $pay_amount, 'MWEB'), true); if($is_pay['status']==1){ if($request['code']==1){ $this->add_spend($request); @@ -1198,7 +1198,7 @@ class WapPayController extends BaseController{ $data['userId'] = $request['openid']; // openid $data['order_no'] = $request['pay_order_number']; $data['merno'] = C('sqpay.partner'); - $data['subject'] = '游戏充值'; + $data['subject'] = "消费-".$request["pay_order_number"]; $data['ip'] = get_client_ip(); $data['returnurl'] = C('PAY_DOMAIN'). "/sdk.php/Spend/pay_success/orderno/".$request['pay_order_number'].'/game_id/'.$request['game_id']; $data['notifyurl'] = C('PAY_DOMAIN')."/callback.php/Notify/sq_callback";