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 f094321314 7e515856a7
commit 3993bc8df3
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File

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

@ -74,7 +74,7 @@ class PayH5Controller extends BaseController{
exit; exit;
} }
$pay_conf = json_decode($pay_info['data']['config'], true); $pay_conf = json_decode($pay_info['data']['config'], true);
$main_id = $pay_info['main_id']; $main_id = $pay_info['data']['main_id'];
$pay_info = $pay_info['data']; $pay_info = $pay_info['data'];
$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'];
@ -365,11 +365,11 @@ class PayH5Controller extends BaseController{
$this->other_price($request); $this->other_price($request);
$pay_info = get_payment_config(self::ALI_PAY, $game, $request['user_id']); $pay_info = get_payment_config(self::ALI_PAY, $game, $request['user_id']);
$main_id = $pay_info['main_id'];
if ($pay_info['code'] != 0) { if ($pay_info['code'] != 0) {
echo json_encode(['code'=>1010,'msg'=> $pay_info['msg']]); echo json_encode(['code'=>1010,'msg'=> $pay_info['msg']]);
exit; exit;
} }
$main_id = $pay_info['data']['main_id'];
$pay_conf = json_decode($pay_info['data']['config'], true); $pay_conf = json_decode($pay_info['data']['config'], true);
$pay_info = $pay_info['data']; $pay_info = $pay_info['data'];
$pay_conf['id'] = $pay_info['id']; $pay_conf['id'] = $pay_info['id'];
@ -407,7 +407,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;
$request['main_id'] = $pay_conf['main_id']; $request['main_id'] = $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();
@ -465,7 +465,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;
$request['main_id'] = $pay_conf['main_id']; $request['main_id'] = $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) {
@ -745,7 +745,7 @@ class PayH5Controller extends BaseController{
exit; exit;
} }
$pay_conf = json_decode($pay_info['data']['config'], true); $pay_conf = json_decode($pay_info['data']['config'], true);
$main_id = $pay_conf['main_id']; $main_id = $pay_conf['data']['main_id'];
$pay_info = $pay_info['data']; $pay_info = $pay_info['data'];
$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'];
@ -763,7 +763,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;
$request['main_id'] = $pay_conf['main_id']; $request['main_id'] = $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) {
@ -1468,7 +1468,7 @@ class PayH5Controller extends BaseController{
exit; exit;
} }
$pay_conf = json_decode($pay_info['data']['config'], true); $pay_conf = json_decode($pay_info['data']['config'], true);
$main_id = $pay_conf['main_id']; $main_id = $pay_conf['data']['main_id'];
$pay_info = $pay_info['data']; $pay_info = $pay_info['data'];
$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'];
@ -1488,7 +1488,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;
$request['main_id'] = $pay_conf['main_id']; $request['main_id'] = $main_id;
$this->add_spend($request,1); $this->add_spend($request,1);
} }

2
Application/Sdk/Controller/ShortcutController.class.php
Unescape Escape View File

@ -591,7 +591,7 @@ class ShortcutController extends BaseController{
exit; exit;
} }
$pay_conf = json_decode($pay_info['data']['config'], true); $pay_conf = json_decode($pay_info['data']['config'], true);
$request['main_id'] = $pay_info['main_id']; $request['main_id'] = $pay_info['data']['main_id'];
$pay_info = $pay_info['data']; $pay_info = $pay_info['data'];
$pay_conf['id'] = $pay_info['id']; $pay_conf['id'] = $pay_info['id'];
$request['merchant_id'] = $pay_info['id']; $request['merchant_id'] = $pay_info['id'];

Write Preview
Loading…
Cancel
Save