From 8bf1cad94113d5c604e95e370cf068efdea87d27 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期三, 30 八月 2023 09:43:49 +0800
Subject: [PATCH] fix

---
 api/v1/salesLeads.go |   43 +++++++++++++++++++++++++++++++++----------
 1 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/api/v1/salesLeads.go b/api/v1/salesLeads.go
index 7e11661..1e751b5 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, &params)
 	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
@@ -132,6 +131,7 @@
 			RegionId:   params.RegionId,
 			CountryId:  params.CountryId,
 		},
+		DetailAddress: params.DetailAddress,
 	}
 
 	return ecode.OK, salesLeads
@@ -145,21 +145,44 @@
 //	@Param		object	body		request.GetSalesLeadsList	true	"鍙傛暟"
 //	@Success	200		{object}	contextx.Response{data=response.SalesLeadsResponse}
 //	@Router		/api/salesLeads/list [post]
-func (con *SalesLeadsApi) List(c *gin.Context) {
+func (s *SalesLeadsApi) List(c *gin.Context) {
 	var params request.GetSalesLeadsList
 	ctx, ok := contextx.NewContext(c, &params)
 	if !ok {
 		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
 	}
 
 	ctx.OkWithDetailed(response.SalesLeadsResponse{
-		List: salesLeadss,
-		Count: len(salesLeadss),
+		List:  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, &params)
+	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