实现商户注册、管理员审核商户申请接口

internal/controller/admin/admin_v1_admin_info.go

@@ -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").Int()
+	userId := g.RequestFromCtx(ctx).GetCtxVar("userId").Int64()
 	out, err := service.Admin().Info(ctx, &model.AdminInfoIn{Id: userId})
 	if err != nil {
 		return nil, err

internal/controller/auth/auth_v1_merchant_code.go

@@ -0,0 +1,16 @@
+package auth
+
+import (
+	"context"
+	"server/internal/model"
+	"server/internal/service"
+
+	"server/api/auth/v1"
+)
+
+func (c *ControllerV1) MerchantCode(ctx context.Context, req *v1.MerchantCodeReq) (res *v1.MerchantCodeRes, err error) {
+	if _, err = service.MerchantAdmin().Code(ctx, &model.MerchantAdminCodeIn{Phone: req.Phone}); err != nil {
+		return nil, err
+	}
+	return &v1.MerchantCodeRes{}, nil
+}

internal/controller/auth/auth_v1_merchant_login.go

@@ -2,13 +2,16 @@ package auth
 
 import (
 	"context"
-
-	"github.com/gogf/gf/v2/errors/gcode"
-	"github.com/gogf/gf/v2/errors/gerror"
+	"server/internal/model"
+	"server/internal/service"
 
 	"server/api/auth/v1"
 )
 
 func (c *ControllerV1) MerchantLogin(ctx context.Context, req *v1.MerchantLoginReq) (res *v1.MerchantLoginRes, err error) {
-	return nil, gerror.NewCode(gcode.CodeNotImplemented)
+	out, err := service.MerchantAdmin().Login(ctx, &model.MerchantLoginIn{Password: req.Password, Username: req.Username})
+	if err != nil {
+		return nil, err
+	}
+	return &v1.MerchantLoginRes{Token: out.Token}, nil
 }

internal/controller/auth/auth_v1_merchant_register.go

@@ -0,0 +1,20 @@
+package auth
+
+import (
+	"context"
+	"server/internal/model"
+	"server/internal/service"
+
+	"server/api/auth/v1"
+)
+
+func (c *ControllerV1) MerchantRegister(ctx context.Context, req *v1.MerchantRegisterReq) (res *v1.MerchantRegisterRes, err error) {
+	out, err := service.MerchantAdmin().Register(ctx, &model.MerchantAdminRegisterIn{Username: req.Username, Password: req.Password, Phone: req.Phone, ApplicationReason: req.ApplicationReason, Code: req.Code})
+	if err != nil {
+		return nil, err
+	}
+	return &v1.MerchantRegisterRes{
+		Msg:     "申请成功, 等待系统管理员审核申请",
+		Success: out.Success,
+	}, nil
+}

internal/controller/merchant/merchant.go

@@ -2,4 +2,4 @@
 // This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
 // =================================================================================
 
-package roleMenu
+package merchant

internal/controller/merchant/merchant_new.go

@@ -2,14 +2,14 @@
 // This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
 // =================================================================================
 
-package roleMenu
+package merchant
 
 import (
-	"server/api/roleMenu"
+	"server/api/merchant"
 )
 
 type ControllerV1 struct{}
 
-func NewV1() roleMenu.IRoleMenuV1 {
+func NewV1() merchant.IMerchantV1 {
 	return &ControllerV1{}
 }

internal/controller/merchant/merchant_v1_audit.go

@@ -0,0 +1,19 @@
+package merchant
+
+import (
+	"context"
+	"github.com/gogf/gf/v2/frame/g"
+	"server/internal/model"
+	"server/internal/service"
+
+	"server/api/merchant/v1"
+)
+
+func (c *ControllerV1) Audit(ctx context.Context, req *v1.AuditReq) (res *v1.AuditRes, err error) {
+	adminId := g.RequestFromCtx(ctx).GetCtxVar("adminId").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
+	}
+	return &v1.AuditRes{}, nil
+}

internal/controller/merchant/merchant_v1_create.go

@@ -0,0 +1,14 @@
+package merchant
+
+import (
+	"context"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+
+	"server/api/merchant/v1"
+)
+
+func (c *ControllerV1) Create(ctx context.Context, req *v1.CreateReq) (res *v1.CreateRes, err error) {
+	return nil, gerror.NewCode(gcode.CodeNotImplemented)
+}

internal/controller/merchant/merchant_v1_list.go

@@ -1,20 +1,20 @@
-package roleMenu
+package merchant
 
 import (
 	"context"
 	"server/internal/model"
 	"server/internal/service"
 
-	"server/api/roleMenu/v1"
+	"server/api/merchant/v1"
 )
 
 func (c *ControllerV1) List(ctx context.Context, req *v1.ListReq) (res *v1.ListRes, err error) {
-	list, err := service.RoleMenu().List(ctx, &model.RoleMenuListInput{RoleId: req.RoleId})
+	out, err := service.Merchant().List(ctx, &model.MerchantListIn{Page: req.Page, Size: req.Size, AuditStatus: req.AuditStatus, Status: req.Status})
 	if err != nil {
 		return nil, err
 	}
 	return &v1.ListRes{
-		List:  list.List,
-		Total: list.Total,
+		List:  out.List,
+		Total: out.Total,
 	}, nil
 }

internal/controller/merchant/merchant_v1_update.go

@@ -0,0 +1,14 @@
+package merchant
+
+import (
+	"context"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+
+	"server/api/merchant/v1"
+)
+
+func (c *ControllerV1) Update(ctx context.Context, req *v1.UpdateReq) (res *v1.UpdateRes, err error) {
+	return nil, gerror.NewCode(gcode.CodeNotImplemented)
+}

internal/controller/merchantAdmin/merchantAdmin.go

@@ -0,0 +1,5 @@
+// =================================================================================
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// =================================================================================
+
+package merchantAdmin

internal/controller/merchantAdmin/merchantAdmin_new.go

@@ -0,0 +1,15 @@
+// =================================================================================
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// =================================================================================
+
+package merchantAdmin
+
+import (
+	"server/api/merchantAdmin"
+)
+
+type ControllerV1 struct{}
+
+func NewV1() merchantAdmin.IMerchantAdminV1 {
+	return &ControllerV1{}
+}

internal/controller/merchantAdmin/merchantAdmin_v1_merchant_admin_info.go

@@ -0,0 +1,14 @@
+package merchantAdmin
+
+import (
+	"context"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+
+	"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)
+}

internal/controller/roleMenu/roleMenu_v1_save_role_menu.go

@@ -1,20 +0,0 @@
-package roleMenu
-
-import (
-	"context"
-	"server/internal/model"
-	"server/internal/service"
-
-	"server/api/roleMenu/v1"
-)
-
-func (c *ControllerV1) SaveRoleMenu(ctx context.Context, req *v1.SaveRoleMenuReq) (res *v1.SaveRoleMenuRes, err error) {
-	out, err := service.RoleMenu().Save(ctx, &model.RoleMenuSaveInput{RoleId: req.RoleId, MenuIds: req.MenuIds})
-	if err != nil {
-		return nil, err
-	}
-	return &v1.SaveRoleMenuRes{
-		Success: out.Success,
-	}, nil
-
-}