Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev

Application/Admin/Controller/PayChannelController.class.php

@@ -810,7 +810,8 @@ class PayChannelController extends ThinkController
         if (!empty($_REQUEST['user_account'])) {
             $map['user_account'] = array('like',"{$_REQUEST['user_account']}%");
         }
-
+        $map['pay_status'] = $coinMap['tab_deposit.pay_status'] = 1;
+        $map['pay_way'] = array('egt',1);
         $model = $_REQUEST['model']?$_REQUEST['model']:'spend';
 
         $data = [];
@@ -833,6 +834,12 @@ class PayChannelController extends ThinkController
             }
 
             $coinMap = $map;
+            $coinMap['tab_deposit.pay_status'] = 1;
+            $coinMap['tab_deposit.pay_way'] = $map['pay_way'];
+
+            unset($coinMap['pay_status']);
+            unset($coinMap['pay_way']);
+
             if ($map['pay_time']) {
                 $coinMap['tab_deposit.create_time'] = $map['pay_time'];
                 unset($coinMap['pay_time']);
@@ -924,6 +931,9 @@ class PayChannelController extends ThinkController
                 $map['game_id'] = $_REQUEST['game_id'];
             }
 
+            $map['tab_game_supersign.pay_status'] = $map['pay_status'];
+            unset($map['pay_status']);
+
             $data = M('game_supersign','tab_')
                 ->field("order_id as pay_order_number,trade_id as order_number,account as user_account,pay_time,game_name,pay_price as cost,pay_price as pay_amount,pay_way as pay_type,pay_way")
                 ->join('inner join tab_test_white_list on tab_game_supersign.user_id=tab_test_white_list.user_id')
@@ -1099,6 +1109,8 @@ class PayChannelController extends ThinkController
             $map['user_account'] = array('like',"{$_REQUEST['user_account']}%");
         }
 
+        $map['pay_status'] = $coinMap['tab_deposit.pay_status'] = 1;
+        $map['pay_way'] = array('egt',1);
         $model = $_REQUEST['model']?$_REQUEST['model']:'spend';
 
         $data = [];
@@ -1141,6 +1153,13 @@ class PayChannelController extends ThinkController
 
 
             $coinMap = $map;
+
+            $coinMap['tab_deposit.pay_status'] = 1;
+            $coinMap['tab_deposit.pay_way'] = $map['pay_way'];
+
+            unset($coinMap['pay_status']);
+            unset($coinMap['pay_way']);
+
             if($map['pay_time']) {
                 $coinMap['tab_deposit.create_time'] = $map['pay_time'];
                 unset($coinMap['pay_time']);
@@ -1254,6 +1273,9 @@ class PayChannelController extends ThinkController
                 $map['game_id'] = $_REQUEST['game_id'];
             }
 
+            $map['tab_game_supersign.pay_status'] = $map['pay_status'];
+            unset($map['pay_status']);
+
             $accessNum = M('game_supersign','tab_')
                 ->field("order_id as pay_order_number,trade_id as order_number,account as user_account,pay_time,game_name,pay_price as cost,pay_price as pay_amount,pay_way as pay_type,pay_way")
                 ->join('inner join tab_test_white_list on tab_game_supersign.user_id=tab_test_white_list.user_id')

Application/Admin/View/PayChannel/index.html

@@ -169,10 +169,10 @@
 <!--                onclick="showWindow({$data.game_id})"-->
               {$data['pay_amount']}</td>
               <td >{$data['platform_coin']}</td>
-              <td ><a href="{:U('PayChannel/testDetail',array_merge(array('game_id'=>$data['game_id'],'game_name'=>$data['game_name']),I('get.')))}" style="display:block;">{$data['test_coin']}</a></td>
+              <td ><a href="{:U('PayChannel/testDetail',array_merge(array('game_id'=>$data['game_id'],'game_name'=>$data['game_name']),I('get.'),['p'=>1]))}" style="display:block;">{$data['test_coin']}</a></td>
               <td >{$data['sum']}</td>
               <td >
