From 0f15e7b48d064fa6faf99832ca5f4be9bc54e199 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 11 八月 2023 13:41:09 +0800
Subject: [PATCH] fix

---
 api/v1/client.go |   91 ++++++++++++++++++++++++---------------------
 1 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/api/v1/client.go b/api/v1/client.go
index 8df8a21..1162b78 100644
--- a/api/v1/client.go
+++ b/api/v1/client.go
@@ -7,7 +7,6 @@
 	"aps_crm/pkg/contextx"
 	"aps_crm/pkg/ecode"
 	"github.com/gin-gonic/gin"
-	"strconv"
 )
 
 type ClientApi struct{}
@@ -33,9 +32,7 @@
 		return
 	}
 
-	// check member exist
-
-	errCode = clientService.AddClient(client)
+	errCode = clientService.AddClient(client, params.SalesLeadsId)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
@@ -44,45 +41,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
-	}
-	client.MemberId = params.MemberId
+	//if params.ClientStatusId == 0 {
+	//	return ecode.InvalidParams, nil
+	//}
+	//client.ClientStatusId = params.ClientStatusId
+	//
+	//if params.MemberId == 0 {
+	//	return ecode.InvalidParams, nil
+	//}
 
 	t, err := checkTimeFormat(params.NextVisitTime)
 	if err != nil {
@@ -109,6 +83,7 @@
 	client.ClientOriginId = params.ClientOriginId
 	client.ClientLevelId = params.ClientLevelId
 	client.DetailAddress = params.DetailAddress
+	client.ClientStatusId = params.ClientStatusId
 	client.Remark = params.Remark
 	client.Number = params.Number
 	client.ServiceMemberId = params.ServiceMemberId
@@ -122,6 +97,7 @@
 	client.Business.IndustryId = params.IndustryId
 	client.Business.EnterpriseNatureId = params.EnterpriseNatureId
 	client.Business.EnterpriseScaleId = params.EnterpriseScaleId
+	client.MemberId = params.MemberId
 
 	if params.Contact.Name != "" {
 		// assign the client's member id to contact when adding
@@ -142,17 +118,17 @@
 //	@Tags		Client
 //	@Summary	鍒犻櫎瀹㈡埛
 //	@Produce	application/json
-//	@Param		id	path		int	true	"瀹㈡埛ID"
+//	@Param		object	body		request.DeleteClient true	"鏌ヨ鍙傛暟"
 //	@Success	200	{object}	contextx.Response{}
-//	@Router		/api/client/delete/{id} [delete]
+//	@Router		/api/client/delete [delete]
 func (cli *ClientApi) Delete(c *gin.Context) {
-	ctx, ok := contextx.NewContext(c, nil)
+	var params request.DeleteClient
+	ctx, ok := contextx.NewContext(c, &params)
 	if !ok {
 		return
 	}
 
-	id, _ := strconv.Atoi(c.Param("id"))
-	errCode := clientService.DeleteClient(id)
+	errCode := clientService.DeleteClient(params.Ids)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
@@ -188,6 +164,8 @@
 		return
 	}
 
+	client.Id = params.Id
+
 	errCode = clientService.UpdateClient(client)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
@@ -196,3 +174,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, &params)
+	if !ok {
+		return
+	}
+
+	clients, total, errCode := clientService.GetClientList(params.Page, params.PageSize, params.SearchMap)
+	if errCode != ecode.OK {
+		ctx.Fail(errCode)
+		return
+	}
+
+	ctx.OkWithDetailed(response.ClientResponse{
+		List:  clients,
+		Count: int(total),
+	})
+}

--
Gitblit v1.8.0