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

Merge pull request 'feature/1228' (#7) from feature/1228 into master

Browse Source 
Reviewed-on: http://8.136.139.249:3000/wmtx/sdk/pulls/7
master
廖金灵 4 years ago
parent 5602c1bff6 14098abbc9
commit a8de224a1b
4 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File

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

@ -589,6 +589,7 @@ class BaseController extends RestController
$data_spned['merchant_id'] = isset($param['merchant_id']) ? $param['merchant_id'] : 0 ;
$data_spned['merchant_way'] = isset($param['merchant_way']) ? $param['merchant_way'] : 0;
$data_spned['partner_type'] = isset($param['main_id']) ? $param['main_id'] : 0;
return $data_spned;
}
@ -624,6 +625,7 @@ class BaseController extends RestController
$data_deposit['merchant_id'] = isset($param['merchant_id']) ? $param['merchant_id'] : 0 ;
$data_deposit['merchant_way'] = isset($param['merchant_way']) ? $param['merchant_way'] : 0;
$data_deposit['partner_type'] = isset($param['main_id']) ? $param['main_id'] : 0;
return $data_deposit;
}

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

@ -74,11 +74,13 @@ class PayH5Controller extends BaseController{
exit;
}
$pay_conf = json_decode($pay_info['data']['config'], true);
$main_id = $pay_info['data']['main_id'];
$pay_info = $pay_info['data'];
$pay_conf['id'] = $pay_info['id'];
$pay_conf['merchant_id'] = $pay_info['id'];
$pay_conf['merchant_way'] = self::ALI_PAY;
$pay_conf['main_id'] = $main_id;
if ($pay_info['channel'] == 1) { // 支付宝官方
$request['apitype'] = "alipay";
@ -112,6 +114,7 @@ class PayH5Controller extends BaseController{
$request['id'] = $pay_info['id'];
$request['merchant_id'] = $pay_info['id'];
$request['merchant_way'] = 1;
$request['main_id'] = $main_id;
$this->add_deposit($request, 1);
$sqpay=new Sqpay();
@ -366,11 +369,13 @@ class PayH5Controller extends BaseController{
echo json_encode(['code'=>1010,'msg'=> $pay_info['msg']]);
exit;
}
$main_id = $pay_info['data']['main_id'];
$pay_conf = json_decode($pay_info['data']['config'], true);
$pay_info = $pay_info['data'];
$pay_conf['id'] = $pay_info['id'];
$pay_conf['merchant_id'] = $pay_info['id'];
$pay_conf['merchant_way'] = self::ALI_PAY;
$pay_conf['main_id'] = $main_id;
if ($pay_info['channel'] == 1) { // 支付宝官方
// $game_set_data = get_game_set_info($request['game_id']);
$request['apitype'] = "alipay";
@ -402,6 +407,7 @@ class PayH5Controller extends BaseController{
$request['spend_ip'] = get_client_ip();
$request['merchant_id'] = $pay_info['id'];
$request['merchant_way'] = 1;
$request['main_id'] = $main_id;
if($request['code']==1){
$ordercheck = M("spend","tab_")->where(array('pay_order_number'=>$request["pay_order_number"]))->find();
@ -459,6 +465,7 @@ class PayH5Controller extends BaseController{
$request['spend_ip'] = get_client_ip();
$request['merchant_id'] = $pay_info['id'];
$request['merchant_way'] = 1;
$request['main_id'] = $main_id;
$ordercheck = M("spend","tab_")->where(array('pay_order_number'=>$request["pay_order_number"]))->find();
if ($ordercheck) {
@ -738,11 +745,13 @@ class PayH5Controller extends BaseController{
exit;
}
$pay_conf = json_decode($pay_info['data']['config'], true);
$main_id = $pay_info['data']['main_id'];
$pay_info = $pay_info['data'];
$pay_conf['id'] = $pay_info['id'];
$pay_conf['merchant_id'] = $pay_info['id'];
$pay_conf['merchant_way'] = self::WX_PAY;
$pay_conf['main_id'] = $main_id;
//0 官方 1威富通 2俊付通
// if (get_wx_pay_type() == 0) {
if ($pay_info['channel'] == 2) {
@ -754,6 +763,7 @@ class PayH5Controller extends BaseController{
$request['pay_url'] = $json_data['url']."&tx_client=hideopen";
$request['merchant_id'] = $pay_info['id'];
$request['merchant_way'] = self::WX_PAY;
$request['main_id'] = $main_id;
$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'] ;
/* if (I('request.api_ver') == 1) {
@ -1457,11 +1467,13 @@ class PayH5Controller extends BaseController{
echo json_encode(['code'=>1010,'msg'=> $pay_info['msg']]);
exit;
}
$main_id = $pay_info['data']['main_id'];
$pay_conf = json_decode($pay_info['data']['config'], true);
$pay_info = $pay_info['data'];
$pay_conf['id'] = $pay_info['id'];
$pay_conf['merchant_id'] = $pay_info['id'];
$pay_conf['merchant_way'] = self::WX_PAY;
$pay_conf['main_id'] = $main_id;
//0 官方 1威富通 2俊付通
// if (get_wx_pay_type() == 0) {
@ -1476,6 +1488,7 @@ class PayH5Controller extends BaseController{
$request['pay_url'] = $json_data['url'] . "&tx_client=hideopen";
$request['merchant_id'] = $pay_info['id'];
$request['merchant_way'] = self::WX_PAY;
$request['main_id'] = $main_id;
$this->add_spend($request,1);
}

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

@ -590,12 +590,13 @@ class ShortcutController extends BaseController{
echo json_encode(['code'=>1010,'msg'=> $pay_info['msg']]);
exit;
}
$request['main_id'] = $pay_info['data']['main_id'];
$pay_conf = json_decode($pay_info['data']['config'], true);
$pay_info = $pay_info['data'];
$pay_conf['id'] = $pay_info['id'];
$request['merchant_id'] = $pay_info['id'];
$request['merchant_way'] = PayH5Controller::EXPRESS_PAY;
$yeepay = new Yeepay();
$data['appKey'] = $pay_conf['key'];//C('yeepay.key');
$data['privateKey'] = $pay_conf['private_key'];//C('yeepay.private_key');

4
ThinkPHP/Library/Think/Pay.class.php
Unescape Escape View File

@ -406,6 +406,7 @@ class Pay
}
$spend_data['merchant_id'] = isset($payConf['merchant_id']) ? $payConf['merchant_id'] : 0;
$spend_data['merchant_way'] = isset($payConf['merchant_way']) ? $payConf['merchant_way'] : 0;
$spend_data['partner_type'] = isset($payConf['main_id']) ? $payConf['main_id'] : 0;
$result = $spend->add($spend_data);
return $result;
}
@ -448,7 +449,8 @@ class Pay
} */
$deposit_data['merchant_id'] = isset($payConf['merchant_id']) ? $payConf['merchant_id'] : 0;
$deposit_data['merchant_way'] = isset($payConf['merchant_way']) ? $payConf['merchant_way'] : 0;
$deposit_data['partner_type'] = isset($payConf['main_id']) ? $payConf['main_id'] : 0;
$result = $deposit->add($deposit_data);
return $result;
}

Write Preview
Loading…
Cancel
Save