From fb570e56359ea47078da4a7b7e372e6b4b75e6b0 Mon Sep 17 00:00:00 2001
From: tpingzhang <635929049@qq.com>
Date: Fri, 1 Nov 2019 10:42:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=B8=81=E4=BC=98=E5=85=88?=
=?UTF-8?q?=E6=8A=B5=E6=89=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Application/Sdk/Controller/BaseController.class.php | 8 ++++----
Application/Sdk/Controller/SpendController.class.php | 3 +--
Application/Sdk/View/default/Spend/pay_way.html | 2 +-
Application/Sdk/View/default/Spend/paycallback.html | 4 ++--
4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/Application/Sdk/Controller/BaseController.class.php b/Application/Sdk/Controller/BaseController.class.php
index 517470dd..8af0c5c2 100644
--- a/Application/Sdk/Controller/BaseController.class.php
+++ b/Application/Sdk/Controller/BaseController.class.php
@@ -11,15 +11,16 @@ class BaseController extends RestController{
'Apple.apple_platform_pay','Spend.notice','Apple.apple_union_pay','WapPay.wap_shortcut_pay',
'WapPay.shortcut_pay','WapPay.android_shortcut_pay','WapPay.wap_shortcut_pay','WapPay.wap_shortcut_pay',
'Apple.apple_weixin_pay','Ipa365','User.user_login','platform_coin_deduction','get_user_money',
- 'file_pay','pay','GameGiftPage','UserH', 'PayH5',
-// 'test','Game.get_suspend'
+ 'file_pay','pay','GameGiftPage','UserH', 'PayH5','init_sdk',
+// 'test','Game.get_suspend',
];
// 不需要验证TOKEN的接口
protected $noNeedToken = [
'Changyan', 'Exchange', 'FengHuoApi', 'File', 'Game', 'GameGift', 'GameNotify', 'Info', 'ios-wap-Pay',
'Jpush', 'LoginNotify', 'Notice', 'OA', 'OTP', 'OTPServer', 'Pay', 'Payios', 'PointShop', 'Spend',
- 'User', 'WapPay', 'Wechat', 'XinJiApi', 'Notice', 'test'
+ 'User', 'WapPay', 'Wechat', 'XinJiApi', 'Notice', 'init_sdk',
+// 'test',
];
protected $userId;
protected $userToken;
@@ -762,7 +763,6 @@ class BaseController extends RestController{
* $request $discountAmount 折扣价格
*/
public function other_price(&$request, $discountAmount=0) {
- return $request;
// 优先扣除绑定币平台币
if ($request['code'] == '0') return $request; // 平台币充值 不做判断
$deductionAmount = 0;
diff --git a/Application/Sdk/Controller/SpendController.class.php b/Application/Sdk/Controller/SpendController.class.php
index 76fa2eee..13b60ba9 100644
--- a/Application/Sdk/Controller/SpendController.class.php
+++ b/Application/Sdk/Controller/SpendController.class.php
@@ -81,12 +81,11 @@ class SpendController extends Controller {
$this->assign ( 'data', $data );
$this->assign ( 'btncolor', $request ['btncolor'] );
if ($balance + $bind_balance > $data['price']) {
- $this->assign ('pay_price', $data['price']); // 是否第三方支付
+ $this->assign ('pay_price', 0); // 是否第三方支付
} else {
$payPrice = $data['price'] - $balance - $bind_balance;
$this->assign ('pay_price', $payPrice ? $payPrice : 0);
}
- $this->assign ('pay_price', $data['price']);
/* $this->assign ( 'alipayurl', $ret[0]['payURL']);
header("Access-Control-Allow-Origin: *"); */
diff --git a/Application/Sdk/View/default/Spend/pay_way.html b/Application/Sdk/View/default/Spend/pay_way.html
index af9bf21c..4f98abf4 100644
--- a/Application/Sdk/View/default/Spend/pay_way.html
+++ b/Application/Sdk/View/default/Spend/pay_way.html
@@ -241,7 +241,7 @@ $(function() {
$(".paylist").show();
}
$("#platform_pay").click(function() {
- var url = "{:U('Apple/platform_coin_deduction',array('user_id'=>I('user_id'),'game_id'=>I('game_id')))}";
+ var url = "{:U('Apple/platform_coin_deduction',array('user_id'=>I('user_id'),'game_id'=>I('game_id'),'user_token'=>I('user_token')))}";
window.location.href = url;
});
diff --git a/Application/Sdk/View/default/Spend/paycallback.html b/Application/Sdk/View/default/Spend/paycallback.html
index f3e86287..7512d894 100644
--- a/Application/Sdk/View/default/Spend/paycallback.html
+++ b/Application/Sdk/View/default/Spend/paycallback.html
@@ -15,11 +15,11 @@
- 