Merge pull request '优化充值查看' (#433) from feature/more_payment into master

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/433
master
廖金灵 3 years ago
commit 4c4a2c0b22

@ -1167,10 +1167,9 @@ class PlatformController extends ThinkController
$map['s.market_admin_id'] = is_login(); $map['s.market_admin_id'] = is_login();
} else if (!empty($_REQUEST['admin_id'])) { } else if (!empty($_REQUEST['admin_id'])) {
$map['s.market_admin_id'] = $_REQUEST['admin_id']; $map['s.market_admin_id'] = $_REQUEST['admin_id'];
} else {
//为数据权限添加
setPowerPromoteIds($map, 'tp1.id');
} }
setPowerPromoteIds($map, 'tp1.id');
D("Spend")->addSubsiteWhere($map,"s"); D("Spend")->addSubsiteWhere($map,"s");
$data = SM('promote', 'tab_')->alias('tp1') $data = SM('promote', 'tab_')->alias('tp1')
@ -1184,6 +1183,7 @@ class PlatformController extends ThinkController
->order('count desc') ->order('count desc')
->select(); ->select();
//今日/本周/本月不变 //今日/本周/本月不变
$tmap = $map; $tmap = $map;
if(isset($map['pay_time'])){ if(isset($map['pay_time'])){

Loading…
Cancel
Save