Merge branch 'release-1.0.0' into dev

Application/Admin/Controller/ExportController.class.php

@@ -2451,8 +2451,8 @@ class ExportController extends Controller
             ->select();
 //        dd($data);
         $map2 = array();
-        $map['fgame_id'] = array('egt', 0);
+        $map2['fgame_id'] = array('egt', 0);
-        $map['puid'] = 0;
+        $map2['puid'] = 0;
         setPowerPromoteIds($map2);
 
         $data2 = $user->field('fgame_id,count(IF(register_time ' . $today . ',1,null)) as today,

Application/Admin/Controller/FinanceController.class.php

@@ -1019,10 +1019,8 @@ class FinanceController extends ThinkController
             'pay_source' => 2,
             'tab_deposit.pay_status' => 1,
             'tab_deposit.pay_way' => ['gt', 0],
-            'extend'=>['eq','']
+            'tab_deposit.create_time'=>$time,
-            ,'tab_deposit.create_time'=>$time,
         ])->field('tab_deposit.pay_way,"" as pay_type, SUM(tab_deposit.pay_amount) AS balance')
-            ->join("inner join tab_pay_info on tab_pay_info.order_id=tab_deposit.pay_order_number")
             ->group('tab_deposit.pay_way')
             ->select();
         foreach ($deposit as $key => $value) {
@@ -1076,7 +1074,7 @@ class FinanceController extends ThinkController
                 $cashStatistics[$value['pay_way']]['pay_amount'] = '0.00';
                 $cashStatistics[$value['pay_way']]['balance'] = 0;//别表的平台币充值
             }
-            $cashStatistics[$value['pay_way']]['pay_amount'] += $value['pay_amount'];//别表的平台币充值
+            $cashStatistics[$value['pay_way']]['balance'] += $value['pay_amount'];//别表的平台币充值
         }
 
         //推广后台
@@ -1101,7 +1099,7 @@ class FinanceController extends ThinkController
                 $cashStatistics[$value['pay_way']]['pay_amount'] = '0.00';
                 $cashStatistics[$value['pay_way']]['balance'] = 0;//别表的平台币充值
             }
-            $cashStatistics[$value['pay_way']]['pay_amount'] += $value['pay_amount'];//别表的平台币充值
+            $cashStatistics[$value['pay_way']]['balance'] += $value['pay_amount'];//别表的平台币充值
         }
         //官网充值
         $offcialmap['pay_status'] = 1;
@@ -1131,7 +1129,7 @@ class FinanceController extends ThinkController
                 $cashStatistics[$value['pay_way']]['pay_amount'] = '0.00';
                 $cashStatistics[$value['pay_way']]['balance'] = 0;//别表的平台币充值
             }
-            $cashStatistics[$value['pay_way']]['pay_amount'] += $value['pay_amount'];//别表的平台币充值
+            $cashStatistics[$value['pay_way']]['balance'] += $value['pay_amount'];//别表的平台币充值
         }
 
         foreach ($cashStatistics as $key => $value) {

Application/Admin/Controller/PayChannelController.class.php

@@ -80,7 +80,6 @@ class PayChannelController extends ThinkController
             ->where($coinMap)
             ->sum('tab_deposit.pay_amount');
 //        var_dump($coinSum);die();
-        $this->assign('coinSum',$coinSum);
 
         $data = array_merge($data,$coinData);
         $data = $this->unique_multi_array($data,'game_id');
@@ -251,9 +250,9 @@ class PayChannelController extends ThinkController
         }
 
         //汇总数据
-        $sumData['pay_amount'] = $sumData['pay_amount'] + $superSignData['pay_amount'] +
+        $sumData['pay_amount'] = $sumData['pay_amount'] + $superSignData['pay_amount']  + $bindRechargeData['pay_amount'];
-            $offcialData['pay_amount'] + $bindRechargeData['pay_amount'] + $spreadData['pay_amount'];
+        $sumData['platform_coin'] = $sumData['platform_coin'] - $sumData['test_platform_coin'] +
-        $sumData['platform_coin'] = $sumData['platform_coin'] - $sumData['test_platform_coin'];
+            $offcialData['pay_amount'] + $spreadData['pay_amount'];
         $sumData['test_coin'] =  $sumData['test_coin']+$offcialTestCost+$testSuperSignCost+$sumData['test_platform_coin'];
         $sumData['sum'] = $sumData['pay_amount'] +$sumData['test_coin'] + $sumData['platform_coin'];
 
