xiaogang 4 سال پیش
والد
کامیت
0b775b705c
2فایلهای تغییر یافته به همراه13 افزوده شده و 11 حذف شده
  1. 2 2
      app/Admin/Controllers/NoticeController.php
  2. 11 9
      app/Services/NoticeService.php

+ 2 - 2
app/Admin/Controllers/NoticeController.php

@@ -78,8 +78,8 @@ class NoticeController extends AdminController
             $form->display('created_at');
             $form->display('created_at');
             $form->display('updated_at');
             $form->display('updated_at');
             $form->saved(function ($res){
             $form->saved(function ($res){
-               // dd($res->content);
-               //推送消息
+                // dd($res->content);
+                //推送消息
                 JPushService::pushNotify([
                 JPushService::pushNotify([
                     //标题
                     //标题
                     'title' => $res->title,
                     'title' => $res->title,

+ 11 - 9
app/Services/NoticeService.php

@@ -7,6 +7,7 @@ namespace App\Services;
 use App\Models\DynamicZanModel;
 use App\Models\DynamicZanModel;
 use App\Models\UserLikeModel;
 use App\Models\UserLikeModel;
 use App\Models\UserSystemMessageModel;
 use App\Models\UserSystemMessageModel;
+use Illuminate\Support\Facades\DB;
 use PHPUnit\Util\Exception;
 use PHPUnit\Util\Exception;
 use function Symfony\Component\Translation\t;
 use function Symfony\Component\Translation\t;
 
 
@@ -23,13 +24,16 @@ class NoticeService
      * 获取喜欢列表
      * 获取喜欢列表
      */
      */
     public function get_like_list($param){
     public function get_like_list($param){
-        $query = UserLikeModel::query();
+
         if($param['type']==1){
         if($param['type']==1){
             //我喜欢
             //我喜欢
+            $query = UserLikeModel::query();
             $query = $query->with(['like_user'=>function($query){
             $query = $query->with(['like_user'=>function($query){
                 $query->select('id','sex','is_vip','tencent_im_user_id');
                 $query->select('id','sex','is_vip','tencent_im_user_id');
             },'like_user_info'])->where('user_id',$param['user_id']);
             },'like_user_info'])->where('user_id',$param['user_id']);
 
 
+            $query = $query->orderByDesc('id')
+                ->paginate(request('perPage',20));
 //            $query = $query->leftJoin('users','users_like.like_id','=','users.id')
 //            $query = $query->leftJoin('users','users_like.like_id','=','users.id')
 //                ->leftJoin('users_info','users_like.like_id','=','users_info.user_id')
 //                ->leftJoin('users_info','users_like.like_id','=','users_info.user_id')
 //                ->where('users_like.user_id',$param['user_id'])
 //                ->where('users_like.user_id',$param['user_id'])
@@ -40,19 +44,17 @@ class NoticeService
 //            $query = $query->with(['user'=>function($query){
 //            $query = $query->with(['user'=>function($query){
 //                $query->select('id','sex','is_vip','tencent_im_user_id');
 //                $query->select('id','sex','is_vip','tencent_im_user_id');
 //            },'user_info'])->where('like_id',$param['user_id']);
 //            },'user_info'])->where('like_id',$param['user_id']);
-
-            $query = $query->leftJoin('users','users_like.user_id','=','users.id')
-                ->leftJoin('users_info','users_like.user_id','=','users_info.user_id')
-                ->where('users_like.like_id',$param['user_id'])
-                ->select(['users_like.id','users_like.user_id','users_like.like_id','users_like.atime','users.sex','users.is_vip','users.tencent_im_user_id','users_info.nickname','users_info.avatar','users_info.birthday','users_info.work','users_info.height','users_info.weight']);
-
+            $query = DB::table('users_like')->unions(DB::table('users')->get())->get();
+//            $query = $query->leftJoin('users','users_like.user_id','=','users.id')
+//                ->leftJoin('users_info','users_like.user_id','=','users_info.user_id')
+//                ->where('users_like.like_id',$param['user_id'])
+//                ->select(['users_like.id','users_like.user_id','users_like.like_id','users_like.atime','users.sex','users.is_vip','users.tencent_im_user_id','users_info.nickname','users_info.avatar','users_info.birthday','users_info.work','users_info.height','users_info.weight']);
 
 
 
 
             //清除喜欢我未读状态
             //清除喜欢我未读状态
             UserLikeModel::query()->where(['like_id'=>$param['user_id'],'status'=>0])->update(['status'=>1]);
             UserLikeModel::query()->where(['like_id'=>$param['user_id'],'status'=>0])->update(['status'=>1]);
         }
         }
-        $query = $query->orderByDesc('id')
-            ->paginate(request('perPage',20));
+
 
 
         $query = $query->toArray();
         $query = $query->toArray();
         foreach ($query['data'] as $k=>$v){
         foreach ($query['data'] as $k=>$v){