elf
/
cf-sdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/1228' into dev

Browse Source
master
tping 4 years ago
parent bbca6b304b 6cffb9505f
commit a63702b338
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File

14
Application/Sdk/Controller/PayH5Controller.class.php
Unescape Escape View File

@ -78,7 +78,6 @@ class PayH5Controller extends BaseController{
$pay_conf['id'] = $pay_info['id']; $pay_conf['id'] = $pay_info['id'];
$pay_conf['merchant_id'] = $pay_info['id']; $pay_conf['merchant_id'] = $pay_info['id'];
$pay_conf['merchant_way'] = self::ALI_PAY; $pay_conf['merchant_way'] = self::ALI_PAY;
$pay_conf['main_id'] = $pay_info['main_id'];
if ($pay_info['channel'] == 1) { // 支付宝官方 if ($pay_info['channel'] == 1) { // 支付宝官方
@ -113,7 +112,7 @@ class PayH5Controller extends BaseController{
$request['id'] = $pay_info['id']; $request['id'] = $pay_info['id'];
$request['merchant_id'] = $pay_info['id']; $request['merchant_id'] = $pay_info['id'];
$request['merchant_way'] = 1; $request['merchant_way'] = 1;
$pay_conf['main_id'] = $pay_info['main_id']; $request['main_id'] = $pay_conf['main_id'];
$this->add_deposit($request, 1); $this->add_deposit($request, 1);
$sqpay=new Sqpay(); $sqpay=new Sqpay();
@ -373,7 +372,6 @@ class PayH5Controller extends BaseController{
$pay_conf['id'] = $pay_info['id']; $pay_conf['id'] = $pay_info['id'];
$pay_conf['merchant_id'] = $pay_info['id']; $pay_conf['merchant_id'] = $pay_info['id'];
$pay_conf['merchant_way'] = self::ALI_PAY; $pay_conf['merchant_way'] = self::ALI_PAY;
$pay_conf['main_id'] = $pay_info['main_id'];
if ($pay_info['channel'] == 1) { // 支付宝官方 if ($pay_info['channel'] == 1) { // 支付宝官方
// $game_set_data = get_game_set_info($request['game_id']); // $game_set_data = get_game_set_info($request['game_id']);
$request['apitype'] = "alipay"; $request['apitype'] = "alipay";
@ -405,7 +403,7 @@ class PayH5Controller extends BaseController{
$request['spend_ip'] = get_client_ip(); $request['spend_ip'] = get_client_ip();
$request['merchant_id'] = $pay_info['id']; $request['merchant_id'] = $pay_info['id'];
$request['merchant_way'] = 1; $request['merchant_way'] = 1;
$pay_conf['main_id'] = $pay_info['main_id']; $request['main_id'] = $pay_conf['main_id'];
if($request['code']==1){ if($request['code']==1){
$ordercheck = M("spend","tab_")->where(array('pay_order_number'=>$request["pay_order_number"]))->find(); $ordercheck = M("spend","tab_")->where(array('pay_order_number'=>$request["pay_order_number"]))->find();
@ -463,7 +461,7 @@ class PayH5Controller extends BaseController{
$request['spend_ip'] = get_client_ip(); $request['spend_ip'] = get_client_ip();
$request['merchant_id'] = $pay_info['id']; $request['merchant_id'] = $pay_info['id'];
$request['merchant_way'] = 1; $request['merchant_way'] = 1;
$pay_conf['main_id'] = $pay_info['main_id']; $request['main_id'] = $pay_conf['main_id'];
$ordercheck = M("spend","tab_")->where(array('pay_order_number'=>$request["pay_order_number"]))->find(); $ordercheck = M("spend","tab_")->where(array('pay_order_number'=>$request["pay_order_number"]))->find();
if ($ordercheck) { if ($ordercheck) {
@ -747,7 +745,6 @@ class PayH5Controller extends BaseController{
$pay_conf['id'] = $pay_info['id']; $pay_conf['id'] = $pay_info['id'];
$pay_conf['merchant_id'] = $pay_info['id']; $pay_conf['merchant_id'] = $pay_info['id'];
$pay_conf['merchant_way'] = self::WX_PAY; $pay_conf['merchant_way'] = self::WX_PAY;
$pay_conf['main_id'] = $pay_info['main_id'];
//0 官方 1威富通 2俊付通 //0 官方 1威富通 2俊付通
// if (get_wx_pay_type() == 0) { // if (get_wx_pay_type() == 0) {
@ -760,7 +757,7 @@ class PayH5Controller extends BaseController{
$request['pay_url'] = $json_data['url']."&tx_client=hideopen"; $request['pay_url'] = $json_data['url']."&tx_client=hideopen";
$request['merchant_id'] = $pay_info['id']; $request['merchant_id'] = $pay_info['id'];
$request['merchant_way'] = self::WX_PAY; $request['merchant_way'] = self::WX_PAY;
$pay_conf['main_id'] = $pay_info['main_id']; $request['main_id'] = $pay_conf['main_id'];
$this->add_deposit($request, 1); $this->add_deposit($request, 1);
// .(is_ssl()?'https%3A%2F%2F':'http%3A%2F%2F'). $_SERVER ['HTTP_HOST'] . "%2Fsdk.php%2FSpend%2Fpay_success%2Forderno%2F".$request['pay_order_number'].'%2Fgame_id%2F'.$request['game_id'] ; // .(is_ssl()?'https%3A%2F%2F':'http%3A%2F%2F'). $_SERVER ['HTTP_HOST'] . "%2Fsdk.php%2FSpend%2Fpay_success%2Forderno%2F".$request['pay_order_number'].'%2Fgame_id%2F'.$request['game_id'] ;
/* if (I('request.api_ver') == 1) { /* if (I('request.api_ver') == 1) {
@ -1469,7 +1466,6 @@ class PayH5Controller extends BaseController{
$pay_conf['id'] = $pay_info['id']; $pay_conf['id'] = $pay_info['id'];
$pay_conf['merchant_id'] = $pay_info['id']; $pay_conf['merchant_id'] = $pay_info['id'];
$pay_conf['merchant_way'] = self::WX_PAY; $pay_conf['merchant_way'] = self::WX_PAY;
$pay_conf['main_id'] = $pay_info['main_id'];
//0 官方 1威富通 2俊付通 //0 官方 1威富通 2俊付通
// if (get_wx_pay_type() == 0) { // if (get_wx_pay_type() == 0) {
@ -1484,7 +1480,7 @@ class PayH5Controller extends BaseController{
$request['pay_url'] = $json_data['url'] . "&tx_client=hideopen"; $request['pay_url'] = $json_data['url'] . "&tx_client=hideopen";
$request['merchant_id'] = $pay_info['id']; $request['merchant_id'] = $pay_info['id'];
$request['merchant_way'] = self::WX_PAY; $request['merchant_way'] = self::WX_PAY;
$pay_conf['main_id'] = $pay_info['main_id']; $request['main_id'] = $pay_conf['main_id'];
$this->add_spend($request,1); $this->add_spend($request,1);
} }

Write Preview
Loading…
Cancel
Save