Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0

Application/Admin/Controller/AjaxController.class.php

@@ -83,7 +83,7 @@ class AjaxController extends ThinkController{
         if ($sdk_version) {
             $map['server_version'] = $game_map['sdk_version'] = $sdk_version;
         }else {
-            $this->AjaxReturn([]);
+//            $this->AjaxReturn([]);
         }
         $game = M("Game", 'tab_')->where($game_map)->getField('id', true);
 

Application/Admin/Controller/ExportController.class.php

@@ -7208,7 +7208,7 @@ class ExportController extends Controller
             $map['_string'] .= " pay_time < {$timeend}";
         }
 
-        $map['pay_status'] = 1;
+        $map['pay_game_status'] = 1;
         if (!empty(I("game_id"))) {
             $map['game_id'] = I("game_id");
         }
@@ -7224,6 +7224,7 @@ class ExportController extends Controller
         $order = "pay_time DESC";
 
         $xlsData = D('spend')->getSpendData($map,$field,$group,$order);
+//        dd(D("spend")->_sql());
         foreach($xlsData as $key => $value) {
             $xlsData[$key]['pay_way'] = getPayType($value['pay_way']);
         }

Application/Admin/View/PayChannel/index.html

@@ -71,7 +71,7 @@
   <div class="cf main-place top_nav_list navtab_list">
 
     <h3 class="page_title">支付渠道统计</h3>
-    <p class="description_text"></p>
+    <p class="description_text">说明：平台币直充金额2019.12.18以前sdk新包数据及sdk旧包数据，无法对应相关游戏无法计入以上平台币列表中，<span style="color:red">充值方式统计</span>一栏统计<span style="color:red">平台币直充总金额</span></p>
     <div class="fr">
       <a class="tabchose" href="">游戏充值统计</a>
       <a class="" href="{:U('Finance/payTypeStatistics')}">充值方式统计</a>