From c56e278ff6f97e3715029c2343626145f9cab1c0 Mon Sep 17 00:00:00 2001
From: majun <3060162534@qq.com>
Date: Thu, 5 Dec 2024 11:30:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=A0=BC=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/channel/channel.go                                     |  5 +++--
 internal/controller/channel/channel_v1_get_channel.go      | 12 ++++++++----
 internal/controller/channel/channel_v1_get_channel_list.go | 12 ++++++++----
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/api/channel/channel.go b/api/channel/channel.go
index 3af0dd8..b6a0e09 100644
--- a/api/channel/channel.go
+++ b/api/channel/channel.go
@@ -8,9 +8,10 @@ import (
 	"context"
 
 	"practice_Go/api/channel/v1"
+	"practice_Go/internal/model/dto"
 )
 
 type IChannelV1 interface {
-	GetChannel(ctx context.Context, req *v1.GetChannelReq) (res *v1.GetChannelRes, err error)
-	GetChannelList(ctx context.Context, req *v1.GetChannelListReq) (res *v1.GetChannelListRes, err error)
+	GetChannel(ctx context.Context, req *v1.GetChannelReq) (*dto.Result, error)
+	GetChannelList(ctx context.Context, req *v1.GetChannelListReq) (*dto.Result, error)
 }
diff --git a/internal/controller/channel/channel_v1_get_channel.go b/internal/controller/channel/channel_v1_get_channel.go
index 96916df..87b29e4 100644
--- a/internal/controller/channel/channel_v1_get_channel.go
+++ b/internal/controller/channel/channel_v1_get_channel.go
@@ -5,17 +5,21 @@ import (
 
 	"practice_Go/api/channel/v1"
 	"practice_Go/internal/dao"
+	"practice_Go/internal/model/dto"
 	"practice_Go/internal/model/entity"
 )
 
-func (c *ControllerV1) GetChannel(ctx context.Context, req *v1.GetChannelReq) (res *v1.GetChannelRes, err error) {
-	res = &v1.GetChannelRes{}
-	err = dao.GoChannels.Ctx(ctx).WherePri(req.Id).Scan(&res.Channel)
+func (c *ControllerV1) GetChannel(ctx context.Context, req *v1.GetChannelReq) (*dto.Result, error) {
+	res := v1.GetChannelRes{}
+	err := dao.GoChannels.Ctx(ctx).WherePri(req.Id).Scan(&res.Channel)
 	query := dao.GoShows.Ctx(ctx).With(entity.GoUsers{}).Where("channel_id =?", req.Id)
 	if req.FlagType != 0 {
 		query = query.Where("flag_type =?", req.FlagType)
 	}
 	err = query.Scan(&res.List)
 	res.Channel.Status, err = dao.GoChannelSubscriptions.Ctx(ctx).Wheref("channel_id =? and user_id =?", req.Id, req.UserId).Exist()
-	return
+	if err != nil {
+		return dto.Error(err.Error()), nil
+	}
+	return dto.SuccessWithData(res), nil
 }
diff --git a/internal/controller/channel/channel_v1_get_channel_list.go b/internal/controller/channel/channel_v1_get_channel_list.go
index c05cbde..4e8df9b 100644
--- a/internal/controller/channel/channel_v1_get_channel_list.go
+++ b/internal/controller/channel/channel_v1_get_channel_list.go
@@ -5,10 +5,14 @@ import (
 
 	"practice_Go/api/channel/v1"
 	"practice_Go/internal/dao"
+	"practice_Go/internal/model/dto"
 )
 
-func (c *ControllerV1) GetChannelList(ctx context.Context, req *v1.GetChannelListReq) (res *v1.GetChannelListRes, err error) {
-	res = &v1.GetChannelListRes{}
-	err = dao.GoChannels.Ctx(ctx).Fields("id, name").Scan(&res.List)
-	return
+func (c *ControllerV1) GetChannelList(ctx context.Context, req *v1.GetChannelListReq) (*dto.Result, error) {
+	res := v1.GetChannelListRes{}
+	err := dao.GoChannels.Ctx(ctx).Fields("id, name").Scan(&res.List)
+	if err!= nil {
+		return dto.Error(err.Error()), nil
+	}
+	return dto.SuccessWithData(res.List), nil
 }