调整消息获取
parent
85a056bff0
commit
03a604c2ff
|
|
@ -51,7 +51,7 @@ class MessageController extends Controller
|
||||||
*/
|
*/
|
||||||
public function batchRead(Request $request)
|
public function batchRead(Request $request)
|
||||||
{
|
{
|
||||||
$ids = Message::with('logs')->where('user_id', 0)->whereDoesntHave('logs', function ($q) use ($request) {
|
$ids = Message::userMessages($request->user())->with('logs')->where('user_id', 0)->whereDoesntHave('logs', function ($q) use ($request) {
|
||||||
return $q->where('user_id', '=', $request->user()->id);
|
return $q->where('user_id', '=', $request->user()->id);
|
||||||
})->pluck('id')->toArray();
|
})->pluck('id')->toArray();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,7 @@ class Message extends Model
|
||||||
|
|
||||||
public static function userMessages(User $user)
|
public static function userMessages(User $user)
|
||||||
{
|
{
|
||||||
return self::where(function ($q) use ($user) {
|
return self::where('created_at', '>=', $user->created_at->subDays(7))->where(function ($q) use ($user) {
|
||||||
$q->where('user_id', $user->id)->orWhere('user_id', 0);
|
$q->where('user_id', $user->id)->orWhere('user_id', 0);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue