更新

app/Http/Controllers/Api/NoticeController.php

@@ -30,8 +30,8 @@ class NoticeController extends Controller
             //未读喜欢数量
             $res['like_num'] = UserLikeModel::query()->where(["like_id"=>$user->id,'status'=>0])->count();
             //未读点赞数量
-            $res['zan_num'] = DynamicModel::query()->with(["users"])->where('status','=',0)
-                ->whereHas("users",function($query)use($user){
+            $res['zan_num'] = DynamicModel::query()->with(["user"])->where('status','=',0)
+                ->whereHas("user",function($query)use($user){
                     $query->where('id',$user->id)->select();
                 })->count();
             //未读系统消息

app/Http/Controllers/Api/PayNotifyController.php

@@ -30,4 +30,11 @@ class PayNotifyController extends Controller
         Log::info($data);
         return $alipay->success();
     }
+
+    /**
+     * 支付回调业务处理
+     */
+    public function order_do_sth($order){
+
+    }
 }

app/Models/DynamicModel.php

@@ -10,12 +10,12 @@ class DynamicModel extends BaseModel
     protected $fillable = ['user_id', 'content','img_url','type','status','zan_num','site','tag'];
 
 
-    public function users()
+    public function user()
     {
         return $this->belongsTo(User::class,'user_id','id');
     }
 
-    public function users_info()
+    public function user_info()
     {
         return $this->belongsTo(UserInfoModel::class,'user_id','user_id');
     }

app/Models/DynamicZanModel.php

@@ -11,12 +11,12 @@ class DynamicZanModel extends BaseModel
     protected $fillable = ['user_id', 'dynamic_id','status','atime'];
 
 
-    public function users()
+    public function user()
     {
         return $this->belongsTo(User::class,'user_id','id');
     }
 
-    public function users_info()
+    public function user_info()
     {
         return $this->belongsTo(UserInfoModel::class,'user_id','user_id');
     }

app/Models/UserLikeModel.php

@@ -11,22 +11,22 @@ class UserLikeModel extends BaseModel
     protected $fillable = ['user_id', 'like_id','status','atime'];
 
 
-    public function users()
+    public function user()
     {
         return $this->belongsTo(User::class,'user_id','id');
     }
 
-    public function users_info()
+    public function user_info()
     {
         return $this->belongsTo(UserInfoModel::class,'user_id','user_id');
     }
 
-    public function like_users()
+    public function like_user()
     {
         return $this->belongsTo(User::class,'like_id','id');
     }
 
-    public function like_users_info()
+    public function like_user_info()
     {
         return $this->belongsTo(UserInfoModel::class,'like_id','user_id');
     }

app/Models/UserLookModel.php

@@ -10,12 +10,12 @@ class UserLookModel extends BaseModel
     public $timestamps = false;
     protected $fillable = ['user_id', 'look_id','atime'];
 
-    public function users()
+    public function user()
     {
         return $this->belongsTo(User::class,'look_id','id');
     }
 
-    public function users_info()
+    public function user_info()
     {
         return $this->belongsTo(UserInfoModel::class,'look_id','user_id');
     }

app/Services/DynamicService.php

@@ -70,9 +70,9 @@ class DynamicService
      */
     public function dynamic_list($where){
         $dynamic = DynamicModel::query();
-        $dynamic = $dynamic->with(["users"=>function($query){
+        $dynamic = $dynamic->with(["user"=>function($query){
                 $query->select('id','sex','is_vip','tencent_im_user_id');
-            },'users_info']);
+            },'user_info']);
         //查询条件
         //类型  type 1全部  2关注  3附近
         if($where['type']==2){
@@ -85,7 +85,7 @@ class DynamicService
 
         //性别
         if($where['look_type']!=3){
-            $dynamic = $dynamic->whereHas('users',function($query)use($where){
+            $dynamic = $dynamic->whereHas('user',function($query)use($where){
                 $query->where('sex',$where['look_type'])->select();
             });
         }

app/Services/NoticeService.php

@@ -24,14 +24,14 @@ class NoticeService
         $query = UserLikeModel::query();
         if($param['type']==1){
             //我喜欢
-            $query = $query->with(['like_users'=>function($query){
+            $query = $query->with(['like_user'=>function($query){
                 $query->select('id','sex','is_vip','tencent_im_user_id');
-            },'like_users_info'])->where('user_id',$param['user_id']);
+            },'like_user_info'])->where('user_id',$param['user_id']);
         }else{
             //喜欢我
-            $query = $query->with(['users'=>function($query){
+            $query = $query->with(['user'=>function($query){
                 $query->select('id','sex','is_vip','tencent_im_user_id');
-            },'users_info'])->where('like_id',$param['user_id']);
+            },'user_info'])->where('like_id',$param['user_id']);
 
             //清除喜欢我未读状态
             UserLikeModel::query()->where(['like_id'=>$param['user_id'],'status'=>0])->update(['status'=>1]);
@@ -56,9 +56,9 @@ class NoticeService
             //我赞了他
             $query = $query->with(['dynamic'=>function($query){
                 $query->select('id','content','img_url');
-            },'dynamic.users'=>function($querty){
+            },'dynamic.user'=>function($querty){
                 $querty->select('id','sex','is_vip','tencent_im_user_id');
-            },'dynamic.users_info'])
+            },'dynamic.user_info'])
             ->where('user_id',$param['user_id']);
         }else{
             //他赞了我

app/Services/UserService.php

@@ -34,9 +34,9 @@ class UserService
      */
     public function looked_me($param){
         $res = UserLookModel::query()
-            ->with(['users'=>function($query){
+            ->with(['user'=>function($query){
                 $query->select('id','sex','is_vip','tencent_im_user_id');
-            },'users_info'])
+            },'user_info'])
             ->where('user_id',$param['user_id'])
             ->paginate(request('perPage',20));
         return $res;