elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
master
ELF 5 years ago
parent 9bc3f65a18 879accf9f5
commit ae97711b26
13 changed files with 44 additions and 21 deletions
Show Stats Download Patch File Download Diff File

4
Application/Admin/Controller/FinanceController.class.php
Unescape Escape View File

@ -85,7 +85,7 @@ class FinanceController extends ThinkController
$order = "id DESC";
$data = M('spend_month_count','tab_')
->field("cash_count,balance_coin_count,inside_cash_count,all_count,count_date")
->field("cash_count,balance_coin_count,inside_cash_count,all_count,count_date,balance_coin_deposit")
->where($map)
->page($page,$row)
->order($order)
@ -98,7 +98,7 @@ class FinanceController extends ThinkController
->select();
$sumData = M('spend_month_count','tab_')
->field("sum(cash_count) as cash_count,sum(balance_coin_count) as balance_coin_count,sum(inside_cash_count) as inside_cash_count,sum(all_count) as all_count,count_date")
->field("sum(cash_count) as cash_count,sum(balance_coin_count) as balance_coin_count,sum(inside_cash_count) as inside_cash_count,sum(all_count) as all_count,count_date,sum(balance_coin_deposit) as balance_coin_deposit")
->where($map)
->order($order)
->find();

15
Application/Admin/Controller/SpendCountSetController.class.php
Unescape Escape View File

