Merge pull request '优化' (#616) from feature/rebate_slzq into master

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/616

Application/Admin/Controller/GameApiController.class.php

@@ -194,6 +194,7 @@ class GameApiController extends Think {
         $service->sendOnce('H');
         $service->sendOnce('I');
         $service->sendOnce('J');
+        $service->sendOnce('K');
 
         $date = date('Y-m-d');
         $service->sendDaily('B', $date);

Application/Admin/Controller/GameRebateController.class.php

@@ -60,6 +60,11 @@ class GameRebateController extends ThinkController
         $this->records('J');
     }
 
+    public function openSevenDay()
+    {
+        $this->records('K');
+    }
+
     public function records($awardType)
     {
         $params = I('get.');

Application/Admin/View/GameRebate/records.html

@@ -219,6 +219,8 @@
                     <th>当日累充总额</th>
                     <th>返利倍数</th>
                     <th>申请总价值</th>
+                    <?php elseif($awardType == 'K'):?>
+                    <th>充值金额</th>
                     <?php endif;?>
                     <?php if($awardType == 'J'):?>
                     <th>申请道具</th>
@@ -292,6 +294,8 @@
                             <td>{$data.pay_amount}</td>
                             <td>{$data.times}</td>
                             <td>{$data.amount}</td>
+                            <?php elseif($awardType == 'K'):?>
+                            <td>{$data.pay_amount}</td>
                             <?php endif;?>
 
                             <?php if ($awardType != 'I'):?>

Application/Base/Service/GameRebateService.class.php

@@ -36,6 +36,7 @@ class GameRebateService
         'H' => '签到福利发放',
         'I' => '充值返利发放',
         'J' => '定制道具申请',
+        'K' => '新服七日礼包',
     ];
 
     public $typeNames = [
@@ -49,6 +50,7 @@ class GameRebateService
         'H' => 'dailySign',
         'I' => 'singleTimes',
         'J' => 'propsApplication',
+        'K' => 'openSevenDay',
     ];
 
     public $rebateBaseGameIds = [70, 73, 75, 79, 81];
@@ -398,6 +400,8 @@ class GameRebateService
             $fields['pay_amount'] = '当日累充总额';
             $fields['times'] = '返利倍数';
             $fields['amount'] = '申请总价值';
+        } elseif ($awardType == 'K') {
+            $fields['pay_amount'] = '充值金额';
         }
 
         if ($awardType == 'J') {

Application/Home/Controller/GameRebateController.class.php

@@ -69,6 +69,11 @@ class GameRebateController extends BaseController
         $this->records('J');
     }
 
+    public function openSevenDay()
+    {
+        $this->records('K');
+    }
+
     public function records($awardType)
     {
         $promoteService = new PromoteService();

Application/Home/View/default/GameRebate/records.html

@@ -191,6 +191,8 @@
                   <th>当日累充总额</th>
                   <th>返利倍数</th>
                   <th>申请总价值</th>
+                  <?php elseif($awardType == 'K'):?>
+                  <th>充值金额</th>
                   <?php endif;?>
                   <?php if($awardType == 'J'):?>
                   <th>申请道具</th>
@@ -260,6 +262,8 @@
                       <td>{$data.pay_amount}</td>
                       <td>{$data.times}</td>
                       <td>{$data.amount}</td>
+                      <?php elseif($awardType == 'K'):?>
+                      <td>{$data.amount}</td>
                       <?php endif;?>
 
                       <?php if ($awardType != 'I'):?>

Application/Home/View/default/Public/promote_base.html

@@ -149,6 +149,7 @@
 					<a href="{:U('GameRebate/daily')}" class="<?=is_active_class(['GameRebate'], ['daily'])?>">月卡福利发放</a>
 					<a href="{:U('GameRebate/weekly')}" class="<?=is_active_class(['GameRebate'], ['weekly'])?>">周卡福利发放</a>
 					<a href="{:U('GameRebate/propsApplication')}" class="<?=is_active_class(['GameRebate'], ['propsApplication'])?>">定制道具申请</a>
+					<a href="{:U('GameRebate/openSevenDay')}" class="<?=is_active_class(['GameRebate'], ['openSevenDay'])?>">新服七日礼包</a>
 				</div>
 				<?php endif;?>
 				<?php if(C('APP_ENV') == 'dev' || $company['type'] == 1):?>