From 82e83ca30f6ae19ba3c22f72c3a145e8fba7a6fe Mon Sep 17 00:00:00 2001
From: zetaloop <zetaloop@outlook.com>
Date: Sat, 4 Apr 2026 01:43:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=20player-api=20?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E=E9=80=BB=E8=BE=91=E4=B8=8E?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=81=8F=E7=A7=BB=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/player/api/internal/logic/player/getServiceLogic.go   | 3 ++-
 .../api/internal/logic/player/listPlayerServicesLogic.go  | 8 ++++++--
 app/player/api/internal/logic/player/listPlayersLogic.go  | 7 +++++--
 app/player/api/internal/logic/player/listServicesLogic.go | 8 ++++++--
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/player/api/internal/logic/player/getServiceLogic.go b/app/player/api/internal/logic/player/getServiceLogic.go
index 504a353..3e8c79c 100644
--- a/app/player/api/internal/logic/player/getServiceLogic.go
+++ b/app/player/api/internal/logic/player/getServiceLogic.go
@@ -38,7 +38,8 @@ func (l *GetServiceLogic) GetService(req *types.GetServiceReq) (resp *types.Play
 		return nil, err
 	}
 
-	err = copier.Copy(resp, &s)
+	resp = &types.PlayerService{}
+	err = copier.Copy(resp, s.PlayerServices)
 	if err != nil {
 		logx.Errorf("GetServiceLogic.GetService err: %v", err)
 		return nil, err
diff --git a/app/player/api/internal/logic/player/listPlayerServicesLogic.go b/app/player/api/internal/logic/player/listPlayerServicesLogic.go
index 4ef46ee..3149304 100644
--- a/app/player/api/internal/logic/player/listPlayerServicesLogic.go
+++ b/app/player/api/internal/logic/player/listPlayerServicesLogic.go
@@ -31,8 +31,12 @@ func NewListPlayerServicesLogic(ctx context.Context, svcCtx *svc.ServiceContext)
 
 func (l *ListPlayerServicesLogic) ListPlayerServices(req *types.ListPlayerServicesReq) (resp *types.PlayerServiceListResp, err error) {
 	resp = &types.PlayerServiceListResp{}
+	page := int64(0)
+	if req.Limit > 0 {
+		page = req.Offset / req.Limit
+	}
 	s, err := l.svcCtx.PlayerRpc.SearchPlayerServices(l.ctx, &playerservice.SearchPlayerServicesReq{
-		Page:     req.Offset,
+		Page:     page,
 		Limit:    req.Limit,
 		PlayerId: req.Id,
 	})
@@ -42,7 +46,7 @@ func (l *ListPlayerServicesLogic) ListPlayerServices(req *types.ListPlayerServic
 	for _, v := range s.PlayerServices {
 		temp := types.PlayerService{}
 		err = copier.Copy(&temp, &v)
-		if err == nil {
+		if err != nil {
 			logx.Errorf("ListPlayerServicesLogic.ListPlayerServices copier.Copy err: %v", err)
 			continue
 		}
diff --git a/app/player/api/internal/logic/player/listPlayersLogic.go b/app/player/api/internal/logic/player/listPlayersLogic.go
index 9345f16..57ff185 100644
--- a/app/player/api/internal/logic/player/listPlayersLogic.go
+++ b/app/player/api/internal/logic/player/listPlayersLogic.go
@@ -30,9 +30,12 @@ func NewListPlayersLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ListP
 }
 
 func (l *ListPlayersLogic) ListPlayers(req *types.PlayerListReq) (resp *types.PlayerListResp, err error) {
-	// todo: add your logic here and delete this line
+	page := int64(0)
+	if req.Limit > 0 {
+		page = req.Offset / req.Limit
+	}
 	p, err := l.svcCtx.PlayerRpc.SearchPlayers(l.ctx, &pb.SearchPlayersReq{
-		Page:   &req.Offset,
+		Page:   &page,
 		Limit:  &req.Limit,
 		Gender: &req.Gender,
 	})
diff --git a/app/player/api/internal/logic/player/listServicesLogic.go b/app/player/api/internal/logic/player/listServicesLogic.go
index 22f5030..044569f 100644
--- a/app/player/api/internal/logic/player/listServicesLogic.go
+++ b/app/player/api/internal/logic/player/listServicesLogic.go
@@ -31,8 +31,12 @@ func NewListServicesLogic(ctx context.Context, svcCtx *svc.ServiceContext) *List
 
 func (l *ListServicesLogic) ListServices(req *types.PageReq) (resp *types.PlayerServiceListResp, err error) {
 	resp = &types.PlayerServiceListResp{}
+	page := int64(0)
+	if req.Limit > 0 {
+		page = req.Offset / req.Limit
+	}
 	s, err := l.svcCtx.PlayerRpc.SearchPlayerServices(l.ctx, &playerservice.SearchPlayerServicesReq{
-		Page:     req.Offset,
+		Page:     page,
 		Limit:    req.Limit,
 		PlayerId: 0,
 	})
@@ -42,7 +46,7 @@ func (l *ListServicesLogic) ListServices(req *types.PageReq) (resp *types.Player
 	for _, v := range s.PlayerServices {
 		temp := types.PlayerService{}
 		err = copier.Copy(&temp, &v)
-		if err == nil {
+		if err != nil {
 			logx.Errorf("ListPlayerServicesLogic.ListPlayerServices copier.Copy err: %v", err)
 			continue
 		}