From 9131a7c7895def7f94de9387c622dc169d632858 Mon Sep 17 00:00:00 2001
From: elf <360197197@qq.com>
Date: Tue, 28 Dec 2021 15:50:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/GameApiController.class.php    | 1 +
 Application/Admin/Controller/GameRebateController.class.php | 5 +++++
 Application/Admin/View/GameRebate/records.html              | 4 ++++
 Application/Base/Service/GameRebateService.class.php        | 4 ++++
 Application/Home/Controller/GameRebateController.class.php  | 5 +++++
 Application/Home/View/default/GameRebate/records.html       | 4 ++++
 Application/Home/View/default/Public/promote_base.html      | 1 +
 7 files changed, 24 insertions(+)

diff --git a/Application/Admin/Controller/GameApiController.class.php b/Application/Admin/Controller/GameApiController.class.php
index 5d628304f..08dc60615 100644
--- a/Application/Admin/Controller/GameApiController.class.php
+++ b/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);
diff --git a/Application/Admin/Controller/GameRebateController.class.php b/Application/Admin/Controller/GameRebateController.class.php
index 8f7b36ad1..7384ed221 100644
--- a/Application/Admin/Controller/GameRebateController.class.php
+++ b/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.');
diff --git a/Application/Admin/View/GameRebate/records.html b/Application/Admin/View/GameRebate/records.html
index 99a0bafd8..78be65b4b 100644
--- a/Application/Admin/View/GameRebate/records.html
+++ b/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'):?>
diff --git a/Application/Base/Service/GameRebateService.class.php b/Application/Base/Service/GameRebateService.class.php
index 52c2c9344..a1660c636 100644
--- a/Application/Base/Service/GameRebateService.class.php
+++ b/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') {
diff --git a/Application/Home/Controller/GameRebateController.class.php b/Application/Home/Controller/GameRebateController.class.php
index 9b9cd84aa..58b5d6c7b 100644
--- a/Application/Home/Controller/GameRebateController.class.php
+++ b/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();
diff --git a/Application/Home/View/default/GameRebate/records.html b/Application/Home/View/default/GameRebate/records.html
index a8961335c..dc5aed4f9 100644
--- a/Application/Home/View/default/GameRebate/records.html
+++ b/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'):?>
diff --git a/Application/Home/View/default/Public/promote_base.html b/Application/Home/View/default/Public/promote_base.html
index a2874b4ac..a986f2f0c 100644
--- a/Application/Home/View/default/Public/promote_base.html
+++ b/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):?>