Merge branch 'hotfix/finance_game_name_change_2' of wmtx/platform into release

支付渠道测试订单录入bug修正，支付意愿统计功能优化

Application/Admin/Controller/PayChannelController.class.php

@@ -358,7 +358,7 @@ class PayChannelController extends ThinkController
             $testOrderDataExport['sum'] = '0.00';
             $channelDataExport['game_name'] = '支付渠道';
             $channelDataExport2['game_name'] = '支付渠道占比';
-            foreach($channelData as $key => $value) {
+            foreach(array_merge($channelData,$testorderChannelArr) as $key => $value) {
                 if ($value) {
                     $channelDataExport['sdk_version'] .= $value['pay_way'].'：'.$value['pay_amount']."  ";
                     $channelDataExport2['sdk_version'] .= $value['pay_way'].'：'.round($value['pay_amount']*100/ $moneyAllCount,2)."%  ";

Application/Admin/Controller/PayChannelIntentionController.class.php

@@ -80,14 +80,14 @@ class PayChannelIntentionController extends AdminController
            count(if(pay_status=0,pay_amount,null)) fail_invest_count,
            count(if(pay_status=1,pay_amount,null)) success_invest_count,
            count(if(pay_status=2,pay_amount,null)) nothing_invest_count,create_time')
-//           ->where($map)
+           ->where($map)
            ->group('a.pay_ways,a.user_account,a.pay_status')
            ->select(false);
 
 //       dump($data);die();
        $count = M()->table('('.$data.') as a')
            ->field('pay_ways,sum(fail_invest_amount) fail_invest_amount')
-           ->where($map)
+//           ->where($map)
            ->group('a.pay_ways')
            ->select(false);
 //       dump($count);die();
@@ -227,7 +227,7 @@ class PayChannelIntentionController extends AdminController
            count(if(pay_status=0,pay_amount,null)) fail_invest_count,
            count(if(pay_status=1,pay_amount,null)) success_invest_count,
            count(if(pay_status=2,pay_amount,null)) nothing_invest_count,create_time')
-//           ->where($map)
+           ->where($map)
            ->group('a.pay_ways,a.user_account,a.pay_status')
            ->select(false);
 
@@ -266,7 +266,7 @@ class PayChannelIntentionController extends AdminController
                count(if(pay_status=2,nothing_invest_count,NULL)) nothing_invest_count,
                sum(nothing_invest_amount) nothing_invest_amount')
                ->limit(($i-1)*$perSize  ,$perSize)
-               ->where($map)
+//               ->where($map)
                ->group('a.pay_ways')
                ->select();
 
@@ -368,14 +368,21 @@ class PayChannelIntentionController extends AdminController
 
        $map = [];
 
+       if ($_REQUEST['pay_ways']) {
+           $map['pay_ways'] = ['like',"%{$_REQUEST['pay_ways']}"];
+       }
+
        if ($_REQUEST['pay_way']) {
            $map['pay_ways'] = $_REQUEST['pay_way'];
        }
 
-       if ($_REQUEST['pay_ways']) {
-           $map['pay_ways'] = ['like',"%{$_REQUEST['pay_ways']}"];
+       $pay_type = end(explode(',',$_REQUEST['pay_way']));
+       if (!$_REQUEST['pay_way']&&$_REQUEST['pay_ways']) {
+           $pay_type = $_REQUEST['pay_ways'];
        }
-//       var_dump($map);die();
+
+       $this->assign('pay_type',$pay_type);
+//       var_dump($pay_type);die();
 
        if ($_REQUEST['user_account']) {
            $map['user_account'] = $_REQUEST['user_account'];

Application/Admin/View/PayChannelIntention/detail.html

@@ -215,7 +215,7 @@
       <!--游戏类型搜索END-->
 
       <div class="input-list">
-        <a class="sch-btn" href="{:U('PayChannelIntention/index')}" style="background:#fff;color: #000;border: #000 solid 1px;width: 100px">返回</a>
+        <a class="sch-btn" href="{:U('PayChannelIntention/index',['pay_type'=>$pay_type,'timestart'=>$_REQUEST['timestart'],'timeend'=>$_REQUEST['timeend']])}" style="background:#fff;color: #000;border: #000 solid 1px;width: 100px">返回</a>
       </div>
 
       <div class="input-list">

Application/Admin/View/PayChannelIntention/index.html

@@ -293,22 +293,22 @@
               <td >{$index}</td>
               <td >{$data.pay_ways_ch}</td>
               <td >{$data.pay_way}</td>
-              <td ><a class="detail" data-way="{$data.pay_ways}" data-status="1">{$data.success_invest_count}</a></td>
+              <td ><a class="detail" data-way="{$data.pay_ways}" data-status="1" data-start="{$_REQUEST['timestart']}" data-end="{$_REQUEST['timeend']}">{$data.success_invest_count}</a></td>
               <td >{$data.success_invest_amount}</td>
-              <td ><a class="detail" data-way="{$data.pay_ways}" data-status="0">{$data.fail_invest_count}</a></td>
+              <td ><a class="detail" data-way="{$data.pay_ways}" data-status="0" data-start="{$_REQUEST['timestart']}" data-end="{$_REQUEST['timeend']}">{$data.fail_invest_count}</a></td>
               <td >{$data.fail_invest_amount}</td>
-              <td ><a class="detail" data-way="{$data.pay_ways}" data-status="2">{$data.nothing_invest_count}</a></td>
+              <td ><a class="detail" data-way="{$data.pay_ways}" data-status="2" data-start="{$_REQUEST['timestart']}" data-end="{$_REQUEST['timeend']}">{$data.nothing_invest_count}</a></td>
               <td >{$data.nothing_invest_amount}</td>
             </tr>
           </volist>
           <tr>
             <td colspan="2">汇总（检索时间内所有数据的统计）</td>
             <td ></td>
-            <td ><a class="detail" data-ways="{$_GET['pay_type']}" data-status="1">{$sum.success_invest_count}</a></td>
+            <td ><a class="detail" data-ways="{$_GET['pay_type']}" data-status="1" data-start="{$_REQUEST['timestart']}" data-end="{$_REQUEST['timeend']}">{$sum.success_invest_count}</a></td>
             <td >{$sum.success_invest_amount}</td>
-            <td ><a class="detail" data-ways="{$_GET['pay_type']}" data-status="0">{$sum.fail_invest_count}</a></td>
+            <td ><a class="detail" data-ways="{$_GET['pay_type']}" data-status="0" data-start="{$_REQUEST['timestart']}" data-end="{$_REQUEST['timeend']}">{$sum.fail_invest_count}</a></td>
             <td >{$sum.fail_invest_amount}</td>
-            <td ><a class="detail" data-ways="{$_GET['pay_type']}" data-status="2">{$sum.nothing_invest_count}</a></td>
+            <td ><a class="detail" data-ways="{$_GET['pay_type']}" data-status="2" data-start="{$_REQUEST['timestart']}" data-end="{$_REQUEST['timeend']}">{$sum.nothing_invest_count}</a></td>
             <td >{$sum.nothing_invest_amount}</td>
           </tr>
         </notemtpy>
@@ -368,6 +368,9 @@
 
       var pay_way = $(this).attr('data-way');
       var pay_ways = $(this).attr('data-ways');
+      var timestart = $(this).attr('data-start');
+      var timeend = $(this).attr('data-end');
+
       if (pay_way) {
         pay_way = 'pay_way/' + pay_way + '/';
       } else {
@@ -380,6 +383,18 @@
         pay_ways = '';
       }
 
+      if (timestart) {
+        timestart = 'timestart/' + timestart + '/';
+      } else {
+        timestart = '';
+      }
+
+      if (timeend) {
+        timeend = 'timeend/' + timeend + '/';
+      } else {
+        timeend = '';
+      }
+
       var pay_status = $(this).attr('data-status');
 
       if (pay_status) {
@@ -388,7 +403,7 @@
         pay_status = '';
       }
 
-      var url = "admin.php?s=/PayChannelIntention/detail/"+ pay_ways + pay_way + pay_status;
+      var url = "admin.php?s=/PayChannelIntention/detail/"+ pay_ways + pay_way + pay_status + timestart + timeend;
 
       window.location.href = url;