From b93c2d4708e331aaad6fe3d13162ee9e53d14fec Mon Sep 17 00:00:00 2001 From: Hiven Date: Thu, 20 Jul 2023 15:55:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../home-user-auth/internal/handler/routes.go | 2 +- .../internal/handler/userorderlisthandler.go | 28 +++++++++++++++++++ ...rderlistlogic.go => userorderlistlogic.go} | 10 +++---- server/home-user-auth/internal/types/types.go | 4 +-- server_api/home-user-auth.api | 10 +++---- 5 files changed, 41 insertions(+), 13 deletions(-) create mode 100644 server/home-user-auth/internal/handler/userorderlisthandler.go rename server/home-user-auth/internal/logic/{getuserorderlistlogic.go => userorderlistlogic.go} (93%) diff --git a/server/home-user-auth/internal/handler/routes.go b/server/home-user-auth/internal/handler/routes.go index 9d1c303a..88082836 100644 --- a/server/home-user-auth/internal/handler/routes.go +++ b/server/home-user-auth/internal/handler/routes.go @@ -75,7 +75,7 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { { Method: http.MethodGet, Path: "/api/user/order-list", - Handler: GetUserOrderListHandler(serverCtx), + Handler: UserOrderListHandler(serverCtx), }, { Method: http.MethodGet, diff --git a/server/home-user-auth/internal/handler/userorderlisthandler.go b/server/home-user-auth/internal/handler/userorderlisthandler.go new file mode 100644 index 00000000..c48130e8 --- /dev/null +++ b/server/home-user-auth/internal/handler/userorderlisthandler.go @@ -0,0 +1,28 @@ +package handler + +import ( + "net/http" + + "fusenapi/utils/basic" + + "fusenapi/server/home-user-auth/internal/logic" + "fusenapi/server/home-user-auth/internal/svc" + "fusenapi/server/home-user-auth/internal/types" +) + +func UserOrderListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + + var req types.UserOrderListReq + userinfo, err := basic.RequestParse(w, r, svcCtx, &req) + if err != nil { + return + } + + // 创建一个业务逻辑层实例 + l := logic.NewUserOrderListLogic(r.Context(), svcCtx) + resp := l.UserOrderList(&req, userinfo) + + basic.AfterLogic(w, r, resp) + } +} diff --git a/server/home-user-auth/internal/logic/getuserorderlistlogic.go b/server/home-user-auth/internal/logic/userorderlistlogic.go similarity index 93% rename from server/home-user-auth/internal/logic/getuserorderlistlogic.go rename to server/home-user-auth/internal/logic/userorderlistlogic.go index 7503c8b1..9b51e532 100644 --- a/server/home-user-auth/internal/logic/getuserorderlistlogic.go +++ b/server/home-user-auth/internal/logic/userorderlistlogic.go @@ -18,21 +18,21 @@ import ( "gorm.io/gorm" ) -type GetUserOrderListLogic struct { +type UserOrderListLogic struct { logx.Logger ctx context.Context svcCtx *svc.ServiceContext } -func NewGetUserOrderListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetUserOrderListLogic { - return &GetUserOrderListLogic{ +func NewUserOrderListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UserOrderListLogic { + return &UserOrderListLogic{ Logger: logx.WithContext(ctx), ctx: ctx, svcCtx: svcCtx, } } -func (l *GetUserOrderListLogic) GetUserOrderList(req *types.GetUserOrderListReq, userinfo *auth.UserInfo) (resp *basic.Response) { +func (l *UserOrderListLogic) UserOrderList(req *types.UserOrderListReq, userinfo *auth.UserInfo) (resp *basic.Response) { // 返回值必须调用Set重新返回, resp可以空指针调用 resp.SetStatus(basic.CodeOK, data) // userinfo 传入值时, 一定不为null @@ -136,7 +136,7 @@ func (l *GetUserOrderListLogic) GetUserOrderList(req *types.GetUserOrderListReq, } - return resp.SetStatusWithMessage(basic.CodeOK, "success", types.GetUserOrderListRsp{ + return resp.SetStatusWithMessage(basic.CodeOK, "success", types.UserOrderListRsp{ Items: respList, Meta: types.Meta{ TotalCount: total, diff --git a/server/home-user-auth/internal/types/types.go b/server/home-user-auth/internal/types/types.go index a6163430..648d0eba 100644 --- a/server/home-user-auth/internal/types/types.go +++ b/server/home-user-auth/internal/types/types.go @@ -14,7 +14,7 @@ type UserOrderCancelReq struct { type UserOrderCancelRsp struct { } -type GetUserOrderListReq struct { +type UserOrderListReq struct { Page int64 `form:"page"` // 分页 PageSize int64 `form:"page_size"` // 每页数量 Status int64 `form:"status"` // 状态筛选 @@ -23,7 +23,7 @@ type GetUserOrderListReq struct { Size int64 `form:"size"` // 图片尺寸 } -type GetUserOrderListRsp struct { +type UserOrderListRsp struct { Items []Items `json:"items"` Meta Meta `json:"_meta"` } diff --git a/server_api/home-user-auth.api b/server_api/home-user-auth.api index cb4422cb..6ca28d71 100644 --- a/server_api/home-user-auth.api +++ b/server_api/home-user-auth.api @@ -53,9 +53,9 @@ service home-user-auth { @handler UserGoogleLoginHandler get /api/user/oauth2/login/google(RequestGoogleLogin) returns (response); - //获取订单列表 - @handler GetUserOrderListHandler - get /api/user/order-list (GetUserOrderListReq) returns (response); + //订单列表 + @handler UserOrderListHandler + get /api/user/order-list (UserOrderListReq) returns (response); //取消订单 @handler UserOrderCancelHandler @@ -76,7 +76,7 @@ type ( // 获取订单列表 type ( - GetUserOrderListReq { + UserOrderListReq { Page int64 `form:"page"` // 分页 PageSize int64 `form:"page_size"` // 每页数量 Status int64 `form:"status"` // 状态筛选 @@ -85,7 +85,7 @@ type ( Size int64 `form:"size"` // 图片尺寸 } - GetUserOrderListRsp { + UserOrderListRsp { Items []Items `json:"items"` Meta Meta `json:"_meta"` }