Commit d3528b45 authored by zhoujun's avatar zhoujun

提示

parent 4f3554dc
......@@ -74,7 +74,7 @@ class AdminController extends Controller
$pageNum = 20;
$startTime = $postData['startTime'] ?? '';
$endTime = $postData['endTime'] ?? '';
$status = $postData['status'] ?? 0;
$status = $postData['status'] ?? 1;
$userName = $postData['user'] ?? '';
$paginateAppends['status'] = $status;
......@@ -92,6 +92,8 @@ class AdminController extends Controller
return $query->where('updated_at','>',$startTime);
})->when($endTime != '', function ($query) use ($endTime) {
return $query->where('updated_at','<',$endTime);
})->when($status == 0, function ($query) use ($status) {
return $query->orderBy('status','ASC');
})->orderBy('id','ASC')->select('id', 'uid', 'img_url', 'status', 'updated_at')->paginate($pageNum);
if($startTime != '') $paginateAppends['startTime'] = $startTime;
if($endTime != '') $paginateAppends['endTime'] = $endTime;
......
......@@ -126,9 +126,10 @@ class AldUserController extends Controller
if (empty($userExtra->aldzn_info)) {
return $this->jsonReturn(4003, "请您先绑定Orange识别码后再来领取哦~");
}
$gmService = new AldGmService();
$aldzn_info = json_decode($userExtra->aldzn_info, true);
//修补没有serverId的数据
if (!isset($aldzn_info['serverId']) || empty($aldzn_info['serverId'])) {
......@@ -143,7 +144,7 @@ class AldUserController extends Controller
$serverId = $aldzn_info['serverId'];
$userId = $aldzn_info['userId'];
$channel = $aldzn_info['channel'];
if(!in_array($aldzn_info['channel'],config('sign.channel'))) return $this->jsonReturn(80001, '很抱歉,非指定平台用户无法参与本次活动');
$roleList = $gmService->getRoles($serverId, $userId, $channel);
if ($roleList === false) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment