diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index 0aaf253ed..e0ca919c0 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/Application/Admin/Controller/FinanceController.class.php @@ -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(); diff --git a/Application/Admin/Controller/SpendCountSetController.class.php b/Application/Admin/Controller/SpendCountSetController.class.php index 881c9f03c..eb0dd284b 100644 --- a/Application/Admin/Controller/SpendCountSetController.class.php +++ b/Application/Admin/Controller/SpendCountSetController.class.php @@ -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() { diff --git a/Application/Admin/View/Finance/index.html b/Application/Admin/View/Finance/index.html index fbc07a9c7..4b4f0cfd7 100644 --- a/Application/Admin/View/Finance/index.html +++ b/Application/Admin/View/Finance/index.html @@ -133,10 +133,12 @@
游戏现金流水第三方支付（微信，支付宝，快捷）
-
平台币流水平台币所支付的流水
+
平台币收入指示为玩家充值平台币流水，计入总流水
内充流水管理后台下发的所有平台币，绑定币流水（平台币订单-后台发放（玩家/推广员）），绑币订单-后台发放（玩家）,平台币回收与绑币回收需要进行扣除
+
平台币支出指示为玩家充值消耗平台，不计入总流水
+
总流水现金流水+平台币流水+内充流水
操作 @@ -159,8 +161,9 @@ {$data.count_date} {$data.cash_count} - {$data.balance_coin_count} + {$data.balance_coin_deposit} {$data.inside_cash_count} + {$data.balance_coin_count} {$data.all_count} {$sumData.cash_count}0 - {$sumData.balance_coin_count}0 + {$sumData.balance_coin_deposit}0 {$sumData.inside_cash_count}0 + {$sumData.balance_coin_count}0 {$sumData.all_count}0 游戏查看 diff --git a/Application/Admin/View/TestResource/protectLogList.html b/Application/Admin/View/TestResource/protectLogList.html index 749e3a557..0e873f2ae 100644 --- a/Application/Admin/View/TestResource/protectLogList.html +++ b/Application/Admin/View/TestResource/protectLogList.html @@ -42,9 +42,9 @@
class="tabchose" href="{:U('protectLogList',array('type'=>1))}">日志管理
-

测试资源申请

+

防护日志

-

说明：此功能是测试资源申请的功能

+

说明：此功能是防护日志的功能

说明：此功是查看并管理混服申请的功能

 diff --git a/Application/Admin/View/TestResource/supportNumberList.html b/Application/Admin/View/TestResource/supportNumberList.html index 62e4765e5..f996a2501 100644 --- a/Application/Admin/View/TestResource/supportNumberList.html +++ b/Application/Admin/View/TestResource/supportNumberList.html @@ -35,9 +35,9 @@
class="tabchose" href="{:U('supportNumberList',array('type'=>1))}">扶持号管理
-

测试资源申请

+

扶持号管理

-

说明：此功能是测试资源申请的功能

+

说明：此功能是扶持号管理<的功能

说明：此功是查看并管理混服申请的功能

 diff --git a/Application/Home/Controller/PromoteController.class.php b/Application/Home/Controller/PromoteController.class.php index 7219f4038..481f97543 100644 --- a/Application/Home/Controller/PromoteController.class.php +++ b/Application/Home/Controller/PromoteController.class.php @@ -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(); diff --git a/Application/Home/Controller/TestResourceController.class.php b/Application/Home/Controller/TestResourceController.class.php index 94edbf613..a357b22ae 100644 --- a/Application/Home/Controller/TestResourceController.class.php +++ b/Application/Home/Controller/TestResourceController.class.php @@ -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'; diff --git a/Data/update.sql b/Data/update.sql index 0a46ca55f..91fd38e56 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -249,3 +249,8 @@ CREATE TABLE `tab_spend_month_count` ( -----头像--- ALTER TABLE `sys_file` 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`;