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 @@ 当日累充总额 返利倍数 申请总价值 + + 充值金额 申请道具 @@ -292,6 +294,8 @@ {$data.pay_amount} {$data.times} {$data.amount} + + {$data.pay_amount} 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 @@ 当日累充总额 返利倍数 申请总价值 + + 充值金额 申请道具 @@ -260,6 +262,8 @@ {$data.pay_amount} {$data.times} {$data.amount} + + {$data.amount} 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 @@ 月卡福利发放 周卡福利发放 定制道具申请 + 新服七日礼包