From a631f0f8f824caca91bc99e7dbb1f27c6c0a39ef Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 18 八月 2023 17:12:20 +0800
Subject: [PATCH] fix

---
 api/v1/salesLeads.go |  351 +++++++++++++++++++++++++++++++---------------------------
 1 files changed, 187 insertions(+), 164 deletions(-)

diff --git a/api/v1/salesLeads.go b/api/v1/salesLeads.go
index 8af530c..bd501e9 100644
--- a/api/v1/salesLeads.go
+++ b/api/v1/salesLeads.go
@@ -1,164 +1,187 @@
-package v1
-
-import (
-	"aps_crm/constvar"
-	"aps_crm/model"
-	"aps_crm/model/request"
-	"aps_crm/model/response"
-	"aps_crm/pkg/contextx"
-	"aps_crm/pkg/ecode"
-	"github.com/gin-gonic/gin"
-)
-
-type SalesLeadsApi struct{}
-
-// Add
-//
-//	@Tags		SalesLeads
-//	@Summary	娣诲姞閿�鍞嚎绱�
-//	@Produce	application/json
-//	@Param		object	body		request.AddSalesLeads	true	"鏌ヨ鍙傛暟"
-//	@Success	200		{object}	contextx.Response{}
-//	@Router		/api/salesLeads/add [post]
-func (s *SalesLeadsApi) Add(c *gin.Context) {
-	var params request.AddSalesLeads
-	ctx, ok := contextx.NewContext(c, &params)
-	if !ok {
-		return
-	}
-
-	errCode, salesLeads := checkSalesLeadsParams(params.SalesLeads)
-	if errCode != ecode.OK {
-		ctx.Fail(errCode)
-		return
-	}
-
-	errCode = salesLeadsService.AddSalesLeads(&salesLeads)
-	if errCode != ecode.OK {
-		ctx.Fail(errCode)
-		return
-	}
-
-	ctx.Ok()
-}
-
-// Delete
-//
-//	@Tags		SalesLeads
-//	@Summary	鍒犻櫎閿�鍞嚎绱�
-//	@Produce	application/json
-//	@Param		object	body		request.DeleteSalesLeads true	"鏌ヨ鍙傛暟"
-//	@Success	200	{object}	contextx.Response{}
-//	@Router		/api/salesLeads/delete [delete]
-func (s *SalesLeadsApi) Delete(c *gin.Context) {
-	var params request.DeleteSalesLeads
-	ctx, ok := contextx.NewContext(c, &params)
-	if !ok {
-		return
-	}
-
-	errCode := salesLeadsService.DeleteSalesLeads(params.Ids)
-	if errCode != ecode.OK {
-		ctx.Fail(errCode)
-		return
-	}
-
-	ctx.Ok()
-}
-
-// Update
-//
-//	@Tags		SalesLeads
-//	@Summary	鏇存柊閿�鍞嚎绱�
-//	@Produce	application/json
-//	@Param		object	body		request.UpdateSalesLeads	true	"鏌ヨ鍙傛暟"
-//	@Success	200		{object}	contextx.Response{}
-//	@Router		/api/salesLeads/update [put]
-func (s *SalesLeadsApi) Update(c *gin.Context) {
-	var params request.UpdateSalesLeads
-	ctx, ok := contextx.NewContext(c, &params)
-	if !ok {
-		return
-	}
-
-	errCode, salesLeads := checkSalesLeadsParams(params.SalesLeads)
-	if errCode != ecode.OK {
-		ctx.Fail(errCode)
-		return
-	}
-
-	salesLeads.Id = params.Id
-
-	errCode = salesLeadsService.UpdateSalesLeads(&salesLeads)
-	if errCode != ecode.OK {
-		ctx.Fail(errCode)
-		return
-	}
-
-	ctx.Ok()
-}
-
-func checkSalesLeadsParams(params request.SalesLeads) (errCode int, salesLeads model.SalesLeads) {
-	//if params.Name == "" {
-	//	return ecode.InvalidParams, salesLeads
-	//}
-	//
-	//if params.Number == "" {
-	//	return ecode.InvalidParams, salesLeads
-	//}
-	//
-	//if params.SalesSourcesId == 0 {
-	//	return ecode.InvalidParams, salesLeads
-	//}
-	//
-	//if params.MemberId == 0 {
-	//	return ecode.InvalidParams, salesLeads
-	//}
-
-	salesLeads = model.SalesLeads{
-		Name:            params.Name,
-		Number:          params.Number,
-		ContactName:     params.ContactName,
-		ContactPhone:    params.ContactPhone,
-		ContactPosition: params.ContactPosition,
-		SalesStatus:     constvar.SalesStatusNew,
-		SalesSourcesId:  params.SalesSourcesId,
-		MemberId:        params.MemberId,
-		Desc:            params.Desc,
-		Address: model.Address{
-			ProvinceId: params.ProvinceId,
-			CityId:     params.CityId,
-			RegionId:   params.RegionId,
-			CountryId:  params.CountryId,
-		},
-	}
-
-	return ecode.OK, salesLeads
-}
-
-// List
-//
-//	@Tags		SalesLeads
-//	@Summary	閿�鍞嚎绱㈠垪琛�
-//	@Produce	application/json
-//	@Param		object	body		request.GetSalesLeadsList	true	"鍙傛暟"
-//	@Success	200		{object}	contextx.Response{data=response.SalesLeadsResponse}
-//	@Router		/api/salesLeads/list [post]
-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)
-	if errCode != ecode.OK {
-		ctx.Fail(errCode)
-		return
-	}
-
-	ctx.OkWithDetailed(response.SalesLeadsResponse{
-		List:  salesLeadss,
-		Count: int(total),
-	})
-}
+package v1
+
+import (
+	"aps_crm/constvar"
+	"aps_crm/model"
+	"aps_crm/model/request"
+	"aps_crm/model/response"
+	"aps_crm/pkg/contextx"
+	"aps_crm/pkg/ecode"
+	"github.com/gin-gonic/gin"
+)
+
+type SalesLeadsApi struct{}
+
+// Add
+//
+//	@Tags		SalesLeads
+//	@Summary	娣诲姞閿�鍞嚎绱�
+//	@Produce	application/json
+//	@Param		object	body		request.AddSalesLeads	true	"鏌ヨ鍙傛暟"
+//	@Success	200		{object}	contextx.Response{}
+//	@Router		/api/salesLeads/add [post]
+func (s *SalesLeadsApi) Add(c *gin.Context) {
+	var params request.AddSalesLeads
+	ctx, ok := contextx.NewContext(c, &params)
+	if !ok {
+		return
+	}
+
+	errCode, salesLeads := checkSalesLeadsParams(params.SalesLeads)
+	if errCode != ecode.OK {
+		ctx.Fail(errCode)
+		return
+	}
+
+	errCode = salesLeadsService.AddSalesLeads(&salesLeads)
+	if errCode != ecode.OK {
+		ctx.Fail(errCode)
+		return
+	}
+
+	ctx.Ok()
+}
+
+// Delete
+//
+//	@Tags		SalesLeads
+//	@Summary	鍒犻櫎閿�鍞嚎绱�
+//	@Produce	application/json
+//	@Param		object	body		request.DeleteSalesLeads true	"鏌ヨ鍙傛暟"
+//	@Success	200	{object}	contextx.Response{}
+//	@Router		/api/salesLeads/delete [delete]
+func (s *SalesLeadsApi) Delete(c *gin.Context) {
+	var params request.DeleteSalesLeads
+	ctx, ok := contextx.NewContext(c, &params)
+	if !ok {
+		return
+	}
+
+	errCode := salesLeadsService.DeleteSalesLeads(params.Ids)
+	if errCode != ecode.OK {
+		ctx.Fail(errCode)
+		return
+	}
+
+	ctx.Ok()
+}
+
+// Update
+//
+//	@Tags		SalesLeads
+//	@Summary	鏇存柊閿�鍞嚎绱�
+//	@Produce	application/json
+//	@Param		object	body		request.UpdateSalesLeads	true	"鏌ヨ鍙傛暟"
+//	@Success	200		{object}	contextx.Response{}
+//	@Router		/api/salesLeads/update [put]
+func (s *SalesLeadsApi) Update(c *gin.Context) {
+	var params request.UpdateSalesLeads
+	ctx, ok := contextx.NewContext(c, &params)
+	if !ok {
+		return
+	}
+
+	errCode, salesLeads := checkSalesLeadsParams(params.SalesLeads)
+	if errCode != ecode.OK {
+		ctx.Fail(errCode)
+		return
+	}
+
+	salesLeads.Id = params.Id
+
+	errCode = salesLeadsService.UpdateSalesLeads(&salesLeads)
+	if errCode != ecode.OK {
+		ctx.Fail(errCode)
+		return
+	}
+
+	ctx.Ok()
+}
+
+func checkSalesLeadsParams(params request.SalesLeads) (errCode int, salesLeads model.SalesLeads) {
+	//if params.Name == "" {
+	//	return ecode.InvalidParams, salesLeads
+	//}
+	//
+	//if params.Number == "" {
+	//	return ecode.InvalidParams, salesLeads
+	//}
+	//
+	//if params.SalesSourcesId == 0 {
+	//	return ecode.InvalidParams, salesLeads
+	//}
+	//
+	//if params.MemberId == 0 {
+	//	return ecode.InvalidParams, salesLeads
+	//}
+
+	salesLeads = model.SalesLeads{
+		Name:            params.Name,
+		Number:          params.Number,
+		ContactName:     params.ContactName,
+		ContactPhone:    params.ContactPhone,
+		ContactPosition: params.ContactPosition,
+		SalesStatus:     constvar.SalesStatusNew,
+		SalesSourcesId:  params.SalesSourcesId,
+		MemberId:        params.MemberId,
+		Desc:            params.Desc,
+		Address: model.Address{
+			ProvinceId: params.ProvinceId,
+			CityId:     params.CityId,
+			RegionId:   params.RegionId,
+			CountryId:  params.CountryId,
+		},
+	}
+
+	return ecode.OK, salesLeads
+}
+
+// List
+//
+//	@Tags		SalesLeads
+//	@Summary	閿�鍞嚎绱㈠垪琛�
+//	@Produce	application/json
+//	@Param		object	body		request.GetSalesLeadsList	true	"鍙傛暟"
+//	@Success	200		{object}	contextx.Response{data=response.SalesLeadsResponse}
+//	@Router		/api/salesLeads/list [post]
+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.SearchMap)
+	if errCode != ecode.OK {
+		ctx.Fail(errCode)
+		return
+	}
+
+	ctx.OkWithDetailed(response.SalesLeadsResponse{
+		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