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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
master
liuweiwen 5 years ago
parent fcbde62500 5ee4ce6552
commit 7995273b9f
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File

50
Application/Home/Controller/DownloadController.class.php
Unescape Escape View File

@ -84,7 +84,7 @@ class DownloadController extends BaseController {
$res = M('promote','tab_')->where($map1)->field('id,account,nickname')->select(); $res = M('promote','tab_')->where($map1)->field('id,account,nickname')->select();
$childPromoteIds = ''; $childPromoteIds = '';
if(empty($res)) { if(empty($res)) {
$map['tab_downloadlog.admin_id'] = PID; $map['tab_downloadlog.promote_id'] = PID;
}else { }else {
foreach ($res as $rsKey => $rsValue) { foreach ($res as $rsKey => $rsValue) {
$id = $rsValue['id']; $id = $rsValue['id'];
@ -92,7 +92,7 @@ class DownloadController extends BaseController {
} }
$childPromoteIds = rtrim($childPromoteIds, ','); $childPromoteIds = rtrim($childPromoteIds, ',');
$childPromoteIds .= ',' . PID; $childPromoteIds .= ',' . PID;
$map['tab_downloadlog.admin_id'] = ['in', $childPromoteIds]; $map['tab_downloadlog.promote_id'] = ['in', $childPromoteIds];
} }
$levelPromote = $this->getLevelPromote(); $levelPromote = $this->getLevelPromote();
$queryPromote = $this->getQueryPromote($levelPromote); $queryPromote = $this->getQueryPromote($levelPromote);
@ -105,7 +105,7 @@ class DownloadController extends BaseController {
$map = []; $map = [];
if (count($childPromoteIds) > 0) { if (count($childPromoteIds) > 0) {
$map = ['admin_id' => ['in', $childPromoteIds]]; $map = ['promote_id' => ['in', $childPromoteIds]];
} else { } else {
$map['_string'] = '1<>1'; $map['_string'] = '1<>1';
} }
@ -130,7 +130,7 @@ class DownloadController extends BaseController {
$rs = M('downloadlog','tab_')->where($map)->order('tab_downloadlog.addtime desc') $rs = M('downloadlog','tab_')->where($map)->order('tab_downloadlog.addtime desc')
->page($page, $row)->select(); ->page($page, $row)->select();
foreach ($rs as $key => $value) { foreach ($rs as $key => $value) {
$pid = intval($value['admin_id']); $pid = intval($value['promote_id']);
$getNameRs = M('promote','tab_')->field("real_name")->where(['id' => $pid])->find(); $getNameRs = M('promote','tab_')->field("real_name")->where(['id' => $pid])->find();
$rs[$key]['actor'] = $getNameRs['real_name']; $rs[$key]['actor'] = $getNameRs['real_name'];
} }
@ -236,7 +236,7 @@ class DownloadController extends BaseController {
$addtime = time(); $addtime = time();
$data = [ $data = [
'logid' => 'dy_'.time(), 'logid' => 'dy_'.time(),
'admin_id' => PID, 'promote_id' => PID,
'type' => '/Home/Query/dailySummary', 'type' => '/Home/Query/dailySummary',
'dataname' => '每日概况', 'dataname' => '每日概况',
'status' => 0, 'status' => 0,
@ -291,7 +291,7 @@ class DownloadController extends BaseController {
$addtime = time(); $addtime = time();
$data = [ $data = [
'logid' => 'withdrawRecord'.time(), 'logid' => 'withdrawRecord'.time(),
'admin_id' => PID, 'promote_id' => PID,
'type' => '/Home/Finance/withdrawRecord', 'type' => '/Home/Finance/withdrawRecord',
'dataname' => '提现记录', 'dataname' => '提现记录',
'status' => 0, 'status' => 0,
@ -338,7 +338,7 @@ class DownloadController extends BaseController {
$addtime = time(); $addtime = time();
$data = [ $data = [
'logid' => 'withdrawDtl_'.time(), 'logid' => 'withdrawDtl_'.time(),
'admin_id' => PID, 'promote_id' => PID,
'type' => '/Home/Finance/withdrawDtl', 'type' => '/Home/Finance/withdrawDtl',
'dataname' => '提现明细', 'dataname' => '提现明细',
'status' => 0, 'status' => 0,
@ -384,7 +384,7 @@ class DownloadController extends BaseController {
$addtime = time(); $addtime = time();
$data = [ $data = [
'logid' => 'finance_'.time(), 'logid' => 'finance_'.time(),
'admin_id' => PID, 'promote_id' => PID,
'type' => '/Home/Finance/index', 'type' => '/Home/Finance/index',
'dataname' => '结算中心', 'dataname' => '结算中心',
'status' => 0, 'status' => 0,
@ -456,7 +456,7 @@ class DownloadController extends BaseController {
$addtime = time(); $addtime = time();
$data = [ $data = [
'logid' => 'settlementDtl_'.time(), 'logid' => 'settlementDtl_'.time(),
'admin_id' => PID, 'promote_id' => PID,
'type' => '/Home/Finance/settlementDtl', 'type' => '/Home/Finance/settlementDtl',
'dataname' => '结算明细', 'dataname' => '结算明细',
'status' => 0, 'status' => 0,
@ -512,7 +512,7 @@ class DownloadController extends BaseController {
$addtime = time(); $addtime = time();
$data = [ $data = [
'logid' => 'test_'.time(), 'logid' => 'test_'.time(),
'admin_id' => PID, 'promote_id' => PID,
'type' => '/Home/TestResource/index', 'type' => '/Home/TestResource/index',
'dataname' => '申请测试资源', 'dataname' => '申请测试资源',
'status' => 0, 'status' => 0,
@ -572,7 +572,7 @@ class DownloadController extends BaseController {
$addtime = time(); $addtime = time();
$data = [ $data = [
'logid' => 'test_'.time(), 'logid' => 'test_'.time(),
'admin_id' => PID, 'promote_id' => PID,
'type' => '/Home/TestResource/lists', 'type' => '/Home/TestResource/lists',
'dataname' => '申请测试资源记录', 'dataname' => '申请测试资源记录',
'status' => 0, 'status' => 0,
@ -619,7 +619,7 @@ class DownloadController extends BaseController {
$addtime = time(); $addtime = time();
$data = [ $data = [
'logid' => 'test_'.time(), 'logid' => 'test_'.time(),
'admin_id' => PID, 'promote_id' => PID,
'type' => '/Home/TestResource/supportNumberList', 'type' => '/Home/TestResource/supportNumberList',
'dataname' => '扶持号管理', 'dataname' => '扶持号管理',
'status' => 0, 'status' => 0,
@ -682,7 +682,7 @@ class DownloadController extends BaseController {
$addtime = time(); $addtime = time();
$data = [ $data = [
'logid' => 'orderlist_'.time(), 'logid' => 'orderlist_'.time(),
'admin_id' => PID, 'promote_id' => PID,
'type' => '/Home/CoinOrder/order_list', 'type' => '/Home/CoinOrder/order_list',
'dataname' => '平台币充值', 'dataname' => '平台币充值',
'status' => 0, 'status' => 0,
@ -779,7 +779,7 @@ class DownloadController extends BaseController {
$addtime = time(); $addtime = time();
$data = [ $data = [
'logid' => 'zc_'.time(), 'logid' => 'zc_'.time(),
'admin_id' => PID, 'promote_id' => PID,
'type' => '/Home/Query/arpu', 'type' => '/Home/Query/arpu',
'dataname' => 'ARPU统计', 'dataname' => 'ARPU统计',
'status' => 0, 'status' => 0,
@ -865,7 +865,7 @@ class DownloadController extends BaseController {
$addtime = time(); $addtime = time();
$data = [ $data = [
'logid' => 'zc_'.time(), 'logid' => 'zc_'.time(),
'admin_id' => PID, 'promote_id' => PID,
'type' => '/Home/Query/registe', 'type' => '/Home/Query/registe',
'dataname' => '注册明细数据', 'dataname' => '注册明细数据',
'status' => 0, 'status' => 0,
@ -928,7 +928,7 @@ class DownloadController extends BaseController {
$type = "/Home/Promote/children/promote_type/".$promoteType; $type = "/Home/Promote/children/promote_type/".$promoteType;
$data = [ $data = [
'logid' => 'promote_'.time(), 'logid' => 'promote_'.time(),
'admin_id' => PID, 'promote_id' => PID,
'type' => $type, 'type' => $type,
'dataname' => '渠道管理', 'dataname' => '渠道管理',
'status' => 0, 'status' => 0,
@ -987,7 +987,7 @@ class DownloadController extends BaseController {
$type = "/Home/PromoteCoin/transferLogs"; $type = "/Home/PromoteCoin/transferLogs";
$data = [ $data = [
'logid' => 'cr_'.time(), 'logid' => 'cr_'.time(),
'admin_id' => PID, 'promote_id' => PID,
'type' => $type, 'type' => $type,
'dataname' => '平台币转移', 'dataname' => '平台币转移',
'status' => 0, 'status' => 0,
@ -1049,7 +1049,7 @@ class DownloadController extends BaseController {
$addtime = time(); $addtime = time();
$data = [ $data = [
'logid' => 'pt_'.time(), 'logid' => 'pt_'.time(),
'admin_id' => PID, 'promote_id' => PID,
'type' => "/Home/PromoteCoin/coinRecord", 'type' => "/Home/PromoteCoin/coinRecord",
'dataname' => '我的平台币明细', 'dataname' => '我的平台币明细',
'status' => 0, 'status' => 0,
@ -1112,7 +1112,7 @@ class DownloadController extends BaseController {
$type = "/Home/PromoteCoin/myCoin"; $type = "/Home/PromoteCoin/myCoin";
$data = [ $data = [
'logid' => 'pt_'.time(), 'logid' => 'pt_'.time(),
'admin_id' => PID, 'promote_id' => PID,
'type' => $type, 'type' => $type,
'dataname' => '我的平台币', 'dataname' => '我的平台币',
'status' => 0, 'status' => 0,
@ -1211,7 +1211,7 @@ class DownloadController extends BaseController {
$addtime = time(); $addtime = time();
$data = [ $data = [
'logid' => 'cz_'.time(), 'logid' => 'cz_'.time(),
'admin_id' => PID, 'promote_id' => PID,
'type' => '/Home/Query/recharge', 'type' => '/Home/Query/recharge',
'dataname' => '充值明细数据', 'dataname' => '充值明细数据',
'status' => 0, 'status' => 0,
@ -1322,7 +1322,7 @@ class DownloadController extends BaseController {
$addtime = time(); $addtime = time();
$data = [ $data = [
'logid' => 'wj_'.time(), 'logid' => 'wj_'.time(),
'admin_id' => PID, 'promote_id' => PID,
'type' => '/Home/Query/userRecharges', 'type' => '/Home/Query/userRecharges',
'dataname' => '充值玩家数据', 'dataname' => '充值玩家数据',
'status' => 0, 'status' => 0,
@ -1420,7 +1420,7 @@ class DownloadController extends BaseController {
$addtime = time(); $addtime = time();
$data1 = [ $data1 = [
'logid' => 'tg_'.time(), 'logid' => 'tg_'.time(),
'admin_id' => PID, 'promote_id' => PID,
'type' => '/Home/Query/achievement', 'type' => '/Home/Query/achievement',
'dataname' => '推广员业绩', 'dataname' => '推广员业绩',
'status' => 0, 'status' => 0,
@ -1554,7 +1554,7 @@ class DownloadController extends BaseController {
$addtime = time(); $addtime = time();
$data = [ $data = [
'logid' => 'js_'.time(), 'logid' => 'js_'.time(),
'admin_id' => PID, 'promote_id' => PID,
'type' => '/Home/Query/userRoles', 'type' => '/Home/Query/userRoles',
'dataname' => '角色查询数据', 'dataname' => '角色查询数据',
'status' => 0, 'status' => 0,
@ -1651,7 +1651,7 @@ class DownloadController extends BaseController {
$addtime = time(); $addtime = time();
$data = [ $data = [
'logid' => 'hz_'.time(), 'logid' => 'hz_'.time(),
'admin_id' => PID, 'promote_id' => PID,
'type' => '/Home/Query/summary', 'type' => '/Home/Query/summary',
'dataname' => '数据汇总数据', 'dataname' => '数据汇总数据',
'status' => 0, 'status' => 0,
@ -3278,7 +3278,7 @@ class DownloadController extends BaseController {
$conditions = json_encode($map,TRUE); $conditions = json_encode($map,TRUE);
$data = [ $data = [
'logid' => 'remitrecord_'.time(), 'logid' => 'remitrecord_'.time(),
'admin_id' => PID, 'promote_id' => PID,
'type' => '/Home/Finance/withdrawRecord', 'type' => '/Home/Finance/withdrawRecord',
'dataname' => '汇款证明', 'dataname' => '汇款证明',
'status' => 0, 'status' => 0,

Write Preview
Loading…
Cancel
Save