From 530fed8ec225453572d57b15c200ab062c335457 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期三, 01 十一月 2023 19:20:21 +0800 Subject: [PATCH] 公海member_id使用0 --- api/v1/client.go | 71 +++++++++++++++++++++++++++++++---- 1 files changed, 62 insertions(+), 9 deletions(-) diff --git a/api/v1/client.go b/api/v1/client.go index 1162b78..ff33fad 100644 --- a/api/v1/client.go +++ b/api/v1/client.go @@ -1,11 +1,13 @@ package v1 import ( + "aps_crm/constvar" "aps_crm/model" "aps_crm/model/request" "aps_crm/model/response" "aps_crm/pkg/contextx" "aps_crm/pkg/ecode" + "aps_crm/utils" "github.com/gin-gonic/gin" ) @@ -29,6 +31,16 @@ errCode, client := checkClientParams(params.Client) if errCode != ecode.OK { ctx.Fail(errCode) + return + } + + count, err := model.NewClientSearch(nil).SetNumber(client.Number).Count() + if err != nil { + ctx.FailWithMsg(ecode.UnknownErr, "缂栫爜楠岃瘉澶辫触") + return + } + if count > 0 { + ctx.FailWithMsg(ecode.UnknownErr, "缂栫爜宸插瓨鍦�") return } @@ -98,17 +110,18 @@ client.Business.EnterpriseNatureId = params.EnterpriseNatureId client.Business.EnterpriseScaleId = params.EnterpriseScaleId client.MemberId = params.MemberId + client.CodeStandID = params.CodeStandID - if params.Contact.Name != "" { - // assign the client's member id to contact when adding - params.Contact.MemberId = params.MemberId + //if params.Contact.Name != "" { + // assign the client's member id to contact when adding + params.Contact.MemberId = params.MemberId - errCode, contact := checkContactParams(params.Contact) - if errCode != ecode.OK { - return errCode, nil - } - client.Contacts = []model.Contact{contact} + errCode, contact := checkContactParams(params.Contact) + if errCode != ecode.OK { + return errCode, nil } + client.Contacts = []model.Contact{contact} + //} return ecode.OK, client } @@ -166,7 +179,7 @@ client.Id = params.Id - errCode = clientService.UpdateClient(client) + errCode = clientService.UpdateClient(client, params.ContactId) if errCode != ecode.OK { ctx.Fail(errCode) return @@ -190,6 +203,22 @@ return } + var isPublic bool + if params.SearchMap != nil && params.SearchMap["is_public"] != nil { + if v, ok := params.SearchMap["is_public"].(bool); ok { + isPublic = v + } + } + if !isPublic { + userInfo := utils.GetUserInfo(c) + if userInfo.UserType == constvar.UserTypeSub { + if params.SearchMap == nil { + params.SearchMap = make(map[string]interface{}, 0) + } + params.SearchMap["member_ids"] = userInfo.SubUserIds + } + } + clients, total, errCode := clientService.GetClientList(params.Page, params.PageSize, params.SearchMap) if errCode != ecode.OK { ctx.Fail(errCode) @@ -201,3 +230,27 @@ Count: int(total), }) } + +// CheckName +// +// @Tags Client +// @Summary 妫�鏌ュ鎴峰悕绉版槸鍚﹂噸澶� +// @Produce application/json +// @Param object body request.CheckClientName true "鍙傛暟" +// @Success 200 {object} contextx.Response{} +// @Router /api/client/checkName [post] +func (cli *ClientApi) CheckName(c *gin.Context) { + var params request.CheckClientName + ctx, ok := contextx.NewContext(c, ¶ms) + if !ok { + return + } + + errCode := clientService.CheckName(params.Name) + if errCode != ecode.OK { + ctx.Fail(errCode) + return + } + + ctx.Ok() +} -- Gitblit v1.8.0