From 9a7e0a7da01a9f9625ceaca0c61a59c540c6438f Mon Sep 17 00:00:00 2001 From: wangpengfei <274878379@qq.com> Date: 星期五, 18 八月 2023 17:32:10 +0800 Subject: [PATCH] fix --- api/v1/salesLeads.go | 38 ++++++++++++++++++++++++++++++-------- 1 files changed, 30 insertions(+), 8 deletions(-) diff --git a/api/v1/salesLeads.go b/api/v1/salesLeads.go index 7c37437..bd501e9 100644 --- a/api/v1/salesLeads.go +++ b/api/v1/salesLeads.go @@ -8,7 +8,6 @@ "aps_crm/pkg/contextx" "aps_crm/pkg/ecode" "github.com/gin-gonic/gin" - "strconv" ) type SalesLeadsApi struct{} @@ -48,17 +47,17 @@ // @Tags SalesLeads // @Summary 鍒犻櫎閿�鍞嚎绱� // @Produce application/json -// @Param id path int true "鏌ヨ鍙傛暟" +// @Param object body request.DeleteSalesLeads true "鏌ヨ鍙傛暟" // @Success 200 {object} contextx.Response{} -// @Router /api/salesLeads/delete/{id} [delete] +// @Router /api/salesLeads/delete [delete] func (s *SalesLeadsApi) Delete(c *gin.Context) { - ctx, ok := contextx.NewContext(c, nil) + var params request.DeleteSalesLeads + ctx, ok := contextx.NewContext(c, ¶ms) if !ok { return } - id, _ := strconv.Atoi(c.Param("id")) - errCode := salesLeadsService.DeleteSalesLeads(id) + errCode := salesLeadsService.DeleteSalesLeads(params.Ids) if errCode != ecode.OK { ctx.Fail(errCode) return @@ -152,7 +151,7 @@ return } - salesLeadss, errCode := salesLeadsService.GetSalesLeadsList(params.Page, params.PageSize, params.Keyword) + salesLeadss, total, errCode := salesLeadsService.GetSalesLeadsList(params.Page, params.PageSize, params.SearchMap) if errCode != ecode.OK { ctx.Fail(errCode) return @@ -160,6 +159,29 @@ ctx.OkWithDetailed(response.SalesLeadsResponse{ List: salesLeadss, - Count: len(salesLeadss), + Count: int(total), }) } + +// Push +// +// @Tags SalesLeads +// @Summary 鎺ㄨ繘閿�鍞嚎绱� +// @Produce application/json +// @Param object body request.PushSalesLeads true "鏌ヨ鍙傛暟" +// @Success 200 {object} contextx.Response{} +// @Router /api/salesLeads/push [post] +func (s *SalesLeadsApi) Push(c *gin.Context) { + var params request.PushSalesLeads + ctx, ok := contextx.NewContext(c, ¶ms) + if !ok { + return + } + + errCode := salesLeadsService.PushSalesLeads(params.Id, params.Step, params.Reason) + if errCode != ecode.OK { + ctx.Fail(errCode) + return + } + ctx.Ok() +} -- Gitblit v1.8.0