@ -588,8 +588,10 @@ class SpendCountSetController extends \Think\Controller
$initdata = $this->getMonthInit();
$balance = $this->getBalanceUser();
$bind = $this->getBindUser();
$deposit = $this->getBalanceDeposit();
$initdata["inside_cash_count"] = $initdata["inside_cash_count"]-0+$balance-0+$bind;
$initdata["all_count"] = $initdata["inside_cash_count"]-0+$initdata["balance_coin_count"]-0+$initdata["cash_count"];
$initdata["balance_coin_deposit"] = $deposit;
$initdata["all_count"] = $initdata["inside_cash_count"]-0+$initdata["cash_count"]-0+$deposit;
$initdata["count_date"] = $this->date;
$initdata["create_time"] = $this->nowdata;
M("spend_month_count","tab_")->add($initdata);
@ -604,6 +606,17 @@ class SpendCountSetController extends \Think\Controller
);
return M("spend_user_count","tab_")->field("sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count")->where($tempmap)->find();
}
//获取平台币充值流水
protected function getBalanceDeposit()
{
$map = array(
"create_time"=> array('BETWEEN',array($this->beginThismonth, $this->endThismonth)),
"pay_status"=>1
);
$deposit = M("deposit","tab_")->field("SUM(pay_amount) pay_amount")->where($map)->find()['pay_amount'];
$deposit || $deposit=0;
return $deposit;
}
//设置 后台发放平台币给玩家 及 回收玩家 的最终值
protected function getBalanceUser()
{

2
Application/Admin/View/Finance/gameFinance.html
Unescape Escape View File

@ -133,7 +133,7 @@
<th ><div class="tooltip">内充消耗<span class="tooltiptext"><span style="margin-left: -10px">绑币消费所产生的流水</span></span></div></th>
<th ><div class="tooltip">总流水<span class="tooltiptext"><span style="margin-left: -10px">现金流水+平台币流水+内充流水</span></span></div></th>
<th ><div class="tooltip">总流水<span class="tooltiptext"><span style="margin-left: -10px">游戏现金流水+平台币流水+内充消耗</span></span></div></th>
<th >操作</th>
</tr>

2
Application/Admin/View/Finance/getParentUser.html
Unescape Escape View File

@ -116,7 +116,7 @@
<th ><div class="tooltip">内充发放<span class="tooltiptext"><span style="margin-left: -10px">平台直接下放给公会的平台币</span></span></div></th>
<th ><div class="tooltip">总流水<span class="tooltiptext"><span style="margin-left: -10px">现金流水+平台币流水+内充流水</span></span></div></th>
<th ><div class="tooltip">总流水<span class="tooltiptext"><span style="margin-left: -10px">游戏现金流水+平台币流水+内充发放</span></span></div></th>
<th >操作</th>

2
Application/Admin/View/Finance/getPromoteUser.html
Unescape Escape View File

@ -107,7 +107,7 @@
<th ><div class="tooltip">内充发放<span class="tooltiptext"><span style="margin-left: -10px">平台直接下放给公会的平台币</span></span></div></th>
<th ><div class="tooltip">总流水<span class="tooltiptext"><span style="margin-left: -10px">现金流水+平台币流水+内充流水</span></span></div></th>
<th ><div class="tooltip">总流水<span class="tooltiptext"><span style="margin-left: -10px">游戏现金流水+平台币流水+内充发放</span></span></div></th>
<th >操作</th>

2
Application/Admin/View/Finance/getRootUser.html
Unescape Escape View File

@ -117,7 +117,7 @@
<th ><div class="tooltip">内充发放<span class="tooltiptext"><span style="margin-left: -10px">平台直接下放给公会的平台币</span></span></div></th>
<th ><div class="tooltip">总流水<span class="tooltiptext"><span style="margin-left: -10px">现金流水+平台币流水+内充流水</span></span></div></th>
<th ><div class="tooltip">总流水<span class="tooltiptext"><span style="margin-left: -10px">游戏现金流水+平台币流水+内充发放</span></span></div></th>
<th >操作</th>

12
Application/Admin/View/Finance/index.html
Unescape Escape View File

@ -133,11 +133,13 @@
<th ><div class="tooltip">游戏现金流水<span class="tooltiptext"><span style="margin-left: -10px">第三方支付（微信，支付宝，快捷）</span></span></div></th>
<th ><div class="tooltip">平台币流水<span class="tooltiptext"><span style="margin-left: -10px">平台币所支付的流水</span></span></div></th>
<th ><div class="tooltip">平台币收入<span class="tooltiptext"><span style="margin-left: -10px">指示为玩家充值平台币流水，计入总流水</span></span></div></th>
<th ><div class="tooltip">内充流水<span class="tooltiptext"><span style="margin-left: -10px">管理后台下发的所有平台币，绑定币流水（平台币订单-后台发放（玩家/推广员）），绑币订单-后台发放（玩家）,平台币回收与绑币回收需要进行扣除</span></span></div></th>
<th ><div class="tooltip">总流水<span class="tooltiptext"><span style="margin-left: -10px">现金流水+平台币流水+内充流水</span></span></div></th>
<th ><div class="tooltip">平台币支出<span class="tooltiptext"><span style="margin-left: -10px">指示为玩家充值消耗平台，不计入总流水</span></span></div></th>
<th ><div class="tooltip">总流水<span class="tooltiptext"><span style="margin-left: -10px">游戏现金流水+平台币收入+内充流水</span></span></div></th>
<th >操作</th>
</tr>
@ -159,8 +161,9 @@
<tr>
<td >{$data.count_date}</td>
<td >{$data.cash_count}</td>
<td >{$data.balance_coin_count}</td>
<td >{$data.balance_coin_deposit}</td>
<td >{$data.inside_cash_count}</td>
<td >{$data.balance_coin_count}</td>
<td >{$data.all_count}</td>
<td >
<a href="{:U('Finance/gameFinance',
@ -174,8 +177,9 @@
<tr>
<td><span>总计</span></td>
<td ><span><if condition="$sumData.cash_count neq ''">{$sumData.cash_count}<else/>0</if></span></td>
<td><if condition="$sumData.balance_coin_count neq ''">{$sumData.balance_coin_count}<else/>0</if></td>
<td><if condition="$sumData.balance_coin_count neq ''">{$sumData.balance_coin_deposit}<else/>0</if></td>
<td><if condition="$sumData.inside_cash_count neq ''">{$sumData.inside_cash_count}<else/>0</if></td>
<td><if condition="$sumData.balance_coin_count neq ''">{$sumData.balance_coin_count}<else/>0</if></td>
<td><if condition="$sumData.all_count neq ''">{$sumData.all_count}<else/>0</if></td>
<td>
<a href="{:U('Finance/gameFinance',array('sign'=>1,'game_id'=>$_GET['game_id'],'count_date'=>$_GET['count_date'],'partner_id'=>$_GET['partner_id'],'from'=>'index'))}" >游戏查看</a>

4
Application/Admin/View/TestResource/protectLogList.html
Unescape Escape View File

@ -42,9 +42,9 @@
<div class="fr">
<a <if condition="(I('type') eq 1) or (I('type') eq '') "> class="tabchose" </if> href="{:U('protectLogList',array('type'=>1))}">日志管理</a>
</div>
<h3 class="page_title">测试资源申请</h3>
<h3 class="page_title">防护日志</h3>
<if condition="(I('type',1) eq 1) ">
<p class="description_text">说明：此功能是测试资源申请的功能</p>
<p class="description_text">说明：此功能是防护日志的功能</p>
<else/>
<p class="description_text">说明：此功是查看并管理混服申请的功能</p>
</if>

4
Application/Admin/View/TestResource/supportNumberList.html
Unescape Escape View File

@ -35,9 +35,9 @@
<div class="fr">
<a <if condition="(I('type') eq 1) or (I('type') eq '') "> class="tabchose" </if> href="{:U('supportNumberList',array('type'=>1))}">扶持号管理</a>
</div>
<h3 class="page_title">测试资源申请</h3>
<h3 class="page_title">扶持号管理</h3>
<if condition="(I('type',1) eq 1) ">
<p class="description_text">说明：此功能是测试资源申请的功能</p>
<p class="description_text">说明：此功能是扶持号管理<的功能</p>
<else/>
<p class="description_text">说明：此功是查看并管理混服申请的功能</p>
</if>

6
Application/Home/Controller/PromoteController.class.php
Unescape Escape View File

@ -64,11 +64,11 @@ class PromoteController extends BaseController
$gg_list = M("document", "sys_")->limit('0,5')->where("category_id=56 and status=1")->order("update_time desc")->select(); //游戏公告
$zx_list = M("document", "sys_")->limit('0,5')->where("category_id=51 and status=1")->order("update_time desc")->select(); //游戏咨询
$promote_id = get_pid();
$field = 'id,game_name,server_name,user_account,nickname,promote_account,detail,create_time as update_time';
$rz_list = M("protect_log","tab_")->field($field)->limit('0,5')->order("create_time desc")->select(); //日志管理
$rz_list = M("protect_log","tab_")->field($field)->where("promote_id = {$promote_id}")->limit('0,5')->order("create_time desc")->select(); //日志管理
$promote_id = get_pid();
$logCount = M('protect_log','tab_')->count();
$logCount = M('protect_log','tab_')->where("promote_id = {$promote_id}")->count();
$readLogCount = M('protect_log_read','tab_')->where("promote_id = {$promote_id}")->count();
$gg_data = M("document", "sys_")->where("category_id=56 and status=1")->order("update_time desc")->select();

3
Application/Home/Controller/TestResourceController.class.php
Unescape Escape View File

@ -37,7 +37,7 @@ class TestResourceController extends BaseController
$map['tab_test_resource.promote_id']=I('promote_id');
}
$map['user.promote_id']=session("promote_auth.pid");
$map['tab_test_resource.promote_id']=session("promote_auth.pid");
$data = M('test_resource','tab_')
->field('tab_test_resource.id,tab_test_resource.user_id,tab_test_resource.game_name,tab_test_resource.server_name,tab_test_resource.user_account,tab_test_resource.promote_account,tab_test_resource.role_name,tab_test_resource.create_time,device_number,lock_status as check_status')
->join('left join tab_user as user on tab_test_resource.user_id = user.id')
@ -186,6 +186,7 @@ class TestResourceController extends BaseController
if(!empty(I('types'))){
$map['type']=I('types');
}
$map['promote_id']=$promote_id;
$field = 'id,game_name,server_name,user_account,nickname,promote_account,detail';
$order = 'id DESC';

