diff --git a/Application/Callback/Controller/NotifyController.class.php b/Application/Callback/Controller/NotifyController.class.php index 91cf20a8c..f14c0c15e 100644 --- a/Application/Callback/Controller/NotifyController.class.php +++ b/Application/Callback/Controller/NotifyController.class.php @@ -6,6 +6,7 @@ use Org\UcenterSDK\Ucservice; use Org\SwiftpassSDK\Swiftpass; use Think\Log; use Qiniu\json_decode; +use Sdk\Controller\Ipa365Controller; /** @@ -455,6 +456,12 @@ class NotifyController extends BaseController case 'AG': $result = $this->set_agent($order_info); break; + case 'SS': // 超级签 + $ipa365 = new Ipa365Controller(); + $result = $ipa365->pay_notify(array( + 'trade_id' => $orderNo, + 'order_id' => $billNo + )); default: exit('accident order data'); break; diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php index f958f5fb0..5429d7048 100644 --- a/Application/Home/Controller/HomeController.class.php +++ b/Application/Home/Controller/HomeController.class.php @@ -96,7 +96,8 @@ class HomeController extends Controller public function promitionofregestion() { - $map['tab_game.relation_game_id'] = $_GET['gid']; + $RelationGameId = M('Game', 'tab_')->where(array('id' => $_GET['gid']))->getField('relation_game_id'); + $map['tab_game.relation_game_id'] = $RelationGameId; $map['ta.promote_id'] = $_GET['pid']; $data = M('game', 'tab_')->field('tab_game.id,tab_game.sdk_version,tab_game.icon,tab_game.screenshot,tab_game.relation_game_id,tab_game.relation_game_name,ta.enable_status,tab_game.dow_status,tab_game.features,tab_game.flooring_page_imgs')->where($map)->join('tab_apply ta ON ta.game_id = tab_game.id and ta.promote_id=' . $_GET['pid'])->select(); diff --git a/Application/Home/View/default/Apply/my_game.html b/Application/Home/View/default/Apply/my_game.html index 4cc4d3676..f0631bfb5 100644 --- a/Application/Home/View/default/Apply/my_game.html +++ b/Application/Home/View/default/Apply/my_game.html @@ -243,7 +243,7 @@ 复制下载链接 - $vo['relation_game_id'],'pid'=>$vo['promote_id']));?> + $vo['id'],'pid'=>$vo['promote_id']));?> 落地页链接 下架 diff --git a/Application/Mobile/Controller/SsgController.class.php b/Application/Mobile/Controller/SsgController.class.php index e2f3ed945..5de96d6cd 100644 --- a/Application/Mobile/Controller/SsgController.class.php +++ b/Application/Mobile/Controller/SsgController.class.php @@ -20,6 +20,10 @@ class SsgController extends BaseController { public function login(){ + $user = session("user_auth"); + if ($user) { + redirect(U("ssg/index")); + } $this->display(); } @@ -56,6 +60,7 @@ class SsgController extends BaseController { $res_msg = "未知错误"; } } + $_SESSION['user_id'] = $user_id; $this->ajaxReturn(array("ErrorCode"=>$res_code,"ResultMsg"=>$res_msg),'JSON'); } @@ -80,16 +85,32 @@ class SsgController extends BaseController { //首页 public function index(){ - $map['user_id']= 24; - $map['sdk_version'] = 2; - $game_list = M("user_play","tab_")->where($map)->select(); + $user = session("user_auth"); + if (!$user) { + redirect(U("ssg/login")); + //$this->error("请登入", U('ssg/login')); + } + $map['a.user_id']= $user['user_id']; + $map['a.sdk_version'] = 2; + $game_list = M("user_play a","tab_")->field("b.*,b.id as game_id")->join("tab_game b on a.game_id=b.id")->where($map)->select(); $this->assign("data_list",$game_list); $this->display(); } public function order(){ - $order_list = M("game_supersign","tab_")->where('user_id=24')->order("id")->select(); - $this->assign("data_list",$order_list); + //.echo md5(sha1('123456') . 'UmtW6-Z(S^8xvwDn;B:J{X7FG9z2+Np.|C#~QRY"');exit(); + $user = session("user_auth"); + if (!$user) { + redirect(U("ssg/login")); + //$this->error("请登入", U('ssg/login')); + } + + + $order_list = M("game_supersign a","tab_")->field("a.order_id, b.game_name, b.icon, b.id as game_id, a.pay_status, a.user_id")->join("tab_game b on a.game_id=b.id")->where(array( + 'a.user_id' => $user['user_id'], + ))->order("a.id")->select(); +// pp($order_list); + $this->assign("data_list", $order_list); $this->display(); } @@ -112,4 +133,12 @@ class SsgController extends BaseController { public function rule(){ $this->display(); } + + // 支付页面 + public function alipay($data) { + $this->assign("url", $data['url']); + $this->assign("price", $data['price']); + + $this->display(); + } } diff --git a/Application/Mobile/View/Ssg/alipay.html b/Application/Mobile/View/Ssg/alipay.html index 801513400..5be8a5a35 100644 --- a/Application/Mobile/View/Ssg/alipay.html +++ b/Application/Mobile/View/Ssg/alipay.html @@ -30,14 +30,14 @@
超级签购买
订单描述：
-
应付金额：10.00
+
应付金额：{$price}
请选择付款方式：
- 10.00元 + {$price}元
- 10.00元 + {$price}元
支付宝 @@ -82,7 +82,7 @@
-

福建云峰网络科技有限公司 版权所有 ©2016 支付中心

+

版权所有 ©2016 支付中心

diff --git a/Application/Mobile/View/Ssg/help.html b/Application/Mobile/View/Ssg/help.html index d20825ab0..fabf7dcc1 100644 --- a/Application/Mobile/View/Ssg/help.html +++ b/Application/Mobile/View/Ssg/help.html @@ -12,7 +12,7 @@
- 充值帮助 + 充值帮助