From 58db956b157ac964ffa29a9be6370b7d1119eb2c Mon Sep 17 00:00:00 2001 From: chenzhi <“chenzhi063@qq.com> Date: Wed, 6 Nov 2019 18:32:46 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E8=BE=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Sdk/View/default/UserH/platform_pay_show.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Sdk/View/default/UserH/platform_pay_show.html b/Application/Sdk/View/default/UserH/platform_pay_show.html index b2026247..19e926c5 100644 --- a/Application/Sdk/View/default/UserH/platform_pay_show.html +++ b/Application/Sdk/View/default/UserH/platform_pay_show.html @@ -49,7 +49,7 @@
- +
From 0837f66f1caf93be07e5349d8a600ec7f45c9cdf Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Wed, 6 Nov 2019 19:21:02 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=BC=82=E5=B8=B8=20=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=85=85=E5=80=BC=E6=94=AF=E4=BB=98=E5=AE=9D=E4=B8=8D=E6=94=AF?= =?UTF-8?q?=E4=BB=98=20=20=E7=84=B6=E5=90=8E=E9=87=8D=E6=96=B0=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E4=B8=80=E7=AC=94=E8=AE=A2=E5=8D=95=E6=94=AF=E4=BB=98?= =?UTF-8?q?=20=20=E5=9C=A8=E5=9B=9E=E5=88=B0=E6=94=AF=E4=BB=98=E5=AE=9D?= =?UTF-8?q?=E6=89=BE=E6=9C=AA=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95=E6=94=AF?= =?UTF-8?q?=E4=BB=98=20=20=E8=BF=99=E7=A7=8D=E6=83=85=E5=86=B5=20=E5=8A=A0?= =?UTF-8?q?=E5=88=B0=E5=B9=B3=E5=8F=B0=E5=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/BaseController.class.php | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/Application/Callback/Controller/BaseController.class.php b/Application/Callback/Controller/BaseController.class.php index da186ceb..91b16c6f 100644 --- a/Application/Callback/Controller/BaseController.class.php +++ b/Application/Callback/Controller/BaseController.class.php @@ -107,8 +107,34 @@ class BaseController extends Controller { 'id' => $d['user_id'], ))->getField('balance'); - if ($balance < $mbalance) { // 异常 - $this->record_logs($mbalance."平台币余额不足".$balance);return false; + if ($balance < $mbalance) { // 异常 用户充值支付宝不支付 然后重新发起一笔订单支付 在回到支付宝找未支付订单支付 这种情况 加到平台币 + $this->record_logs($mbalance."平台币余额不足--》用户充值支付宝不支付 然后重新发起一笔订单支付 在回到支付宝找未支付订单支付 这种情况 加到平台币".$balance); + + $depositId = M('deposit',"tab_")->add([ + 'order_number' => $data['trade_no'], + 'pay_order_number' => 'PF_'.$data['out_trade_no'], + 'user_id' => $d['user_id'], + 'user_account' => $d['user_account'], + 'promote_id' => $d['promote_id'], + 'promote_account' => $d['promote_account'], + 'pay_amount' => $d['pay_amount'], + 'pay_status' => 1, + 'pay_way' => $d['pay_way'], + 'pay_source' => 2, // 0官网 1推广后台 2移动端 + 'pay_ip' => $d['spend_ip'], + 'create_time' => time(), + 'sdk_version' => $d['sdk_version'], + 'check_sign' => get_check_sign($d['user_id'],$data['trade_no'],$d['pay_amount'],$d['create_time']), + ]); + $user = M("user","tab_"); + $user->where("id=".$d['user_id'])->setInc("balance", $d['pay_amount']); + $user->where("id=".$d['user_id'])->setInc("cumulative", $d['pay_amount']); + //APP邀请好友消费奖励平台币 + $this->inviteFriendAward($d['user_id'], $d['pay_amount'], 'PF_'.$data['out_trade_no']); + //充值奖励积分 + $this->rechargeAwardPoint($d['user_id'],$d['pay_amount']); + + return false; } M('user', 'tab_')->where(array( 'id' => $d['user_id'] From 97de4d6223842357baf1cdf778b16353df498805 Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Wed, 6 Nov 2019 19:30:49 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=BC=82=E5=B8=B8=20=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=85=85=E5=80=BC=E6=94=AF=E4=BB=98=E5=AE=9D=E4=B8=8D=E6=94=AF?= =?UTF-8?q?=E4=BB=98=20=20=E7=84=B6=E5=90=8E=E9=87=8D=E6=96=B0=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E4=B8=80=E7=AC=94=E8=AE=A2=E5=8D=95=E6=94=AF=E4=BB=98?= =?UTF-8?q?=20=20=E5=9C=A8=E5=9B=9E=E5=88=B0=E6=94=AF=E4=BB=98=E5=AE=9D?= =?UTF-8?q?=E6=89=BE=E6=9C=AA=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95=E6=94=AF?= =?UTF-8?q?=E4=BB=98=20=20=E8=BF=99=E7=A7=8D=E6=83=85=E5=86=B5=20=E5=8A=A0?= =?UTF-8?q?=E5=88=B0=E5=B9=B3=E5=8F=B0=E5=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Callback/Controller/BaseController.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Callback/Controller/BaseController.class.php b/Application/Callback/Controller/BaseController.class.php index 91b16c6f..42ca8b1d 100644 --- a/Application/Callback/Controller/BaseController.class.php +++ b/Application/Callback/Controller/BaseController.class.php @@ -130,9 +130,9 @@ class BaseController extends Controller { $user->where("id=".$d['user_id'])->setInc("balance", $d['pay_amount']); $user->where("id=".$d['user_id'])->setInc("cumulative", $d['pay_amount']); //APP邀请好友消费奖励平台币 - $this->inviteFriendAward($d['user_id'], $d['pay_amount'], 'PF_'.$data['out_trade_no']); + // $this->inviteFriendAward($d['user_id'], $d['pay_amount'], 'PF_'.$data['out_trade_no']); //充值奖励积分 - $this->rechargeAwardPoint($d['user_id'],$d['pay_amount']); + // $this->rechargeAwardPoint($d['user_id'],$d['pay_amount']); return false; } From e7fad79a83e4b0486b40ef7ec0dca1aa5bb3a431 Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Wed, 6 Nov 2019 19:32:06 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=BC=82=E5=B8=B8=20=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=85=85=E5=80=BC=E6=94=AF=E4=BB=98=E5=AE=9D=E4=B8=8D=E6=94=AF?= =?UTF-8?q?=E4=BB=98=20=20=E7=84=B6=E5=90=8E=E9=87=8D=E6=96=B0=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E4=B8=80=E7=AC=94=E8=AE=A2=E5=8D=95=E6=94=AF=E4=BB=98?= =?UTF-8?q?=20=20=E5=9C=A8=E5=9B=9E=E5=88=B0=E6=94=AF=E4=BB=98=E5=AE=9D?= =?UTF-8?q?=E6=89=BE=E6=9C=AA=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95=E6=94=AF?= =?UTF-8?q?=E4=BB=98=20=20=E8=BF=99=E7=A7=8D=E6=83=85=E5=86=B5=20=E5=8A=A0?= =?UTF-8?q?=E5=88=B0=E5=B9=B3=E5=8F=B0=E5=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Callback/Controller/BaseController.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Callback/Controller/BaseController.class.php b/Application/Callback/Controller/BaseController.class.php index 42ca8b1d..91b16c6f 100644 --- a/Application/Callback/Controller/BaseController.class.php +++ b/Application/Callback/Controller/BaseController.class.php @@ -130,9 +130,9 @@ class BaseController extends Controller { $user->where("id=".$d['user_id'])->setInc("balance", $d['pay_amount']); $user->where("id=".$d['user_id'])->setInc("cumulative", $d['pay_amount']); //APP邀请好友消费奖励平台币 - // $this->inviteFriendAward($d['user_id'], $d['pay_amount'], 'PF_'.$data['out_trade_no']); + $this->inviteFriendAward($d['user_id'], $d['pay_amount'], 'PF_'.$data['out_trade_no']); //充值奖励积分 - // $this->rechargeAwardPoint($d['user_id'],$d['pay_amount']); + $this->rechargeAwardPoint($d['user_id'],$d['pay_amount']); return false; } From b05ba0d57f6a251cdb011c87208f6e6e9eb9e4b5 Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Thu, 7 Nov 2019 10:45:33 +0800 Subject: [PATCH 5/9] alipay app --- Application/Sdk/Controller/PayH5Controller.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Sdk/Controller/PayH5Controller.class.php b/Application/Sdk/Controller/PayH5Controller.class.php index 1ebc32fb..b7eddf3e 100644 --- a/Application/Sdk/Controller/PayH5Controller.class.php +++ b/Application/Sdk/Controller/PayH5Controller.class.php @@ -352,7 +352,7 @@ class PayH5Controller extends BaseController{ 'game_id' => $request['game_id'], 'pay_order_number' => $orderno ])->save([ - 'pay_url' => $request['pay_url'] + 'pay_url' => $request['pay_url']."?tx_client=hideopen" ]); }elseif(get_zfb_type() == 2) { // 双乾 From c66bd8ddce221a047b43a2e0029e3511116f8807 Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Thu, 7 Nov 2019 10:49:27 +0800 Subject: [PATCH 6/9] alipay web --- Application/Sdk/Controller/PayH5Controller.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Sdk/Controller/PayH5Controller.class.php b/Application/Sdk/Controller/PayH5Controller.class.php index b7eddf3e..09f53da2 100644 --- a/Application/Sdk/Controller/PayH5Controller.class.php +++ b/Application/Sdk/Controller/PayH5Controller.class.php @@ -326,7 +326,7 @@ class PayH5Controller extends BaseController{ //$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']; + $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; @@ -352,7 +352,7 @@ class PayH5Controller extends BaseController{ 'game_id' => $request['game_id'], 'pay_order_number' => $orderno ])->save([ - 'pay_url' => $request['pay_url']."?tx_client=hideopen" + 'pay_url' => $request['pay_url'] ]); }elseif(get_zfb_type() == 2) { // 双乾 From dc1c073141113cc5c631b360160da7af474e9118 Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Thu, 7 Nov 2019 10:50:28 +0800 Subject: [PATCH 7/9] alipay web --- Application/Sdk/Controller/PayH5Controller.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Sdk/Controller/PayH5Controller.class.php b/Application/Sdk/Controller/PayH5Controller.class.php index 09f53da2..a8577f44 100644 --- a/Application/Sdk/Controller/PayH5Controller.class.php +++ b/Application/Sdk/Controller/PayH5Controller.class.php @@ -326,7 +326,7 @@ class PayH5Controller extends BaseController{ //$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"; + $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; From 6aa58a17d1c883b29c02428792711e8688f2853e Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Thu, 7 Nov 2019 14:42:49 +0800 Subject: [PATCH 8/9] alipay web --- Application/Sdk/Controller/PayH5Controller.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Sdk/Controller/PayH5Controller.class.php b/Application/Sdk/Controller/PayH5Controller.class.php index a8577f44..c718e555 100644 --- a/Application/Sdk/Controller/PayH5Controller.class.php +++ b/Application/Sdk/Controller/PayH5Controller.class.php @@ -68,7 +68,7 @@ class PayH5Controller extends BaseController{ //$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']; + $request['pay_url'] = $pay_url['url']."&tx_client=hideopen";; $orderno = $pay_url['out_trade_no']; //echo $pay_url['url'];die; // redirect($pay_url['url']); From d2c82398c0f640e4b413ebf443639f3f62f9a891 Mon Sep 17 00:00:00 2001 From: chenzhi <“chenzhi063@qq.com> Date: Thu, 7 Nov 2019 15:54:42 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=98=BE=E7=A4=BA=E6=9D=83=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sdk/View/default/Spend/pay_way.html | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/Application/Sdk/View/default/Spend/pay_way.html b/Application/Sdk/View/default/Spend/pay_way.html index d7e381f2..12a91414 100644 --- a/Application/Sdk/View/default/Spend/pay_way.html +++ b/Application/Sdk/View/default/Spend/pay_way.html @@ -178,6 +178,17 @@ + + + +
+
+

微信支付

+

推荐微信用户使用

+
+ + +
@@ -197,28 +208,18 @@ - - - - - + - + @@ -279,10 +280,10 @@ $(function() { $(".paylist").show(); $(".showotherpay").show(); } - $(".showotherpay").on("click",function(){ - $("#wxpay").show(); - $(this).hide(); - }) + // $(".showotherpay").on("click",function(){ + // $("#wxpay").show(); + // $(this).hide(); + // }) $("#platform_pay").click(function() { var url = "{:U('PayH5/platform_coin_deduction',array('user_id'=>I('user_id'),'game_id'=>I('game_id'),'user_token'=>I('user_token')))}";