7
Data/update.sql
Unescape Escape View File

@ -248,4 +248,9 @@ CREATE TABLE `tab_spend_month_count` (
) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='流水月份聚合表';
-----头像---
ALTER TABLE `sys_file`
MODIFY COLUMN `name` char(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '原始文件名' AFTER `id`;
MODIFY COLUMN `name` char(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '原始文件名' AFTER `id`;
-- 2019-11-04 chenzhi
ALTER TABLE `tab_spend_month_count`
MODIFY COLUMN `balance_coin_count` decimal(10,2) NULL DEFAULT 0.00 COMMENT '平台币游戏支付流水' AFTER `cash_count`,
ADD COLUMN `balance_coin_deposit` decimal(10,2) NULL DEFAULT 0.00 COMMENT '平台币充值流水' AFTER `balance_coin_count`;

2
Public/Home/css/index/index.new.css
Unescape Escape View File

@ -8,7 +8,7 @@
.promote-index-overview .icon {width:40px;height:40px;position:absolute;top:50%;margin-top:-34px;left: 22%;}
.promote-index-overview .icon img{width: 100%;height: 100%;}
.promote-index-overview .text {font-size:16px;color:#555;/* text-align:center; */padding-top:33px;padding-left: 140px;}
.promote-index-overview .text {font-size:16px;color:#555;/* text-align:center; */padding-top:33px;padding-left: 160px;}
.promote-index-overview .text p {margin-bottom:6px;color: #6A7082;}
.promote-index-overview .text span {font-size:18px;color: #99B1CB;}

Write Preview
Loading…
Cancel
Save