@@ -277,6 +276,8 @@ class PayChannelController extends ThinkController
                     $payTypeDataExport['pay_amount'] .= $key.'：'.$value."  ";
                 }
             }
+            $payTypeDataExport['pay_amount'] .= "平台币直充金额(2019.12.18号以前的不显示在列表中，此项也不计入充值方式统计)：".
+                ($coinSum + $offcialData['pay_amount'] + $spreadData['pay_amount']+$offcialTestCost);
 
             $channelDataExport['game_name'] = '支付渠道';
             foreach($channelData as $key => $value) {
@@ -295,6 +296,8 @@ class PayChannelController extends ThinkController
         $this->meta_title = "支付渠道统计";
         $size = $row;//每页显示的记录数
         $data = array_slice($data, ($arraypage - 1) * $size, $size);
+        //平台币直充金额，下面列表
+        $this->assign('coinSum',$coinSum + $offcialData['pay_amount'] + $spreadData['pay_amount']+$offcialTestCost);
 
         $this->assign('sumData',$sumData);
         $this->assign('channelData',$channelData);
@@ -438,6 +441,9 @@ class PayChannelController extends ThinkController
         $coinMap['tab_deposit.pay_way'] =$spreadMap['pay_way']=$map['pay_way'] = array('egt',1);
         $offcialmap['pay_way'] = array('egt',1);
         if (!empty($_REQUEST['pay_way']) || $_REQUEST['pay_way']=='0') {
+            if ($_REQUEST['pay_way']=="2") {
+                $_REQUEST['pay_way'] = ['in', '2,3,4'];
+            }
             $map['pay_way'] = $_REQUEST['pay_way'];
             $coinMap['tab_deposit.pay_way'] = $_REQUEST['pay_way'];
             $spreadMap['pay_way'] = $_REQUEST['pay_way'];
@@ -463,6 +469,7 @@ class PayChannelController extends ThinkController
 //        var_dump($spendData);die();
         $coinMap['pay_status'] = 1;
         $coinMap['pay_source'] = 2;
+        $coinMap['extend'] = '';
         $coinData = M('pay_info','tab_')
             ->join("inner join tab_deposit on tab_pay_info.order_id=tab_deposit.pay_order_number")
             ->field("pay_order_number,tab_deposit.create_time as pay_time,tab_deposit.user_account,tab_pay_info.game_name,tab_deposit.promote_account,
@@ -562,7 +569,11 @@ class PayChannelController extends ThinkController
 
         foreach ($sumData as $key => $value) {
             if ($value['pay_way']>=1) {
-                $sumAllData['pay_amount'] += $value['pay_amount'];
+                if($model == 'deposit'||$model == 'coin_pay_order') {
+                    $sumAllData['platform_amount'] += $value['pay_amount'];
+                } else {
+                    $sumAllData['pay_amount'] += $value['pay_amount'];
+                }
             }
         }
 
@@ -637,6 +648,9 @@ class PayChannelController extends ThinkController
             ->select(false);
 //        var_dump($spendData);die();
         $coinMap['pay_status'] = 1;
+        $coinMap['pay_source'] = 2;
+        $coinMap['extend'] = '';
+
         $coinData = M('pay_info','tab_')
             ->join("inner join tab_deposit on tab_pay_info.order_id=tab_deposit.pay_order_number")
             ->field("pay_order_number,tab_deposit.create_time as pay_time,tab_deposit.user_account,tab_pay_info.game_name,tab_deposit.promote_account,
@@ -765,7 +779,11 @@ class PayChannelController extends ThinkController
 
         foreach ($sumData as $key => $value) {
             if ($value['pay_way']>=1) {
-                $sumAllData['pay_amount'] += $value['pay_amount'];
+                if($model == 'deposit'||$model == 'coin_pay_order') {
+                    $sumAllData['platform_amount'] += $value['pay_amount'];
+                } else {
+                    $sumAllData['pay_amount'] += $value['pay_amount'];
+                }
             }
         }
 

Application/Admin/Controller/PlatformController.class.php

@@ -58,8 +58,8 @@ class PlatformController extends ThinkController
             ->select();
 //        dd($data);
         $map2 = array();
-        $map['fgame_id'] = array('egt', 0);
+        $map2['fgame_id'] = array('egt', 0);
-        $map['puid'] = 0;
+        $map2['puid'] = 0;
         setPowerPromoteIds($map2);
 
         $data2 = $user->field('fgame_id,count(IF(register_time ' . $today . ',1,null)) as today,

Application/Admin/Controller/ServerController.class.php

@@ -10,7 +10,12 @@ use Admin\Event\BatchImportExcelEvent;
 class ServerController extends ThinkController {
 	const model_name = 'Server';
 
-    public function lists(){
+    public function lists($p=0){
+        $page = intval($p);
+        $page = $page ? $page : 1; //默认显示第一页数据
+        $arraypage = $page; //默认显示第一页数据
+        if(isset($_REQUEST['row'])) {$row = $_REQUEST['row'];}else{$row = 10;}
+
         if(isset($_REQUEST['show_status'])){
             $extend['show_status']=$_REQUEST['show_status'];
             unset($_REQUEST['show_status']);
@@ -50,11 +55,19 @@ class ServerController extends ThinkController {
             $this->assign('show_status',1);
         }
 				
-				$this->m_title = '区服列表';
+        $this->m_title = '区服列表';
-				$this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Server/lists','status'=>1])->find());
+        $this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Server/lists','status'=>1])->find());
-				
 				
-    	parent::order_lists(self::model_name,$_GET["p"],$extend);
+       $data =  M("Server","tab_")->field("id,game_name,server_name,server_id,show_status,start_time,server_version,developers")->where($extend)->page($page,$row)->select();
+       foreach($data as $k=>&$v){
+            $v["start_time"] = set_show_time($v["start_time"]);
+            $v["server_version"] = get_systems_name($v["server_version"]);
+       }
+       $count = M("Server","tab_")->where($extend)->count("id");
+       $this->assign('list_data', $data);
+        $page = set_pagination($count,$row);
+        if($page) {$this->assign('_page', $page);}
+        $this->display();
     }
 
     public function add(){

Application/Admin/Controller/ServerNoticeController.class.php

@@ -225,7 +225,7 @@ class ServerNoticeController extends ThinkController {
 		
 		
 		
-		/**
+	/**
      * 区服状态修改
      * @author 鹿文学
      */
@@ -252,6 +252,36 @@ class ServerNoticeController extends ThinkController {
             $this->error($msg.'失败');
         }
     }
+    /***
+     * 获取区服列表
+     */
+    public function getGameServer()
+    {
+        $game_name = $_REQUEST['game_name'];
+        $sdk_version = $_REQUEST['sdk_version'];
+        $game_map = [];
+        if ($game_name) {
+            $game_map['relation_game_name'] = $game_name;
+        }else {
+            $this->AjaxReturn([]);
+        }
+        if ($sdk_version) {
+            $map['server_version'] = $game_map['sdk_version'] = $sdk_version;
+        }else {
+            $this->AjaxReturn([]);
+        }
+        $game = M("Game", 'tab_')->where($game_map)->getField('id', true);
+
+        // 获取版本信息
+        $map = [];
+        if ($game) {
+            $map['game_id'] = ['in', $game];
+        } else {
+            $map['game_id'] = ['in', [-1]];
+        }
+        $data = M('ServerNotice', 'tab_')->field('id, server_name, server_id')->where($map)->group('server_name')->select();
+        $this->AjaxReturn($data);
+    }
 		
 		
 		

Application/Admin/View/Finance/payTypeStatistics.html

@@ -86,11 +86,11 @@
 
       <div class="input-list">
         <input type="text" readonly id="time-start" name="timestart" class="" value="{$startDate}"
-               placeholder="开始时间"/>
+               placeholder="开始时间" autocomplete="off"/>
         -
         <div class="input-append date" id="datetimepicker" style="display:inline-block">
           <input type="text" readonly id="time-end" name="timeend" class="" value="{$endDate}"
-                 placeholder="结束时间"/>
+                 placeholder="结束时间" autocomplete="off"/>
           <span class="add-on"><i class="icon-th"></i></span>
         </div>
       </div>
@@ -139,7 +139,7 @@
         <notemtpy name = "data">
           <volist name="data" id="data">
             <tr>
-              <td ><if condition="$data.pay_type neq ''">{$data.pay_type}<else/>无</if></td>
+              <td ><if condition="$data.pay_type neq ''"><if condition="$data.pay_type eq '微信(扫码)'"> 微信<else/>{$data.pay_type}</if><else/>无</if></td>
               <td ><if condition="$data.pay_amount neq ''">{$data.pay_amount}<else/>无</if></td>
               <td ><if condition="$data.balance neq ''">{$data.balance}<else/>0</if></td>
               <td ><if condition="$data.total neq ''">{$data.total}<else/>0</if></td>

Application/Admin/View/PayChannel/gameDetail.html

@@ -62,30 +62,38 @@
 <!--      </div>-->
       <div class="input-list">
         <input type="text" readonly id="time-start" name="timestart" class="" value="{$startDate}"
-               placeholder="开始时间"/>
+               placeholder="开始时间" autocomplete="off"/>
         -
         <div class="input-append date" id="datetimepicker" style="display:inline-block">
           <input type="text" readonly id="time-end" name="timeend" class="" value="{$endDate}"
-                 placeholder="结束时间"/>
+                 placeholder="结束时间" autocomplete="off"/>
           <span class="add-on"><i class="icon-th"></i></span>
         </div>
       </div>
 
-      <div class="input-list input-list-server search_label_rehab">
+<!--      <div class="input-list input-list-server search_label_rehab">-->
-        <select id="pay_way" name="pay_way" class="select_gallery"  style="width:120px;">
+<!--        <select id="pay_way" name="pay_way" class="select_gallery"  style="width:120px;">-->
-          <option value="">请选择支付渠道</option>
+<!--          <option value="">请选择支付渠道</option>-->
-          <option value="1">支付宝</option>
+<!--          <option value="1">支付宝</option>-->
-          <option value="2">微信(扫码)</option>
+<!--          <option value="2">微信(扫码)</option>-->
-          <option value="3">微信app</option>
+<!--          <option value="3">微信app</option>-->
-          <option value="4">威富通</option>
+<!--          <option value="4">威富通</option>-->
-          <option value="5">聚宝云</option>
+<!--          <option value="5">聚宝云</option>-->
-          <option value="6">竣付通</option>
+<!--          <option value="6">竣付通</option>-->
-          <option value="7">金猪</option>
+<!--          <option value="7">金猪</option>-->
-          <option value="9">双乾支付-支付宝</option>
+<!--          <option value="9">双乾支付-支付宝</option>-->
-          <option value="10">双乾支付-银联</option>
+<!--          <option value="10">双乾支付-银联</option>-->
-          <option value="15">双乾支付-快捷</option>
+<!--          <option value="15">双乾支付-快捷</option>-->
-          <option value="0">平台币</option>
+<!--          <option value="0">平台币</option>-->
-          <option value="-1">绑币</option>
+<!--          <option value="-1">绑币</option>-->
+<!--        </select>-->
+<!--      </div>-->
+      <div class="input-list input-list-spend search_label_rehab">
+        <select id="pay_way_id" name="pay_way" class="select_gallery" style="width:120px;">
+          <option value="">充值方式</option>
+          <volist name=":cash_pay_way()" id="vo">
+            <option value="{$vo.key}">{$vo.value}</option>
+          </volist>
         </select>
       </div>
 

Application/Admin/View/PayChannel/index.html

@@ -107,10 +107,10 @@
       </div>
 
       <div class="input-list">
-        <input type="text" id="timestart" name="timestart" class="" value="{:I('timestart')}" placeholder="下单开始时间" />
+        <input type="text" id="timestart" name="timestart" class="" value="{:I('timestart')}" placeholder="下单开始时间" autocomplete="off"/>
         -
         <div class="input-append date" id="datetimepicker"  style="display:inline-block">
-          <input type="text" id="timeend" name="timeend" class="" value="{:I('timeend')}" placeholder="下单结束时间" />
+          <input type="text" id="timeend" name="timeend" class="" value="{:I('timeend')}" placeholder="下单结束时间" autocomplete="off"/>
           <span class="add-on"><i class="icon-th"></i></span>
         </div>
       </div>
@@ -188,8 +188,8 @@
           </tr>
           <tr>
             <td><span>官网</span></td>
-            <td >{$offcialData['pay_amount']}</td>
+            <td >0</td>
-            <td>0</td>
+            <td>{$offcialData['pay_amount']}</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>
@@ -198,8 +198,8 @@
           </tr>
           <tr>
             <td><span>推广后台</span></td>
-            <td ><span><if condition="$spreadData.pay_amount neq ''">{$spreadData['pay_amount']}<else/>0</if></span></td>
+            <td ><span>0</span></td>
-            <td>0</td>
+            <td>{$spreadData['pay_amount']}</td>
             <td>0</td>
             <td><if condition="$spreadData['pay_amount'] neq ''">{$spreadData['sum']}<else/>0</if></td>
             <td>

Application/Admin/View/PayChannel/testDetail.html

@@ -67,11 +67,11 @@
 <!--      </div>-->
       <div class="input-list">
         <input type="text" readonly id="time-start" name="timestart" class="" value="{$startDate}"
-               placeholder="开始时间"/>
+               placeholder="开始时间" autocomplete="off"/>
         -
         <div class="input-append date" id="datetimepicker" style="display:inline-block">
           <input type="text" readonly id="time-end" name="timeend" class="" value="{$endDate}"
-                 placeholder="结束时间"/>
+                 placeholder="结束时间" autocomplete="off"/>
           <span class="add-on"><i class="icon-th"></i></span>
         </div>
       </div>

Application/Admin/View/Server/lists.html

@@ -45,14 +45,14 @@
     
     <div class="cf top_nav_list">
         <div class="fl button_list">
-        
+            <!-- 隐藏操作 -->
-            <div class="tools">
+            <!-- <div class="tools">
                 <empty name="show_status">
                 <a class=" " href="{:U('add?model='.$model['id'])}"><span class="button_icon button_icon1"></span>新增</a>
                 <a class=" " href="{:U('batch?model='.$model['id'])}"><span class="button_icon button_icon1"></span>批量添加</a>
                 </empty>
                 <a class=" ajax-post confirm " target-form="ids" url="{:U('del?model='.$model['id'])}"><span class="button_icon button_icon2"></span>删除</a>
-            </div>
+            </div> -->
         
         </div>
         <!-- 高级搜索 -->
@@ -126,10 +126,11 @@
                         </th>
                         <th>游戏名称</th>
                         <th>区服名称</th>
+                        <th>区服ID</th>
                         <th>运营平台</th>
                         <th>显示状态</th>
                         <th>开服时间</th>
-                        <th>操作</th>
+                        <!-- <th>操作</th> -->
                     </tr>
                 </thead>
 
@@ -143,27 +144,28 @@
                             <td><input class="ids" type="checkbox" value="{$data['id']}" name="ids[]"></td>
                             <td >{$data.game_name}</td>
                             <td >{$data.server_name}</td>
-                            <td >{:get_systems_name($data['server_version'])}</td>
+                            <td >{$data.server_id}</td>
+                            <td >{$data['server_version']}</td>
                             <td >
                                 <div class="display_status">
-																	<span class="display_butnbox">
+                                    <span class="display_butnbox">
-																	<eq name='data.show_status' value='1'>
+                                    <eq name='data.show_status' value='1'>
-																		<a href="{:U('change_status',array('field'=>'show_status','value'=>0,'ids'=>$data['id']))}" class="ajax-get ">
+                                        <a href="{:U('change_status',array('field'=>'show_status','value'=>0,'ids'=>$data['id']))}" class="ajax-get ">
-																				已开启<!--开启-->
+                                                已开启<!--开启-->
-																		</a>  
+                                        </a>  
-																	<else/> 
+                                    <else/> 
-																		<a href="{:U('change_status',array('field'=>'show_status','value'=>1,'ids'=>$data['id']))}" class="ajax-get " style="color:#ff0000">
+                                        <a href="{:U('change_status',array('field'=>'show_status','value'=>1,'ids'=>$data['id']))}" class="ajax-get " style="color:#ff0000">
-																				已关闭<!--关闭-->
+                                                已关闭<!--关闭-->
-																		</a> 
+                                        </a> 
-																	</eq>
+                                    </eq>
-																	</span>
+                                    </span>
-																</div>
+                                </div>
                             </td>
-                            <td >{:set_show_time($data['start_time'])}</td>
+                            <td >{$data['start_time']}</td>
-                            <td >
+                            <!-- <td >
                             <a href="{:U('edit',array('model'=>$model['id'],'id'=>$data['id']))}">编辑</a>
                             <a class="ajax-get confirm " href="{:U('del',array('model'=>$model['id'],'ids'=>$data['id']))}">删除</a>
-                            </td>
+                            </td> -->
                         </tr>
                     </volist>
                     </empty>
@@ -258,7 +260,7 @@ $(".select_gallery").select2();
 </script>
 <script type="text/javascript">
 //导航高亮
-highlight_subnav('{:U('Server/lists')}');
+highlight_subnav("{:U('Server/lists')}");
 $(function(){
     //搜索功能
     $("#search").click(function(){

Application/Admin/View/ServerNotice/lists.html

@@ -334,7 +334,7 @@ $(function(){
      var game_server = "{:I('server_name')}";
      $("#game_name").change(function(){
          $.ajax({
-             url:"{:U('Ajax/getGmeServer')}",
+             url:"{:U('getGameServer')}",
              type:"post",
              data:{sdk_version:$("#server_version option:selected").val(), game_name:$("#game_name option:selected").val()},
              dataType:'json',