Merge branch 'release-1.0.0' into dev

# Conflicts:
#	Application/Home/Controller/QueryController.class.php

Application/Admin/View/Support/lists.html

@@ -32,7 +32,7 @@
         <div class="fr">
           
         </div>
-        <h3 class="page_title">扶持发放</h3>
+        <h3 class="page_title">资源发放</h3>
        
         <p class="description_text">说明：记录所有扶持发放的数据</p>
        
@@ -77,8 +77,8 @@
                 <label>扶持类型：</label>
                 <select name="apply_type">
                     <option value="">全部</option>
-                    <option value="0">新增扶持</option>
-                    <option value="1">后续扶持</option>
+                    <option value="0">新增资源</option>
+                    <option value="1">后续资源</option>
                 </select>
             </div>
             <div class="input-list">
@@ -111,7 +111,7 @@
                         <th>区服</th>
                         <th>角色名</th>
                         <th>申请额度</th>
-                        <th>扶持类型</th>
+                        <th>资源类型</th>
                         <th>备注</th>
                         <th>申请时间</th>
                         <th>可用额度</th>
@@ -134,7 +134,7 @@
                             <td>{$data['server_name']}</td>
                             <td>{$data['role_name']}</td>
                             <td>{$data['apply_resource']}</td>
-                            <td><if condition="$data.apply_type eq 0" >新增扶持<else/>后续扶持</if></td>
+                            <td><if condition="$data.apply_type eq 0" >新增资源<else/>后续资源</if></td>
 
                             <td style="max-width: 200px;line-height: 1.5;padding:8px;">{$data['apply_remark']}</td>
                             <td>{:date('Y-m-d H:i:s',$data['create_time'])}</td>
@@ -170,7 +170,7 @@
         </div>
     </div>
     <div class="page">
-      <a class="sch-btn" href="{:U('Export/Support_list',array_merge(array('xlsname'=>'扶持发放'),I('get.')))}">导出</a>
+      <a class="sch-btn" href="{:U('Export/Support_list',array_merge(array('xlsname'=>'资源发放'),I('get.')))}">导出</a>
         {$_page|default=''}
     </div>
 </block>

Application/Admin/View/TestResource/supportNumberList.html

@@ -33,11 +33,11 @@
 
   <div class="cf main-place top_nav_list navtab_list">
     <div class="fr">
-      <a <if condition="(I('type') eq 1) or (I('type') eq '') "> class="tabchose" </if>  href="{:U('supportNumberList',array('type'=>1))}">扶持号管理</a>
+      <a <if condition="(I('type') eq 1) or (I('type') eq '') "> class="tabchose" </if>  href="{:U('supportNumberList',array('type'=>1))}">资源管理</a>
     </div>
-    <h3 class="page_title">扶持号管理</h3>
+    <h3 class="page_title">资源管理</h3>
     <if condition="(I('type',1) eq 1) ">
-      <p class="description_text">说明：此功能是扶持号管理<的功能</p>
+      <p class="description_text">说明：此功能是资源管理的功能</p>
       <else/>
       <p class="description_text">说明：此功是查看并管理混服申请的功能</p>
     </if>
@@ -101,7 +101,7 @@
             <th>角色名称</th>
             <th>设备信息</th>
             <th>状态</th>
-            <th >创建时间</th>
+            <th>创建时间</th>
             <th>操作</th>
           </tr>
           </thead>

Application/Home/Controller/DownloadController.class.php

@@ -3178,7 +3178,7 @@ class DownloadController extends BaseController {
        unset($map['costbegin']);
        unset($map['costend']);
        $nowTime = strtotime(date('Y-m-d 00:00:00', time()));
-       $subMap['create_time'] = ['between', [$map['begintime'], $map['endtime'] - 1]];
+       $subMap['create_time'] = ['between', [$map['begintime'], $map['endtime']-1]];
         if ($costBegin != '' || $costEnd != '') {
             $having = '';
             if ($costBegin != '' && $costEnd != '') {
@@ -3196,7 +3196,7 @@ class DownloadController extends BaseController {
             $map['_string'] = 'ui.role_id in (' . $subQuery . ')';
         }
         $secondDay = 24*3600 + 1;
-        $map['uc.create_time'] = ['between', [$map['begintime'], $map['endtime'] - $secondDay]];
+        $map['uc.create_time'] = ['between', [$map['begintime'], $map['endtime']-1]];
         unset($map['begintime']);
         unset($map['endtime']);
         //$spendMap['_string'] = 'uc.game_id = tab_user_play_info.game_id and uc.server_id = tab_user_play_info.server_id and uc.role_id = tab_user_play_info.role_id';

Application/Home/Controller/QueryController.class.php

@@ -1114,6 +1114,7 @@ class QueryController extends BaseController
 
         $summaryData = [];
         $dayList = $this->getDayList($begTime, $endTime);
+        $dayListReverse = $dayList;
         $dayList = array_reverse($dayList);
         $params['dayList'] = $dayList;
 
@@ -1185,7 +1186,9 @@ class QueryController extends BaseController
                 $allData['spend_binding'] = bcadd($allData['spend_binding'], $spendBindingList[$day], 2);
                 $allData['spend_discount'] = bcadd($allData['spend_discount'], 0, 2);
                 $allData['spend_voucher'] = bcadd($allData['spend_voucher'], 0, 2);
-
+            }
+            foreach ($dayListReverse as $day) {
+                $date = date('Ymd', strtotime($day));
                 $summaryData['date'][] = $date;
                 $summaryData['role_num'][] = $roleNumList[$day];
                 $summaryData['user_num'][] = $userNumList[$day];
@@ -1783,13 +1786,16 @@ class QueryController extends BaseController
             $ids[] = $queryPromote['id'];
 
             $map = ['uc.promote_id' => ['in', $ids]];
+            $subMap = ['promote_id' => ['in', $ids]];
 
             if ($relationGameId != 0 || $sdkVersion != 0) {
                 $gameIds = gameSearch($relationGameId, $sdkVersion);
                 $map['uc.game_id'] = ['in', $gameIds];
+                $subMap['game_id'] = ['in', $gameIds];
             }
             if ($serverId != 0) {
                 $map['uc.server_id'] = $serverId;
+                $subMap['server_id'] = $serverId;
             }
             if ($roleName != '') {
                 $map['ui.role_name'] = ['like', $roleName . '%'];
@@ -1865,10 +1871,15 @@ class QueryController extends BaseController
 
             list($records, $pagination, $count) = $this->paginate($query);
 
-            $total = M('user_play_data_count', 'tab_')->alias('uc')
+            $totalQuery = M('user_play_data_count', 'tab_')->alias('uc')
                 ->field($fieldUC)
-                ->join('left join tab_user_play_info as ui on ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id')
+                ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and uc.server_id = ui.server_id and ui.role_id = uc.role_id')
+                ->group('uc.role_id,uc.game_id,uc.server_id,uc.user_id')
                 ->where($map)
+                ->buildSql();
+            $total = M()->alias('totals')
+                ->table($totalQuery)
+                ->field('sum(recharge_cost) recharge_cost,sum(recharge_count) recharge_count,sum(recharge_cost_today) as recharge_cost_today')
                 ->find();
 
             foreach ($records as &$list) {