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 | 73 ++++++++++++++++++++---------------- 1 files changed, 40 insertions(+), 33 deletions(-) diff --git a/api/v1/client.go b/api/v1/client.go index 8df8a21..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) @@ -188,6 +166,8 @@ return } + client.Id = params.Id + errCode = clientService.UpdateClient(client) if errCode != ecode.OK { ctx.Fail(errCode) @@ -196,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