Xingyu Xian 3 сар өмнө
parent
commit
12f9ecbb88

+ 55 - 0
handler/delete_sub_account.go

@@ -0,0 +1,55 @@
+package handler
+
+import (
+	"fmt"
+	"github.com/gin-gonic/gin"
+	"youngee_b_api/model/http_model"
+	"youngee_b_api/service"
+)
+
+func WrapDeleteSubAccountHandler(ctx *gin.Context) {
+	handler := newdeleteSubAccountHandler(ctx)
+	baseRun(handler)
+}
+
+func newdeleteSubAccountHandler(ctx *gin.Context) *DeleteSubAccountHandler {
+	return &DeleteSubAccountHandler{
+		req:  http_model.NewDeleteSubAccountRequest(),
+		resp: http_model.NewDeleteSubAccountResponse(),
+		ctx:  ctx,
+	}
+}
+
+type DeleteSubAccountHandler struct {
+	req  *http_model.DeleteSubAccountRequest
+	resp *http_model.CommonResponse
+	ctx  *gin.Context
+}
+
+func (h *DeleteSubAccountHandler) getRequest() interface{} {
+	return h.req
+}
+func (h *DeleteSubAccountHandler) getContext() *gin.Context {
+	return h.ctx
+}
+func (h *DeleteSubAccountHandler) getResponse() interface{} {
+	return h.resp
+}
+func (h *DeleteSubAccountHandler) run() {
+	subAccountData := http_model.DeleteSubAccountRequest{}
+	subAccountData = *h.req
+	err := service.SubAccount.DeleteSubAccount(h.ctx, subAccountData)
+	if err != nil {
+		fmt.Println(err)
+		h.resp.Status = 40000
+		h.resp.Message = err.Error()
+		return
+	}
+	h.resp.Status = 20000
+	h.resp.Message = "ok"
+	return
+}
+
+func (h *DeleteSubAccountHandler) checkParam() error {
+	return nil
+}

+ 1 - 1
model/http_model/addNewJob.go

@@ -3,7 +3,7 @@ package http_model
 type AddNewJobRequest struct {
 	EnterpriseId         string `json:"enterprise_id"`         // 企业ID
 	JobName              string `json:"job_name"`              // 岗位名称
-	JobDetail            string `json:"job_detail"`            // 企业描述
+	JobDetail            string `json:"job_detail"`            // 岗位描述
 	WorkshopPermission   string `json:"workshop_permission"`   // 工作台权限
 	TaskcenterPermission string `json:"taskcenter_permission"` // 任务中心权限
 	CooperatePermission  string `json:"cooperate_permission"`  // 推广合作中心权限

+ 3 - 3
model/http_model/addNewSubAccount.go

@@ -9,9 +9,9 @@ type AddNewSubAccountRequest struct {
 }
 
 type AddNewSubAccountData struct {
-	UserID       int64  `json:"user_id"`          // 用户id
-	EnterpriseId string `json:"enterprise_id"`    // 企业id
-	SubAccountID string `json:"sub_account_name"` // 子账号id
+	UserID       int64  `json:"user_id"`        // 用户id
+	EnterpriseId string `json:"enterprise_id"`  // 企业id
+	SubAccountID string `json:"sub_account_id"` // 子账号id
 }
 
 func NewAddSubAccountRequest() *AddNewSubAccountRequest {

+ 14 - 0
model/http_model/delete_sub_account.go

@@ -0,0 +1,14 @@
+package http_model
+
+type DeleteSubAccountRequest struct {
+	SubAccountId int `json:"sub_account_id"` // 子账号ID
+}
+
+func NewDeleteSubAccountRequest() *DeleteSubAccountRequest {
+	return new(DeleteSubAccountRequest)
+}
+
+func NewDeleteSubAccountResponse() *CommonResponse {
+	resp := new(CommonResponse)
+	return resp
+}

+ 9 - 7
route/init.go

@@ -18,13 +18,15 @@ func InitRoute(r *gin.Engine) {
 		//business.POST("/register", handler.WrapRegisterHandler)                   // 商家主账号注册
 		business.POST("/addNewSubAccount", handler.WrapAddNewSubAccountHandler)   // 商家子账号注册
 		business.POST("/findAllSubAccount", handler.WrapFindAllSubAccountHandler) // 查找商家全部所属子账号
-		business.POST("/findAllJob", handler.WrapFindAllJobHandler)               // 查找商家全部所属岗位
-		business.POST("/addNewJob", handler.WrapaddNewJobHandler)                 // 商家新增岗位
-		business.POST("/updateJob", handler.WrapupdateJobHandler)                 // 商家修改岗位
-		business.POST("/deleteJob", handler.WrapdeleteJobHandler)                 // 商家删除岗位
-		business.POST("/sendCode", handler.WrapSendCodeHandler)                   // 发送登录验证码
-		business.POST("/login", handler.WrapCodeLoginHandler)                     // 商家登录
-		business.POST("/getUserInfo", handler.WrapGetUserInfoHandler)             // 商家用户信息
+		business.POST("/deleteSubAccount", handler.WrapDeleteSubAccountHandler)   // 删除商家子账号
+		// business.POST("/updateSubAccount", handler.WrapUpdateSubAccountHandler)   // 修改商家子账号
+		business.POST("/findAllJob", handler.WrapFindAllJobHandler)   // 查找商家全部所属岗位
+		business.POST("/addNewJob", handler.WrapaddNewJobHandler)     // 商家新增岗位
+		business.POST("/updateJob", handler.WrapupdateJobHandler)     // 商家修改岗位
+		business.POST("/deleteJob", handler.WrapdeleteJobHandler)     // 商家删除岗位
+		business.POST("/sendCode", handler.WrapSendCodeHandler)       // 发送登录验证码
+		business.POST("/login", handler.WrapCodeLoginHandler)         // 商家登录
+		business.POST("/getUserInfo", handler.WrapGetUserInfoHandler) // 商家用户信息
 		business.GET("/test/ping", func(c *gin.Context) {
 			resp := http_model.CommonResponse{
 				Status:  20000,

+ 2 - 2
service/sub_account.go

@@ -62,9 +62,9 @@ func (*subaccount) UpdateSubAccount(ctx context.Context, request http_model.Upda
 }
 
 // DeleteSubAccount 删除子账号
-func (*subaccount) DeleteSubAccount(ctx context.Context, request http_model.DeleteJobRequest) error {
+func (*subaccount) DeleteSubAccount(ctx context.Context, request http_model.DeleteSubAccountRequest) error {
 	var newSubAccount = gorm_model.YounggeeSubAccount{
-		JobId: request.JobId,
+		SubAccountId: request.SubAccountId,
 	}
 	err := db.DeleteSubAccount(ctx, newSubAccount)
 	if err != nil {