-                <a href="{:U('PayChannel/gameDetail',array_merge(array('game_id'=>$data['game_id'],'game_name'=>$data['game_name'].'游戏'),I('get.')))}" >订单查看</a>
+                <a href="{:U('PayChannel/gameDetail',array_merge(array('game_id'=>$data['game_id'],'game_name'=>$data['game_name'].'游戏'),I('get.'),['p'=>1]))}" >订单查看</a>
               </td>
             </tr>
           </volist>
@@ -180,20 +180,20 @@
             <td><span>超级签</span></td>
             <td ><span><if condition="$superSignData.pay_amount neq ''">{$superSignData['pay_amount']}<else/>0</if></span></td>
             <td>0</td>
-            <td><span><a href="{:U('PayChannel/testDetail',array_merge(array('model'=>'game_supersign','game_name'=>'超级签'),I('get.')))}" style="display:block;"><if condition="$superSignData.test_coin neq ''">{$superSignData.test_coin}<else/>0</if></a></span></td>
+            <td><span><a href="{:U('PayChannel/testDetail',array_merge(array('model'=>'game_supersign','game_name'=>'超级签'),I('get.'),['p'=>1]))}" style="display:block;"><if condition="$superSignData.test_coin neq ''">{$superSignData.test_coin}<else/>0</if></a></span></td>
             <td><if condition="$superSignData.pay_amount neq ''">{$superSignData['sum']}<else/>0</if></td>
             <td>
-              <a href="{:U('SuperStatistical/index',array_merge(array('model'=>'game_supersign','game_name'=>'超级签'),I('get.')))}" >订单查看</a>
+              <a href="{:U('SuperStatistical/index',array_merge(array('model'=>'game_supersign','game_name'=>'超级签'),I('get.'),['p'=>1]))}" >订单查看</a>
             </td>
           </tr>
           <tr>
             <td><span>官网</span></td>
             <td >{$offcialData['pay_amount']}</td>
             <td>0</td>
-            <td><a href="{:U('PayChannel/testDetail',array_merge(array('model'=>'deposit','game_name'=>'官网'),I('get.')))}" style="display:block;"><if condition="$offcialData.test_coin neq ''">{$offcialData.test_coin}<else/>0</if></a></td>
+            <td><a href="{:U('PayChannel/testDetail',array_merge(array('model'=>'deposit','game_name'=>'官网'),I('get.'),['p'=>1]))}" style="display:block;"><if condition="$offcialData.test_coin neq ''">{$offcialData.test_coin}<else/>0</if></a></td>
             <td><if condition="$offcialData.pay_amount neq ''">{$offcialData['sum']}<else/>0</if></td>
             <td>
-              <a href="{:U('PayChannel/gameDetail',array_merge(array('id'=>21,'model'=>'deposit','game_name'=>'官网'),I('get.')))}" >订单查看</a>
+              <a href="{:U('PayChannel/gameDetail',array_merge(array('id'=>21,'model'=>'deposit','game_name'=>'官网'),I('get.'),['p'=>1]))}" >订单查看</a>
             </td>
           </tr>
           <tr>
@@ -203,7 +203,7 @@
             <td>0</td>
             <td><if condition="$spreadData['pay_amount'] neq ''">{$spreadData['sum']}<else/>0</if></td>
             <td>
-              <a href="{:U('PayChannel/gameDetail',array_merge(array('id'=>21,'model'=>'coin_pay_order','game_name'=>'推广后台'),I('get.')))}" >订单查看</a>
+              <a href="{:U('PayChannel/gameDetail',array_merge(array('id'=>21,'model'=>'coin_pay_order','game_name'=>'推广后台'),I('get.'),['p'=>1]))}" >订单查看</a>
             </td>
           </tr>
           <tr>