Merge branch 'dev' of 47.111.118.107:/srv/git/sdk into dev

Application/Sdk/Controller/GameController.class.php

@@ -145,15 +145,14 @@ class GameController extends BaseController{
 	 */
 	public function get_suspend(){
         $data = json_decode(base64_decode(file_get_contents("php://input")), true);
-        
         if (!isset($data['api_ver']) || $data['api_ver'] != 2) {
         	$this->get_suspend_1();
         	return ;
         }
-		if (I('debug') == 1) {
+		// if (I('debug') == 1) {
-			$data['user_id'] = 1;
+		// 	$data['user_id'] = 1;
-			$data['sdk_version'] = 2;
+		// 	$data['sdk_version'] = 2;
-		}
+		// }
         
         if(empty($data['user_id'])) {
         	re_msg(1004, 'fail', '用户不存在');
@@ -191,8 +190,8 @@ class GameController extends BaseController{
             if ($data['sdk_version'] == 1 && $menus[$k]['name'] == 'suppersign'){
                 unset($menus[$k]);
             }elseif($data['sdk_version'] != 1 && $v['name'] == 'suppersign'){
-                $menus[$k]['url'] = C('H5_DOMAIN') . $v['url'] . '/user_token/' . $user['user_token'];
+                // $menus[$k]['url'] = $v['url'] . '/user_token/' . $user['user_token'] . "/game_id/". $data['game_id'];
-                $menus[$k]['ios_url'] = C('H5_DOMAIN') . $v['ios_url'] . '/user_token/' . $user['user_token'];
+                $menus[$k]['ios_url'] = $v['ios_url'] . '/user_token/' . $user['user_token'] . '.html?action=openurl';
             }elseif($v['name'] == 'balance'){
                 $str = urlencode("余额");
                 $menus[$k]['ios_url'] = C('H5_DOMAIN') . $v['ios_url'] . '/user_token/' . $user['user_token']."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version'].'/api_ver/2' . '?action=pay&nav_title=' . $str;
@@ -228,8 +227,8 @@ class GameController extends BaseController{
             if ($data['sdk_version'] == 1 && $personalMenu[$k]['name'] == 'suppersign'){
                 unset($personalMenu[$k]);
             }elseif($data['sdk_version'] != 1 && $v['name'] == 'suppersign'){
-                $personalMenu[$k]['url'] = C('H5_DOMAIN') . $v['url'] . 'user_token/' . $user['user_token'];
+                // $personalMenu[$k]['url'] = C('H5_DOMAIN') . $v['url'] . 'user_token/' . $user['user_token'];
-                $personalMenu[$k]['ios_url'] = C('H5_DOMAIN') . $v['ios_url'] . '/user_token/' . $user['user_token'];
+                $personalMenu[$k]['ios_url'] =  $v['ios_url'] . '/user_token/' . $user['user_token'] . '.html?action=openurl';
             }elseif($v['name'] == 'balance'){
                 $str = urlencode("余额");
                 $personalMenu[$k]['ios_url'] = C('H5_DOMAIN') . $v['ios_url'] . '/user_token/' . $user['user_token']."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version'].'/api_ver/2' . '?action=pay&nav_title=' . $str;
@@ -265,8 +264,8 @@ class GameController extends BaseController{
             'menus' => $menusArr,
             'mine_features' => $personalMenuArr,
         ];
-        if (I('debug') == 1)
+        // if (I('debug') == 1)
-        	pp(($ret));
+        // 	pp(($ret));
         re_msg(200,'获取成功',$ret);
     }
     

Application/Sdk/Controller/GameGiftController.class.php

@@ -14,6 +14,7 @@ class GameGiftController extends BaseController{
     	$gift = M("Giftbag","tab_");
         $map['game_id'] = $request['game_id'];
         $map['status']=1;
+        $map['giftbag_name'] = ['NEQ','超级签专属礼包'];
         $row = $request['row']?:10;
         $page = $request['p']?:1;
         switch ($request['sdk_version']) {

Application/Sdk/Controller/SpendController.class.php

@@ -293,7 +293,9 @@ ADD COLUMN `pay_url`  varchar(255) NOT NULL DEFAULT '' AFTER `check_sign`;
 		$userToken = I('user_token');
 		$orderno = $_GET['orderno'] == "" ? $_GET ['out_trade_no'] : $_GET ['orderno'];
 		$pay_where = substr($orderno, 0, 2);
-		$Scheme = file_get_contents("./Application/Sdk/Scheme/" . $_GET ['game_id'] . ".txt");
+		// $Scheme = file_get_contents("./Application/Sdk/Scheme/" . $_GET ['game_id'] . ".txt");
+		$gameId = $_GET ['game_id'];
+		$Scheme = "txgame".$gameId;
 		$map ['pay_order_number'] = $orderno;
 		$paytype = I('request.paytype', 0);  // 支付方式  weixinpay  alipay
 		$gopay = I('request.gopay');
@@ -354,6 +356,7 @@ ADD COLUMN `pay_url`  varchar(255) NOT NULL DEFAULT '' AFTER `check_sign`;
 		$this->assign ('Scheme', $Scheme);
 		$this->assign ('gopay', $gopay);
 		$this->assign ('user_token', $userToken);
+		$this->assign ('game_id', $gameId);
 		
 		$this->assign ('gopay_url', $gopayUrl);
 		$this->assign ('paystatus', $result ['pay_status']);
@@ -366,6 +369,7 @@ ADD COLUMN `pay_url`  varchar(255) NOT NULL DEFAULT '' AFTER `check_sign`;
 	public function order_status() {
 		$userToken = I('user_token');
 		$orderno = I('orderno');
+		$gameId = I('game_id');
 		$pay_where = substr ($orderno, 0, 2);
 		$payStatus = 0;
 		$table = "spend";
@@ -376,12 +380,14 @@ ADD COLUMN `pay_url`  varchar(255) NOT NULL DEFAULT '' AFTER `check_sign`;
 			$table = "deposit";
 		}
 		
-		$payStatus = M($table, "tab_")->where(['pay_order_number' => $orderno])->getField("pay_status");
+		$order = M($table, "tab_")->where(['pay_order_number' => $orderno])->find();
+		$payStatus = $order["pay_status"];
 		
 		echo json_encode([
 			'type' => $table,
 			'payStatus' => $payStatus?'1':'0',
-			'url' => "/sdk.php/userH/get_user_money/user_token/{$userToken}"
+			'game_id' => $gameId,
+			'url' => "/sdk.php/userH/get_user_money/user_token/{$userToken}/game_id/{$gameId}/sdk_version/{$order['sdk_version']}api_ver/2", //?action=pay&nav_title=%E4%BD%99%E9%A2%9D
 		]);
 		exit();
 	}

Application/Sdk/Controller/UserController.class.php

@@ -2115,10 +2115,23 @@ class UserController extends BaseController
                 $data['age_status'] = 3;  // 未成年
             }
         } else {
-            if(M('idcard', 'tab_')->where(['name' => $data['real_name'],'id_card' => $data['idcard']])->find()) {
+            // $model = M('idcard', 'tab_')->where(['name' => $data['real_name'],'id_card' => $data['idcard']])->find();
-                $data['age_status'] = is_adult($data['idcard']) ? 2 : 3;
+            // if(!empty($model)) {
-            } else {
+            //     if($model['status'] == 1) {
+            //         $data['age_status'] = is_adult($data['idcard']) ? 2 : 3;
+            //     } elseif ($model['status'] == 0) {
+            //         $this -> set_message(1069, "fail", "用户数据不匹配");
+            //     }
+            // } else {
+
                 $re = age_verify($data['idcard'], $data['real_name']);
+                // $arr['name'] = $data['real_name'];
+                // $arr['id_card'] = $data['idcard'];
+                // $arr['user_id'] = $user['user_id'];
+                // $arr['status'] = ($re == 1 || $re == 2 ) ? 1 : 0;
+                // $arr['ip'] = get_client_ip();
+                // $arr['create_time'] = time();
+                // M('idcard', 'tab_')->data($arr)->add();
                 switch ($re) {
 
                     case - 1:
@@ -2140,14 +2153,9 @@ class UserController extends BaseController
                     default:
 
                 }
-                if($re == 1 || $re == 2) {
+            // }
-                    $arr['name'] = $data['real_name'];
-                    $arr['id_card'] = $data['idcard'];
-                    M('idcard', 'tab_')->data($arr)->add();
-                }
-            }
-
         }
+
         $return = M('User', 'tab_') -> where($map) -> save($data);
         if ($return === false) {
             $this -> set_message(1070, "fail", "用户数据更新失败");

Application/Sdk/View/default/Spend/paycallback.html

@@ -19,6 +19,7 @@
 	<input type="hidden" name="aliapp" class="aliapp" value="{$aliapp}">
 	<input type="hidden" name="sqzfb" class="sqzfb" value="{$sqzfb}">
 	<input type="hidden" name="user_token" class="user_token" value="{$user_token}">
+	<input type="hidden" name="game_id" class="game_id" value="{$game_id}">
 	
         <!-- <div class="close" onclick="javascript:history.go(-1);">
             <a href="javascript:">
@@ -134,6 +135,7 @@ $(function() {
 		var device=$('.device').val();
 		var Scheme=$('.Scheme').val();
 		var user_token = $('.user_token').val();
+		var game_id = $('.game_id').val();
 		
 		$.ajax({
 			type: "post",
@@ -142,6 +144,7 @@ $(function() {
 			data: {
 				'orderno' : orderno,
 				'user_token' : user_token,
+				'game_id' : game_id,
 			},
 			success: function(r) {
 				var u = navigator.userAgent;

Data/update.sql

@@ -173,6 +173,10 @@ alter table `tab_giftbag` modify COLUMN `giftbag_version` tinyint(2) COMMENT '
 CREATE TABLE `tab_idcard` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `name` varchar(80) NOT NULL COMMENT '姓名',
-  `id_card` varchar(20) DEFAULT NULL COMMENT '身份证号码',
+  `id_card` varchar(20) NOT NULL COMMENT '身份证号码',
+  `user_id` int(11) NOT NULL COMMENT '用户id',
+  `ip` varchar(40) DEFAULT '0' COMMENT 'ip地址',
+  `status` tinyint(2) DEFAULT '0' COMMENT '0 认证失败 1 认证成功',
+  `create_time` int(11) DEFAULT '0' COMMENT '创建时间',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COMMENT='正确身份证信息';
+) ENGINE=MyISAM AUTO_INCREMENT=7 DEFAULT CHARSET=utf8 COMMENT='身份证认证信息';