From b0c07ddee23e2d54d03636f08af19f0934857cf4 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 25 八月 2023 10:32:56 +0800
Subject: [PATCH] Merge branch 'hotfix'

---
 api/v1/contact.go |  344 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 172 insertions(+), 172 deletions(-)

diff --git a/api/v1/contact.go b/api/v1/contact.go
index 5530eed..7daace8 100644
--- a/api/v1/contact.go
+++ b/api/v1/contact.go
@@ -1,172 +1,172 @@
-package v1
-
-import (
-	"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 ContactApi struct{}
-
-// Add
-//
-//	@Tags		Contact
-//	@Summary	娣诲姞鑱旂郴浜�
-//	@Produce	application/json
-//	@Param		object	body		request.AddContact	true	"鏌ヨ鍙傛暟"
-//	@Success	200		{object}	contextx.Response{}
-//	@Router		/api/contact/add [post]
-func (con *ContactApi) Add(c *gin.Context) {
-	var params request.AddContact
-	ctx, ok := contextx.NewContext(c, &params)
-	if !ok {
-		return
-	}
-
-	errCode, contact := checkContactParams(params.Contact)
-	if errCode != ecode.OK {
-		ctx.Fail(errCode)
-		return
-	}
-
-	errCode = contactService.AddContact(&contact)
-	if errCode != ecode.OK {
-		ctx.Fail(errCode)
-		return
-	}
-
-	ctx.Ok()
-}
-
-// Delete
-//
-//	@Tags		Contact
-//	@Summary	鍒犻櫎鑱旂郴浜�
-//	@Produce	application/json
-//	@Param		object	body		request.DeleteContact true	"鏌ヨ鍙傛暟"
-//	@Success	200	{object}	contextx.Response{}
-//	@Router		/api/contact/delete [delete]
-func (con *ContactApi) Delete(c *gin.Context) {
-	var params request.DeleteContact
-	ctx, ok := contextx.NewContext(c, &params)
-	if !ok {
-		return
-	}
-
-	errCode := contactService.DeleteContact(params.Ids)
-	if errCode != ecode.OK {
-		ctx.Fail(errCode)
-		return
-	}
-
-	ctx.Ok()
-}
-
-// Update
-//
-//	@Tags		Contact
-//	@Summary	鏇存柊鑱旂郴浜�
-//	@Produce	application/json
-//	@Param		object	body		request.UpdateContact	true	"鏌ヨ鍙傛暟"
-//	@Success	200		{object}	contextx.Response{}
-//	@Router		/api/contact/update [put]
-func (con *ContactApi) Update(c *gin.Context) {
-	var params request.UpdateContact
-	ctx, ok := contextx.NewContext(c, &params)
-	if !ok {
-		return
-	}
-
-	// check id
-	if params.Id == 0 {
-		ctx.Fail(ecode.InvalidParams)
-		return
-	}
-
-	errCode, contact := checkContactParams(params.Contact)
-	if errCode != ecode.OK {
-		ctx.Fail(errCode)
-		return
-	}
-
-	contact.Id = params.Id
-
-	errCode = contactService.UpdateContact(&contact)
-	if errCode != ecode.OK {
-		ctx.Fail(errCode)
-		return
-	}
-
-	ctx.Ok()
-}
-
-func checkContactParams(params request.Contact) (int, model.Contact) {
-	var contact model.Contact
-	// name not empty
-	//if params.Name == "" {
-	//	return ecode.InvalidParams, contact
-	//}
-	contact.Name = params.Name
-
-	contact.Phone = params.Phone
-	contact.Email = params.Email
-
-	// check member id not -1
-	//if params.MemberId == 0 {
-	//	return ecode.InvalidParams, contact
-	//}
-	contact.MemberId = params.MemberId
-
-	contact.ProvinceId = params.ProvinceId
-	contact.CityId = params.CityId
-	contact.CountryId = params.CountryId
-	contact.RegionId = params.RegionId
-	contact.Position = params.Position
-	contact.ClientId = params.ClientId
-	contact.Desc = params.Desc
-
-	// check number not empty
-	//if params.Number == "" {
-	//	return ecode.InvalidParams, contact
-	//}
-	contact.Number = params.Number
-
-	t, err := checkTimeFormat(params.Birthday)
-	if err != nil {
-		return ecode.InvalidParams, contact
-	}
-	contact.Birthday = t
-	contact.Wechat = params.Wechat
-	contact.IsFirst = params.IsFirst
-	return ecode.OK, contact
-}
-
-// List
-//
-//	@Tags		Contact
-//	@Summary	鑱旂郴浜哄垪琛�
-//	@Produce	application/json
-//	@Param		object	body		request.GetContactList	true	"鍙傛暟"
-//	@Success	200		{object}	contextx.Response{data=response.ContactResponse}
-//	@Router		/api/contact/list [post]
-func (con *ContactApi) List(c *gin.Context) {
-	var params request.GetContactList
-	ctx, ok := contextx.NewContext(c, &params)
-	if !ok {
-		return
-	}
-
-	contacts, total, errCode := contactService.GetContactList(params.Page, params.PageSize, params.Keyword)
-	if errCode != ecode.OK {
-		ctx.Fail(errCode)
-		return
-	}
-
-	ctx.OkWithDetailed(response.ContactResponse{
-		List:  contacts,
-		Count: int(total),
-	})
-}
+package v1
+
+import (
+	"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 ContactApi struct{}
+
+// Add
+//
+//	@Tags		Contact
+//	@Summary	娣诲姞鑱旂郴浜�
+//	@Produce	application/json
+//	@Param		object	body		request.AddContact	true	"鏌ヨ鍙傛暟"
+//	@Success	200		{object}	contextx.Response{}
+//	@Router		/api/contact/add [post]
+func (con *ContactApi) Add(c *gin.Context) {
+	var params request.AddContact
+	ctx, ok := contextx.NewContext(c, &params)
+	if !ok {
+		return
+	}
+
+	errCode, contact := checkContactParams(params.Contact)
+	if errCode != ecode.OK {
+		ctx.Fail(errCode)
+		return
+	}
+
+	errCode = contactService.AddContact(&contact)
+	if errCode != ecode.OK {
+		ctx.Fail(errCode)
+		return
+	}
+
+	ctx.Ok()
+}
+
+// Delete
+//
+//	@Tags		Contact
+//	@Summary	鍒犻櫎鑱旂郴浜�
+//	@Produce	application/json
+//	@Param		object	body		request.DeleteContact true	"鏌ヨ鍙傛暟"
+//	@Success	200	{object}	contextx.Response{}
+//	@Router		/api/contact/delete [delete]
+func (con *ContactApi) Delete(c *gin.Context) {
+	var params request.DeleteContact
+	ctx, ok := contextx.NewContext(c, &params)
+	if !ok {
+		return
+	}
+
+	errCode := contactService.DeleteContact(params.Ids)
+	if errCode != ecode.OK {
+		ctx.Fail(errCode)
+		return
+	}
+
+	ctx.Ok()
+}
+
+// Update
+//
+//	@Tags		Contact
+//	@Summary	鏇存柊鑱旂郴浜�
+//	@Produce	application/json
+//	@Param		object	body		request.UpdateContact	true	"鏌ヨ鍙傛暟"
+//	@Success	200		{object}	contextx.Response{}
+//	@Router		/api/contact/update [put]
+func (con *ContactApi) Update(c *gin.Context) {
+	var params request.UpdateContact
+	ctx, ok := contextx.NewContext(c, &params)
+	if !ok {
+		return
+	}
+
+	// check id
+	if params.Id == 0 {
+		ctx.Fail(ecode.InvalidParams)
+		return
+	}
+
+	errCode, contact := checkContactParams(params.Contact)
+	if errCode != ecode.OK {
+		ctx.Fail(errCode)
+		return
+	}
+
+	contact.Id = params.Id
+
+	errCode = contactService.UpdateContact(&contact)
+	if errCode != ecode.OK {
+		ctx.Fail(errCode)
+		return
+	}
+
+	ctx.Ok()
+}
+
+func checkContactParams(params request.Contact) (int, model.Contact) {
+	var contact model.Contact
+	// name not empty
+	//if params.Name == "" {
+	//	return ecode.InvalidParams, contact
+	//}
+	contact.Name = params.Name
+
+	contact.Phone = params.Phone
+	contact.Email = params.Email
+
+	// check member id not -1
+	//if params.MemberId == 0 {
+	//	return ecode.InvalidParams, contact
+	//}
+	contact.MemberId = params.MemberId
+
+	contact.ProvinceId = params.ProvinceId
+	contact.CityId = params.CityId
+	contact.CountryId = params.CountryId
+	contact.RegionId = params.RegionId
+	contact.Position = params.Position
+	contact.ClientId = params.ClientId
+	contact.Desc = params.Desc
+
+	// check number not empty
+	//if params.Number == "" {
+	//	return ecode.InvalidParams, contact
+	//}
+	contact.Number = params.Number
+
+	t, err := checkTimeFormat(params.Birthday)
+	if err != nil {
+		return ecode.InvalidParams, contact
+	}
+	contact.Birthday = t
+	contact.Wechat = params.Wechat
+	contact.IsFirst = params.IsFirst
+	return ecode.OK, contact
+}
+
+// List
+//
+//	@Tags		Contact
+//	@Summary	鑱旂郴浜哄垪琛�
+//	@Produce	application/json
+//	@Param		object	body		request.GetContactList	true	"鍙傛暟"
+//	@Success	200		{object}	contextx.Response{data=response.ContactResponse}
+//	@Router		/api/contact/list [post]
+func (con *ContactApi) List(c *gin.Context) {
+	var params request.GetContactList
+	ctx, ok := contextx.NewContext(c, &params)
+	if !ok {
+		return
+	}
+
+	contacts, total, errCode := contactService.GetContactList(params.Page, params.PageSize, params.SearchMap)
+	if errCode != ecode.OK {
+		ctx.Fail(errCode)
+		return
+	}
+
+	ctx.OkWithDetailed(response.ContactResponse{
+		List:  contacts,
+		Count: int(total),
+	})
+}

--
Gitblit v1.8.0