From 23dc4a4a467543f78898cecf9eed3b987f49cc42 Mon Sep 17 00:00:00 2001
From: elf <360197197@qq.com>
Date: Thu, 21 Oct 2021 14:09:34 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Home/Controller/GameRebateController.class.php     | 10 ++++++++++
 Application/Home/View/default/GameRebate/records.html  |  4 ++++
 2 files changed, 14 insertions(+)

diff --git a/Application/Home/Controller/GameRebateController.class.php b/Application/Home/Controller/GameRebateController.class.php
index a40910b10..3464751ac 100644
--- a/Application/Home/Controller/GameRebateController.class.php
+++ b/Application/Home/Controller/GameRebateController.class.php
@@ -55,6 +55,16 @@ class GameRebateController extends BaseController
         $this->records('F');
     }
 
+    public function newRole()
+    {
+        $this->records('G');
+    }
+
+    public function dailySign()
+    {
+        $this->records('H');
+    }
+
     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 71a83f61c..a759307e2 100644
--- a/Application/Home/View/default/GameRebate/records.html
+++ b/Application/Home/View/default/GameRebate/records.html
@@ -174,6 +174,8 @@
                   <th>达成日期</th>
                   <?php elseif($awardType == 'F'):?>
                   <th>可领取福利日期</th>
+                  <?php elseif($awardType == 'H'):?>
+                  <th>签到日期</th>
                   <?php endif;?>
                   <th>奖励内容</th>
                   <th>订单生成时间</th>
@@ -215,6 +217,8 @@
                       <td>{$data.award_date}</td>
                       <?php elseif($awardType == 'F'):?>
                       <td>{$data.award_date_range}</td>
+                      <?php elseif($awardType == 'H'):?>
+                      <td>{$data.award_date}</td>
                       <?php endif;?>
 
                       <td>{$data.gift_content}</td>

From 94807ad9cd9585fc69a01daa70da1f7000251c16 Mon Sep 17 00:00:00 2001
From: elf <360197197@qq.com>
Date: Thu, 21 Oct 2021 14:17:01 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Base/Service/GameRebateService.class.php      | 2 +-
 .../Home/Controller/GameRebateController.class.php        | 6 ------
 Application/Home/View/default/Public/promote_base.html    | 8 +++++---
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/Application/Base/Service/GameRebateService.class.php b/Application/Base/Service/GameRebateService.class.php
index acdfa97a8..e3c0c5173 100644
--- a/Application/Base/Service/GameRebateService.class.php
+++ b/Application/Base/Service/GameRebateService.class.php
@@ -25,7 +25,7 @@ class GameRebateService
     public $typeDisplayNames = [
         'A' => '单笔充值福利',
         'B' => '月卡福利发放',
-        'C' => '累充福利发放',
+        'C' => '创角累充福利',
         'D' => '首充福利发放',
         'E' => '单日累充福利发放',
         'F' => '周卡福利发放',
diff --git a/Application/Home/Controller/GameRebateController.class.php b/Application/Home/Controller/GameRebateController.class.php
index 3464751ac..b71548190 100644
--- a/Application/Home/Controller/GameRebateController.class.php
+++ b/Application/Home/Controller/GameRebateController.class.php
@@ -3,15 +3,9 @@
 
 namespace Home\Controller;
 
-use Base\Model\PromoteModel;
 use Base\Service\PromoteService;
-use OSS\Core\OssException;
-use Think\Model;
-use Base\Service\TestingResourceService;
-use Base\Repository\TestingResourceRepository;
 use Base\Repository\GameRepository;
 use Base\Service\GameRebateService;
-use Base\Service\GameService;
 
 class GameRebateController extends BaseController
 {
diff --git a/Application/Home/View/default/Public/promote_base.html b/Application/Home/View/default/Public/promote_base.html
index 934fa69bd..09def96e5 100644
--- a/Application/Home/View/default/Public/promote_base.html
+++ b/Application/Home/View/default/Public/promote_base.html
@@ -139,11 +139,13 @@
 				<?php if($loginer['rebate_over_perm'] == 1):?>
 				<div class="subNav jssubNav"><i class="prev_icon icon_fenbao"></i><span>返利管理</span><i class="arrow_icon"></i></div>
 				<div class="navContent jsnavContent">
-					<a href="{:U('GameRebate/single')}" class="<?=is_active_class(['GameRebate'], ['single'])?>">单笔充值福利</a>
-					<a href="{:U('GameRebate/daily')}" class="<?=is_active_class(['GameRebate'], ['daily'])?>">月卡福利发放</a>
-					<a href="{:U('GameRebate/accumulative')}" class="<?=is_active_class(['GameRebate'], ['accumulative'])?>">累充福利发放</a>
+					<a href="{:U('GameRebate/newRole')}" class="<?=is_active_class(['GameRebate'], ['newRole'])?>">首次进游福利</a>
+					<a href="{:U('GameRebate/dailySign')}" class="<?=is_active_class(['GameRebate'], ['dailySign'])?>">签到福利发放</a>
 					<a href="{:U('GameRebate/firstPay')}" class="<?=is_active_class(['GameRebate'], ['firstPay'])?>">首充福利发放</a>
+					<a href="{:U('GameRebate/single')}" class="<?=is_active_class(['GameRebate'], ['single'])?>">单笔充值福利</a>
 					<a href="{:U('GameRebate/dayAccumulative')}" class="<?=is_active_class(['GameRebate'], ['dayAccumulative'])?>">单日累充福利发放</a>
+					<a href="{:U('GameRebate/accumulative')}" class="<?=is_active_class(['GameRebate'], ['accumulative'])?>">创角累充福利</a>
+					<a href="{:U('GameRebate/daily')}" class="<?=is_active_class(['GameRebate'], ['daily'])?>">月卡福利发放</a>
 					<a href="{:U('GameRebate/weekly')}" class="<?=is_active_class(['GameRebate'], ['weekly'])?>">周卡福利发放</a>
 				</div>
 				<?php endif;?>

From 9e4cbed06856051899ea4c9c27fc64ee7007afec Mon Sep 17 00:00:00 2001
From: elf <360197197@qq.com>
Date: Fri, 22 Oct 2021 14:26:21 +0800
Subject: [PATCH 3/3] =?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/GameRebateController.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/GameRebateController.class.php b/Application/Admin/Controller/GameRebateController.class.php
index 5ba7fd9bc..1f6b77bed 100644
--- a/Application/Admin/Controller/GameRebateController.class.php
+++ b/Application/Admin/Controller/GameRebateController.class.php
@@ -241,7 +241,7 @@ class GameRebateController extends ThinkController
                 ->field(['game_player_id', 'sum(pay_amount) amount'])
                 ->where(['game_player_id' => ['in', $roleIds], 'game_id' => ['in', $gameIds], 'pay_status' => 1, 'user_id' => ['in', $userIds]])
                 ->group('game_player_id')
-                ->select(false);
+                ->select();
             
             $payAmountItems = [];
             foreach ($items as $item) {