From 5fa1de02759b9646e8987312736699755990e960 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期五, 13 十月 2023 15:30:22 +0800
Subject: [PATCH] bug修改

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

diff --git a/api/v1/salesLeads.go b/api/v1/salesLeads.go
index 0a48ac5..c1dc6e4 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{}
@@ -39,6 +38,13 @@
 		ctx.Fail(errCode)
 		return
 	}
+	if params.CodeRule.Method == 1 {
+		autoCode := model.GetAutoCode(salesLeads.Id, &params.CodeRule)
+		m := map[string]interface{}{
+			"number": autoCode,
+		}
+		_ = model.NewSalesLeadsSearch(nil).SetId(salesLeads.Id).UpdateMap(m)
+	}
 
 	ctx.Ok()
 }
@@ -48,17 +54,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
@@ -126,12 +132,14 @@
 		SalesSourcesId:  params.SalesSourcesId,
 		MemberId:        params.MemberId,
 		Desc:            params.Desc,
+		CodeStandID:     params.CodeStandID,
 		Address: model.Address{
 			ProvinceId: params.ProvinceId,
 			CityId:     params.CityId,
 			RegionId:   params.RegionId,
 			CountryId:  params.CountryId,
 		},
+		DetailAddress: params.DetailAddress,
 	}
 
 	return ecode.OK, salesLeads
@@ -145,21 +153,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, total, 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,
+		List:  salesLeadss,
 		Count: int(total),
 	})
-}
\ No newline at end of file
+}
+
+// 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