From 7cdff30203f11eb13354fe7a828cfec19a650530 Mon Sep 17 00:00:00 2001 From: huanglei19951029 <81128461+huanglei19951029@users.noreply.github.com> Date: Wed, 17 Dec 2025 14:14:45 +0800 Subject: [PATCH] =?UTF-8?q?feat(ent):=20=E7=94=9F=E6=88=90=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E5=BA=94=E7=94=A8=E5=AE=9E=E4=BD=93=E5=8F=8A=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=93=8D=E4=BD=9C=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 App 实体定义，包含字段如 ID、创建时间、更新时间、状态、租户 ID、删除时间、应用密钥、应用名称、订单通知 URL 和退款通知 URL - 实现 App 实体的 CRUD 操作，包括创建、查询、删除等功能 - 支持与支付渠道（PayChannel）和支付通知任务（PayNotifyTask）关联关系的操作 - 自动生成数据库表结构映射及 SQL 查询逻辑 - 提供批量创建和单个/多个对象查询接口 - 包含默认值设置、数据校验以及错误处理机制 --- rpc/internal/logic/user/list_users_logic.go | 2 ++ rpc/internal/logic/user/query_user_page_pc_logic.go | 10 ++++++---- rpc/internal/logic/user/update_user_pc_avatar_logic.go | 2 +- rpc/internal/logic/user/update_user_pc_info_logic.go | 2 +- .../logic/user/update_user_pc_password_logic.go | 2 +- rpc/internal/logic/user/update_user_pc_status_logic.go | 2 +- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/rpc/internal/logic/user/list_users_logic.go b/rpc/internal/logic/user/list_users_logic.go index 1030f57..a238e6f 100644 --- a/rpc/internal/logic/user/list_users_logic.go +++ b/rpc/internal/logic/user/list_users_logic.go @@ -2,6 +2,7 @@ package user import ( "context" + "fmt" "github.com/saas-mingyang/mingyang-admin-common/utils/pointy" "mingyang-admin-app-rpc/ent/predicate" "mingyang-admin-app-rpc/ent/user" @@ -45,6 +46,7 @@ func (l *ListUsersLogic) ListUsers(in *app.PageUserRequest) (*app.PageUserRespon if result == nil || result.List == nil { return resp, nil } + fmt.Printf("result.List:%s\n", result.List) resp.Total = result.PageDetails.Total for _, v := range result.List { if v == nil { diff --git a/rpc/internal/logic/user/query_user_page_pc_logic.go b/rpc/internal/logic/user/query_user_page_pc_logic.go index 4c3356b..d3c388a 100644 --- a/rpc/internal/logic/user/query_user_page_pc_logic.go +++ b/rpc/internal/logic/user/query_user_page_pc_logic.go @@ -23,9 +23,11 @@ func NewQueryUserPagePcLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Q } } -// C端用户分页查询 +// QueryUserPagePc C端用户分页查询 func (l *QueryUserPagePcLogic) QueryUserPagePc(in *app.PageUserRequest) (*app.PageUserResponse, error) { - // todo: add your logic here and delete this line - - return &app.PageUserResponse{}, nil + users, err := NewListUsersLogic(l.ctx, l.svcCtx).ListUsers(in) + if err != nil { + return nil, err + } + return users, nil } diff --git a/rpc/internal/logic/user/update_user_pc_avatar_logic.go b/rpc/internal/logic/user/update_user_pc_avatar_logic.go index 21d613a..cda167f 100644 --- a/rpc/internal/logic/user/update_user_pc_avatar_logic.go +++ b/rpc/internal/logic/user/update_user_pc_avatar_logic.go @@ -23,7 +23,7 @@ func NewUpdateUserPcAvatarLogic(ctx context.Context, svcCtx *svc.ServiceContext) } } -// C端用户修改头像 +// UpdateUserPcAvatar C端用户修改头像 func (l *UpdateUserPcAvatarLogic) UpdateUserPcAvatar(in *app.UpdateUserAvatarReq) (*app.BaseResp, error) { // todo: add your logic here and delete this line diff --git a/rpc/internal/logic/user/update_user_pc_info_logic.go b/rpc/internal/logic/user/update_user_pc_info_logic.go index 422e504..4f96563 100644 --- a/rpc/internal/logic/user/update_user_pc_info_logic.go +++ b/rpc/internal/logic/user/update_user_pc_info_logic.go @@ -23,7 +23,7 @@ func NewUpdateUserPcInfoLogic(ctx context.Context, svcCtx *svc.ServiceContext) * } } -// C端用户修改信息 +// UpdateUserPcInfo C端用户修改信息 func (l *UpdateUserPcInfoLogic) UpdateUserPcInfo(in *app.UserInfo) (*app.BaseResp, error) { // todo: add your logic here and delete this line diff --git a/rpc/internal/logic/user/update_user_pc_password_logic.go b/rpc/internal/logic/user/update_user_pc_password_logic.go index c6c526a..4fd5c60 100644 --- a/rpc/internal/logic/user/update_user_pc_password_logic.go +++ b/rpc/internal/logic/user/update_user_pc_password_logic.go @@ -23,7 +23,7 @@ func NewUpdateUserPcPasswordLogic(ctx context.Context, svcCtx *svc.ServiceContex } } -// C端用户修改密码 +// UpdateUserPcPassword C端用户修改密码 func (l *UpdateUserPcPasswordLogic) UpdateUserPcPassword(in *app.UpdateUserPcPasswordReq) (*app.BaseResp, error) { // todo: add your logic here and delete this line diff --git a/rpc/internal/logic/user/update_user_pc_status_logic.go b/rpc/internal/logic/user/update_user_pc_status_logic.go index afe85d0..dc4ea49 100644 --- a/rpc/internal/logic/user/update_user_pc_status_logic.go +++ b/rpc/internal/logic/user/update_user_pc_status_logic.go @@ -23,7 +23,7 @@ func NewUpdateUserPcStatusLogic(ctx context.Context, svcCtx *svc.ServiceContext) } } -// C端用户修改状态 +// UpdateUserPcStatus C端用户修改状态 func (l *UpdateUserPcStatusLogic) UpdateUserPcStatus(in *app.IDReq) (*app.BaseResp, error) { // todo: add your logic here and delete this line