denghui/arenax-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改上下文参数传递，实现门店登录

Browse Source
This commit is contained in:
denghui
2025-06-04 17:30:08 +08:00
parent caf3d42fe5
commit 5f55223cd5
19 changed files with 237 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/controller/admin/admin_v1_admin_info.go
View File

@ -11,7 +11,7 @@ import (
)
func (c *ControllerV1) AdminInfo(ctx context.Context, req *v1.AdminInfoReq) (res *v1.AdminInfoRes, err error) {
userId := g.RequestFromCtx(ctx).GetCtxVar("userId").Int64()
userId := g.RequestFromCtx(ctx).GetCtxVar("id").Int64()
out, err := service.Admin().Info(ctx, &model.AdminInfoIn{Id: userId})
if err != nil {
return nil, err

13
internal/controller/auth/auth_v1_store_login.go
View File

@ -3,12 +3,15 @@ package auth
import (
"context"
"github.com/gogf/gf/v2/errors/gcode"
"github.com/gogf/gf/v2/errors/gerror"
"server/api/auth/v1"
v1 "server/api/auth/v1"
"server/internal/model"
"server/internal/service"
)
func (c *ControllerV1) StoreLogin(ctx context.Context, req *v1.StoreLoginReq) (res *v1.StoreLoginRes, err error) {
return nil, gerror.NewCode(gcode.CodeNotImplemented)
out, err := service.StoreAdmin().Login(ctx, &model.StoreAdminLoginIn{Username: req.Username, Password: req.Password})
if err != nil {
return nil, err
}
return &v1.StoreLoginRes{Token: out.Token}, nil
}

2
internal/controller/merchant/merchant_v1_audit.go
View File

@ -10,7 +10,7 @@ import (
)
func (c *ControllerV1) Audit(ctx context.Context, req *v1.AuditReq) (res *v1.AuditRes, err error) {
adminId := g.RequestFromCtx(ctx).GetCtxVar("adminId").Int64()
adminId := g.RequestFromCtx(ctx).GetCtxVar("id").Int64()
_, err = service.Merchant().Audit(ctx, &model.MerchantAuditIn{Id: req.Id, AuditStatus: req.AuditStatus, AuditRemark: req.AuditRemark, AdminId: adminId, RejectReason: req.RejectReason})
if err != nil {
return nil, err

1
internal/controller/merchant/merchant_v1_create.go
View File

@ -10,5 +10,6 @@ import (
)
func (c *ControllerV1) Create(ctx context.Context, req *v1.CreateReq) (res *v1.CreateRes, err error) {
// TODO
return nil, gerror.NewCode(gcode.CodeNotImplemented)
}

1
internal/controller/merchant/merchant_v1_update.go
View File

@ -10,5 +10,6 @@ import (
)
func (c *ControllerV1) Update(ctx context.Context, req *v1.UpdateReq) (res *v1.UpdateRes, err error) {
// TODO
return nil, gerror.NewCode(gcode.CodeNotImplemented)
}

13
internal/controller/merchantAdmin/merchantAdmin_v1_merchant_admin_info.go
View File

@ -2,13 +2,18 @@ package merchantAdmin
import (
"context"
"github.com/gogf/gf/v2/errors/gcode"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/frame/g"
"server/internal/model"
"server/internal/service"
"server/api/merchantAdmin/v1"
)
func (c *ControllerV1) MerchantAdminInfo(ctx context.Context, req *v1.MerchantAdminInfoReq) (res *v1.MerchantAdminInfoRes, err error) {
return nil, gerror.NewCode(gcode.CodeNotImplemented)
merchantAdminId := g.RequestFromCtx(ctx).GetCtxVar("id").Int64()
info, err := service.MerchantAdmin().Info(ctx, &model.MerchantAdminInfoIn{MerchantAdminId: merchantAdminId})
if err != nil {
return nil, err
}
return &v1.MerchantAdminInfoRes{Name: info.Name}, nil
}