Merge branch 'feature/rebate_xlqy' into feature/rebate_xlqy_new

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) {

Application/Base/Service/GameRebateService.class.php

@@ -25,7 +25,7 @@ class GameRebateService
     public $typeDisplayNames = [
         'A' => '单笔充值福利',
         'B' => '月卡福利发放',
-        'C' => '累充福利发放',
+        'C' => '创角累充福利',
         'D' => '首充福利发放',
         'E' => '单日累充福利发放',
         'F' => '周卡福利发放',

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
 {
@@ -55,6 +49,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();

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>

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;?>