修改bug

master
ELF 5 years ago
parent 14e36e31bb
commit 7acf0e13bf

@ -755,7 +755,7 @@ class QueryController extends BaseController
$timeout = 0; $timeout = 0;
$records = []; $records = [];
if (intval($endTime - $beginTime) / (24 * 3600) <= 30) { if (intval($endTime - $beginTime) / (24 * 3600) <= 31) {
$userRepository = new UserRepository(); $userRepository = new UserRepository();
$spendRepository = new SpendRepository(); $spendRepository = new SpendRepository();
$payGameCountList = $spendRepository->getPayGameCountGroupByDay($params); $payGameCountList = $spendRepository->getPayGameCountGroupByDay($params);
@ -2009,13 +2009,21 @@ class QueryController extends BaseController
$rows = []; $rows = [];
if (count($ids) > 0) { if (count($ids) > 0) {
$rows = M('promote', 'tab_')->field(['id', 'parent_id'])->where(['parent_id' => ['in', $ids]])->select(); $rows = M('promote', 'tab_')
->field(['id', 'chain'])
->where(['chain' => ['like', [$parent['chain'] . $parent['id'] . '/%']], 'level' => ['gt', $parent['level'] + 1]])
->select();
} }
$basicPromotes = []; $basicPromotes = [];
foreach ($ids as $id) {
foreach ($rows as $row) { foreach ($rows as $row) {
$basicPromotes[$row['id']] = $row['parent_id']; $needChain = $parent['chain'] . $parent['id'] . '/' . $id . '/';
if (strpos($row['chain'], $needChain) !== false) {
$basicPromotes[$row['id']] = $id;
}
}
} }
$params = [ $params = [
'isContainSubs' => true, 'isContainSubs' => true,
'basicPromotes' => $basicPromotes, 'basicPromotes' => $basicPromotes,

@ -242,7 +242,7 @@
<script type="text/javascript" src="__JS__/common.js"></script> <script type="text/javascript" src="__JS__/common.js"></script>
<eq name='timeout' value='1'> <eq name='timeout' value='1'>
<script> <script>
layer.msg('时间间隔不能超过30天'); layer.msg('时间间隔不能超过31天');
</script> </script>
</eq> </eq>
<script> <script>

Loading…
Cancel
Save