Commit 636046f1 authored by zhoujun's avatar zhoujun

调整日志类别

parent 5bff1ec4
Pipeline #2179 passed with stage
in 0 seconds
...@@ -31,7 +31,6 @@ class Kernel extends ConsoleKernel ...@@ -31,7 +31,6 @@ class Kernel extends ConsoleKernel
{ {
$schedule->command('ClearLogData')->dailyAt('3:00')->withoutOverlapping();//每天凌晨3:00点钟跑一次 $schedule->command('ClearLogData')->dailyAt('3:00')->withoutOverlapping();//每天凌晨3:00点钟跑一次
$schedule->command('SingleWithdrawal')->everyFiveMinutes()->withoutOverlapping();//每5分钟跑一次 $schedule->command('SingleWithdrawal')->everyFiveMinutes()->withoutOverlapping();//每5分钟跑一次
$schedule->command('PolymerizeWithdrawal')->everyFiveMinutes()->withoutOverlapping();//每5分钟跑一次 $schedule->command('PolymerizeWithdrawal')->everyFiveMinutes()->withoutOverlapping();//每5分钟跑一次
$schedule->command('SingleDayWithdrawal')->everyFiveMinutes()->withoutOverlapping();//每5分钟跑一次 $schedule->command('SingleDayWithdrawal')->everyFiveMinutes()->withoutOverlapping();//每5分钟跑一次
......
...@@ -77,7 +77,6 @@ class AccountService implements IAccountService ...@@ -77,7 +77,6 @@ class AccountService implements IAccountService
$type = $postData['type'] ?? 0; $type = $postData['type'] ?? 0;
$uid = $postData['uid'] ?? ''; $uid = $postData['uid'] ?? '';
if($uid == '') return []; if($uid == '') return [];
$account = AccountModel::where(function ($query) use ($uid) { $account = AccountModel::where(function ($query) use ($uid) {
return $query->where('user_id',$uid)->orWhere('platform_id',$uid); return $query->where('user_id',$uid)->orWhere('platform_id',$uid);
})->when($platform > 0, function ($query) use ($platform) { })->when($platform > 0, function ($query) use ($platform) {
...@@ -92,13 +91,12 @@ class AccountService implements IAccountService ...@@ -92,13 +91,12 @@ class AccountService implements IAccountService
$startTime = date('Y-m-d H:i:s',strtotime($start) - 1); $startTime = date('Y-m-d H:i:s',strtotime($start) - 1);
return $query->where('log_time', '>',$startTime); return $query->where('log_time', '>',$startTime);
})->when($end != '', function ($query) use ($end) { })->when($end != '', function ($query) use ($end) {
$endTime = date('Y-m-d H:i:s',strtotime($end) + 1); $endTime = date('Y-m-d H:i:s',strtotime($end) + 86401);
return $query->where('log_time', '<',$endTime); return $query->where('log_time', '<',$endTime);
})->when($logType > 0, function ($query) use ($logType) { })->when($logType > 0, function ($query) use ($logType) {
if($logType == 1) return $query->whereIn('op_code',[1,2]); if($logType == 1) return $query->whereIn('op_code',[1,2]);
if($logType == 2) return $query->where('op_code',3); if($logType == 2) return $query->where('op_code',3);
})->select('id','op_code','sycee','sycee_pool','sycee_balance','sycee_pool_balance','log_time','extra')->orderBy('id','DESC')->paginate($pagePerNum, ['*'], 'currentPage',$currentPage); })->select('id','op_code','sycee','sycee_pool','sycee_balance','sycee_pool_balance','log_time','extra')->orderBy('id','DESC')->paginate($pagePerNum, ['*'], 'currentPage',$currentPage);
$array['totalNum'] = $logs->total(); $array['totalNum'] = $logs->total();
$array['totalPage'] = $logs->lastPage(); $array['totalPage'] = $logs->lastPage();
$platformArr = config(env('ENVIRONMENT') . '.PLATFORM'); $platformArr = config(env('ENVIRONMENT') . '.PLATFORM');
...@@ -109,11 +107,11 @@ class AccountService implements IAccountService ...@@ -109,11 +107,11 @@ class AccountService implements IAccountService
$tem['openId'] = $account->user_id; $tem['openId'] = $account->user_id;
$tem['platformName'] = $platformArr[$account->platform] ?? ''; $tem['platformName'] = $platformArr[$account->platform] ?? '';
$tem['channelName'] = $channelArr[$account->channel] ?? ''; $tem['channelName'] = $channelArr[$account->channel] ?? '';
if($log->op_code == 3){ $tem['typeName'] = '';
$tem['typeName'] = '消耗'; if($log->op_code == 1) $tem['typeName'] = '产出(创角)';
}else{ if($log->op_code == 2) $tem['typeName'] = '产出(观看广告)';
$tem['typeName'] = '产出'; if($log->op_code == 3) $tem['typeName'] = '消耗(元宝提现)';
} if($log->op_code == 4) $tem['typeName'] = '产出(提现失败返还)';
$tem['beforeNum'] = $log->sycee_balance - $log->sycee; $tem['beforeNum'] = $log->sycee_balance - $log->sycee;
$tem['optionNum'] = $log->sycee; $tem['optionNum'] = $log->sycee;
$tem['afterNum'] = $log->sycee_balance; $tem['afterNum'] = $log->sycee_balance;
......
...@@ -69,7 +69,7 @@ class WarnService implements IWarnService ...@@ -69,7 +69,7 @@ class WarnService implements IWarnService
$startTime = date('Y-m-d H:i:s',strtotime($start) - 1); $startTime = date('Y-m-d H:i:s',strtotime($start) - 1);
return $query->where('created_at', '>',$startTime); return $query->where('created_at', '>',$startTime);
})->when($end != '', function ($query) use ($end) { })->when($end != '', function ($query) use ($end) {
$endTime = date('Y-m-d H:i:s',strtotime($end) + 1); $endTime = date('Y-m-d H:i:s',strtotime($end) + 86401);
return $query->where('created_at', '<',$endTime); return $query->where('created_at', '<',$endTime);
})->select('id', 'platform', 'channel', 'name', 'phone','status','op_user', 'created_at')->orderBy('id', 'DESC')->paginate($pagePerNum, ['*'], 'currentPage', $currentPage); })->select('id', 'platform', 'channel', 'name', 'phone','status','op_user', 'created_at')->orderBy('id', 'DESC')->paginate($pagePerNum, ['*'], 'currentPage', $currentPage);
$array['totalNum'] = $lists->total(); $array['totalNum'] = $lists->total();
...@@ -341,7 +341,7 @@ class WarnService implements IWarnService ...@@ -341,7 +341,7 @@ class WarnService implements IWarnService
$startTime = date('Y-m-d H:i:s',strtotime($start) - 1); $startTime = date('Y-m-d H:i:s',strtotime($start) - 1);
return $query->where('send_time','>',$startTime); return $query->where('send_time','>',$startTime);
})->when($end > 0, function ($query) use ($end) { })->when($end > 0, function ($query) use ($end) {
$endTime = date('Y-m-d H:i:s',strtotime($end) + 1); $endTime = date('Y-m-d H:i:s',strtotime($end) + 86401);
return $query->where('send_time','<',$endTime); return $query->where('send_time','<',$endTime);
})->select('id','platform','channel','status','type','config_id','people_id','msg','remark','send_time','created_at')->orderBy('id', 'DESC')->paginate($pagePerNum, ['*'], 'currentPage', $currentPage); })->select('id','platform','channel','status','type','config_id','people_id','msg','remark','send_time','created_at')->orderBy('id', 'DESC')->paginate($pagePerNum, ['*'], 'currentPage', $currentPage);
$array['totalNum'] = $lists->total(); $array['totalNum'] = $lists->total();
......
...@@ -20,7 +20,7 @@ Route::group(['namespace' => 'Api'],function() { ...@@ -20,7 +20,7 @@ Route::group(['namespace' => 'Api'],function() {
}); });
Route::group(['namespace' => 'Api','middleware' => ['user.login']], function () { Route::group(['namespace' => 'Api'], function () {
Route::post('/logout','LoginController@getLogout');//退出 Route::post('/logout','LoginController@getLogout');//退出
Route::group(['prefix' => 'user'],function() { Route::group(['prefix' => 'user'],function() {
......
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