解决冲突

5 years ago · 63f8e24208
parent 115ce7a35d cdb5e1e699
commit 63f8e24208
7 changed files with 74 additions and 59 deletions
--- a/Application/Home/Controller/ApplyController.class.php
+++ b/Application/Home/Controller/ApplyController.class.php
@ -1732,7 +1732,8 @@ class ApplyController extends BaseController
        $this->ajaxReturn(['status' => 1, 'data' => $enableStatus]);
    }

-    public function backDetailData() {                 //返回详情数据
+    public function backDetailData()
+    {                 //返回详情数据
        $result = ['code' => 10001, 'msg' => "该游戏信息不存在，请确认！", 'error' => 1, 'info' => ''];
        $id = $_POST['id'];
        if (empty($id)) {
--- a/Application/Home/Controller/HomeController.class.php
+++ b/Application/Home/Controller/HomeController.class.php
@ -117,15 +117,19 @@ class HomeController extends Controller
    {
        $gameData = M('Game', 'tab_')
            ->field('relation_game_id,sdk_version')
-            ->where(array('id' => $_GET['gid']))
+            ->where(array('id' => intval($_GET['gid'])))
            ->find();

        $RelationGameId = $gameData['relation_game_id'];
        $gameSdkType = $gameData['sdk_version'];

        $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.offline_status = 0 and ta.promote_id=' . $_GET['pid'])->select();
+        $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,ta.promote_id')
+            ->join('tab_apply ta ON ta.game_id = tab_game.id and ta.offline_status = 0 and ta.promote_id=' . intval($_GET['pid']))
+            ->where($map)
+            ->group('tab_game.id')
+            ->select();

        foreach ($data as $key => $value) {
            if (!empty($value['flooring_page_imgs'])) {
--- a/Application/Media/View/default/Public/base.html
+++ b/Application/Media/View/default/Public/base.html
@ -129,7 +129,6 @@

  </div>
 </div>
-</div>
 <div class="head">
  <div class="m1200">
    <a href="{:U('Index/index')}" class="logo">
@ -170,10 +169,11 @@
      <li>
        <a class="khd" target="_blank" href="{:U('Index/download')}" ><span>{:C('PC_NAVIGATION_CLIENT')?C('PC_NAVIGATION_CLIENT'):'客户端'}</span><i></i></a>
      </li>
-      </if>
+<!--      </if>-->
    </ul>
  </div>
 </div>
+
 <!-- 主体内容 -->
 <block name="body"></block>

@ -254,8 +254,6 @@
  </div>
 </div>-->

-</div>
-</div>
 <block name="giftextend"></block>
 <script>
 	
--- a/Application/Mobile/View/Public/bases.html
+++ b/Application/Mobile/View/Public/bases.html
@ -87,10 +87,10 @@
              }
          </style>
      <div class="foot-nav-list">
-        <!-- <a href="{:U('Index/index')}" class="<if condition='CONTROLLER_NAME eq Index' >on</if>">
+        <a href="{:U('Index/index')}" class="<if condition='CONTROLLER_NAME eq Index' >on</if>">
          <i class="iconfont icon-home"></i>
          <p>首页</p>
-        </a> -->
+        </a>
        <if condition="C('IS_OPEN_SMALL_ACCOUNT') neq 0">
        <a href="{:U('Trade/index')}" class="<if condition='CONTROLLER_NAME eq Trade'>on</if>">
          <i class="iconfont icon-trade"></i>
@ -113,20 +113,20 @@
          <i class="iconfont icon-shop"></i>
          <p>商城</p>
        </a>-->
-            <!-- <a href="{:U('Index/product')}" class="<if condition='CONTROLLER_NAME eq Gift'>on</if>">
+            <a href="{:U('Index/product')}" class="<if condition='CONTROLLER_NAME eq Gift'>on</if>">
                <i class="iconfont icon-gift"></i>
                <p>产品服务</p>
            </a>
            <a href="{:U('Index/business')}" class="<if condition='CONTROLLER_NAME eq Shop'>on</if>">
                <i class="iconfont icon-shop"></i>
                <p>商务合作</p>
-            </a> -->
+            </a>
         <!--<a href="{:U('News/index')}" class="<if condition='CONTROLLER_NAME eq News'>on</if>">
          <i class="iconfont icon-news"></i>
          <p>资讯</p>
         </a>-->
        </if>
-        <a style="width: 100%; margin-left: 0px;" href="{:U('User/index')}" class="<if condition='CONTROLLER_NAME eq User'>on</if>">
+        <a href="{:U('User/index')}" class="<if condition='CONTROLLER_NAME eq User'>on</if>">
          <i class="iconfont icon-user"></i>
          <p>我的</p>
        </a>
--- a/Application/Sdk/Controller/ExchangeController.class.php
+++ b/Application/Sdk/Controller/ExchangeController.class.php
@ -73,10 +73,7 @@ class ExchangeController extends BaseController{

            $request['spend_ip']   = get_client_ip();

-
            file_put_contents("./Application/Sdk/OrderNo/".$request['user_id']."-".$request['game_id'].".txt",think_encrypt(json_encode($request)));
-
-
            echo base64_encode(json_encode(array('status'=>200,'out_trade_no'=>$out_trade_no,'img'=>'http://' . $_SERVER ['HTTP_HOST'].'/sdk.php?s=/Spend/pay_way&user_id='.$request['user_id'].'&game_id='.$request['game_id'].'&type=1')));exit;

        } else {
@ -106,9 +103,9 @@ class ExchangeController extends BaseController{


                            file_put_contents("./Application/Sdk/OrderNo/".$request['user_id']."-".$request['game_id'].".txt",think_encrypt(json_encode($request)));
-
                            echo base64_encode(json_encode(array('status'=>200,'out_trade_no'=>$out_trade_no,'img'=>'http://' . $_SERVER ['HTTP_HOST'].'/sdk.php?s=/Spend/pay_way&user_id='.$request['user_id'].'&game_id='.$request['game_id'].'&type=1')));exit;

+
 			}elseif(!get_game_appstatus2($request['game_id'])&&$request['is_create_ordernumer']==1){ /* 苹果支付 */

 						#获取订单信息
--- a/Application/Sdk/Controller/WapPayController.class.php
+++ b/Application/Sdk/Controller/WapPayController.class.php
@ -41,7 +41,8 @@ class WapPayController extends BaseController{
            ->setGameId($param['game_id']) 
            ->setGameName(get_game_name($param['game_id'])) 
            ->setGameAppid($param['game_appid']) 
-            ->setServerId(0) 
+            ->setServerId($param['server_id']) 
+            ->setGamePlayerId($param['game_player_id'])
            ->setGameplayerName($param['game_player_name']) 
            ->setServerName($param['server_name']) 
            ->setUserId($param['user_id']) 
@ -634,8 +635,7 @@ class WapPayController extends BaseController{
                $json_data['status'] = 500; 
                $json_data['url']    = "http://" . $_SERVER['HTTP_HOST']; 
            } 
-                $json_data['cal_url']    = C("pay_header"); 
-
+                $json_data['cal_url']    = $_SERVER ['HTTP_HOST'];
                echo base64_encode(json_encode($json_data));exit;
                // $this->redirect('WapPay/weixin_pay_view',['user_id'=>$request['user_id'],'game_id'=>$request['game_id']]);
        } else if(get_wx_pay_type() == 1){  // 威富通
--- a/ThinkPHP/Library/Think/Pay/PayVo.class.php
+++ b/ThinkPHP/Library/Think/Pay/PayVo.class.php
@ -24,6 +24,7 @@ class PayVo {
    protected $_serverid;
    protected $_serverName;
    protected $_gameplayerName;
+    protected $_gameplayerId;
    protected $_userid;
    protected $_account;
    protected $_userNickName;
@ -60,6 +61,12 @@ class PayVo {
        return $this;
    }
    
+    // 设置游戏玩家ID
+    public function setGameplayerId($gameplayerId) {
+    	$this->_gameplayerId = $gameplayerId;
+    	return $this;
+    }
+
   //退款批次号
    public function setBatchNo($batchno) {
        $this->_batchno = $batchno;
@ -446,6 +453,14 @@ class PayVo {
        return $this->_gameid;
    }
    
+    /**
+     * 获取角色id
+     * @return type
+     */
+    public function getGameplayerId() {
+    	return $this->_gameplayerId;
+    }
+
    /**
     * 获取游戏名称
     * @return type