From b4400a06b5f801bc7a85320680d0b6c45c547ff0 Mon Sep 17 00:00:00 2001 From: wangpengfei <274878379@qq.com> Date: 星期五, 28 七月 2023 10:21:33 +0800 Subject: [PATCH] fix --- api/v1/client.go | 92 +++++++++++++++++++++++++++++----------------- 1 files changed, 58 insertions(+), 34 deletions(-) diff --git a/api/v1/client.go b/api/v1/client.go index 8d47ac9..ad91842 100644 --- a/api/v1/client.go +++ b/api/v1/client.go @@ -44,44 +44,22 @@ ctx.Ok() } -// List -// -// @Tags Client -// @Summary 鑾峰彇瀹㈡埛鍒楄〃 -// @Produce application/json -// @Success 200 {object} contextx.Response{data=response.ClientResponse} -// @Router /api/client/list [get] -func (cli *ClientApi) List(c *gin.Context) { - ctx, ok := contextx.NewContext(c, nil) - if !ok { - return - } - - errCode, clients := clientService.GetClientList() - if errCode != ecode.OK { - ctx.Fail(errCode) - return - } - - ctx.OkWithDetailed(response.ClientResponse{List: clients}) -} - func checkClientParams(params request.Client) (int, *model.Client) { client := new(model.Client) - if params.Name == "" { - return ecode.InvalidParams, nil - } + //if params.Name == "" { + // return ecode.InvalidParams, nil + //} client.Name = params.Name - if params.ClientStatusId == 0 { - return ecode.InvalidParams, nil - } - client.ClientStatusId = params.ClientStatusId - - if params.MemberId == 0 { - return ecode.InvalidParams, nil - } + //if params.ClientStatusId == 0 { + // return ecode.InvalidParams, nil + //} + //client.ClientStatusId = params.ClientStatusId + // + //if params.MemberId == 0 { + // return ecode.InvalidParams, nil + //} client.MemberId = params.MemberId t, err := checkTimeFormat(params.NextVisitTime) @@ -98,6 +76,13 @@ client.LatestServiceTime = t + t, err = checkTimeFormat(params.RegistrationTime) + if err != nil { + return ecode.InvalidParams, nil + } + + client.RegistrationTime = t + client.ClientTypeId = params.ClientTypeId client.ClientOriginId = params.ClientOriginId client.ClientLevelId = params.ClientLevelId @@ -105,6 +90,16 @@ client.Remark = params.Remark client.Number = params.Number client.ServiceMemberId = params.ServiceMemberId + client.ProvinceId = params.ProvinceId + client.CityId = params.CityId + client.RegionId = params.RegionId + client.CountryId = params.CountryId + client.Business.BusinessScope = params.BusinessScope + client.Business.Representative = params.Representative + client.Business.RegisteredCapitalId = params.RegisteredCapitalId + client.Business.IndustryId = params.IndustryId + client.Business.EnterpriseNatureId = params.EnterpriseNatureId + client.Business.EnterpriseScaleId = params.EnterpriseScaleId if params.Contact.Name != "" { // assign the client's member id to contact when adding @@ -151,7 +146,7 @@ // @Produce application/json // @Param object body request.UpdateClient true "鏌ヨ鍙傛暟" // @Success 200 {object} contextx.Response{} -// @Router /api/client/update [post] +// @Router /api/client/update [put] func (cli *ClientApi) Update(c *gin.Context) { var params request.UpdateClient ctx, ok := contextx.NewContext(c, ¶ms) @@ -171,6 +166,8 @@ return } + client.Id = params.Id + errCode = clientService.UpdateClient(client) if errCode != ecode.OK { ctx.Fail(errCode) @@ -179,3 +176,30 @@ ctx.Ok() } + +// List +// +// @Tags Client +// @Summary 瀹㈡埛鍒楄〃 +// @Produce application/json +// @Param object body request.GetClientList true "鍙傛暟" +// @Success 200 {object} contextx.Response{data=response.ClientResponse} +// @Router /api/client/list [post] +func (cli *ClientApi) List(c *gin.Context) { + var params request.GetClientList + ctx, ok := contextx.NewContext(c, ¶ms) + if !ok { + return + } + + clients, total, errCode := clientService.GetClientList(params.Page, params.PageSize, params.Keyword) + if errCode != ecode.OK { + ctx.Fail(errCode) + return + } + + ctx.OkWithDetailed(response.ClientResponse{ + List: clients, + Count: int(total), + }) +} -- Gitblit v1.8.0