From 7f8a45a749419c3da5b81c4683f0b8034f5280f3 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期二, 25 七月 2023 15:20:09 +0800
Subject: [PATCH] fix

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

diff --git a/api/v1/client.go b/api/v1/client.go
index 8d47ac9..96aa141 100644
--- a/api/v1/client.go
+++ b/api/v1/client.go
@@ -68,20 +68,20 @@
 
 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
-	}
+	//if params.ClientStatusId == 0 {
+	//	return ecode.InvalidParams, nil
+	//}
+	//client.ClientStatusId = params.ClientStatusId
+	//
+	//if params.MemberId == 0 {
+	//	return ecode.InvalidParams, nil
+	//}
 	client.MemberId = params.MemberId
 
 	t, err := checkTimeFormat(params.NextVisitTime)
@@ -98,6 +98,13 @@
 
 	client.LatestServiceTime = t
 
+	t, err = checkTimeFormat(params.RegistrationTime)
+	if err != nil {
+		return ecode.InvalidParams, nil
+	}
+
+	client.RegistrationTime = t
+
 	client.ClientTypeId = params.ClientTypeId
 	client.ClientOriginId = params.ClientOriginId
 	client.ClientLevelId = params.ClientLevelId
@@ -105,6 +112,16 @@
 	client.Remark = params.Remark
 	client.Number = params.Number
 	client.ServiceMemberId = params.ServiceMemberId
+	client.ProvinceId = params.ProvinceId
+	client.CityId = params.CityId
+	client.RegionId = params.RegionId
+	client.CountryId = params.CountryId
+	client.Business.BusinessScope = params.BusinessScope
+	client.Business.Representative = params.Representative
+	client.Business.RegisteredCapitalId = params.RegisteredCapitalId
+	client.Business.IndustryId = params.IndustryId
+	client.Business.EnterpriseNatureId = params.EnterpriseNatureId
+	client.Business.EnterpriseScaleId = params.EnterpriseScaleId
 
 	if params.Contact.Name != "" {
 		// assign the client's member id to contact when adding
@@ -151,7 +168,7 @@
 //	@Produce	application/json
 //	@Param		object	body		request.UpdateClient	true	"鏌ヨ鍙傛暟"
 //	@Success	200		{object}	contextx.Response{}
-//	@Router		/api/client/update [post]
+//	@Router		/api/client/update [put]
 func (cli *ClientApi) Update(c *gin.Context) {
 	var params request.UpdateClient
 	ctx, ok := contextx.NewContext(c, &params)
@@ -171,6 +188,8 @@
 		return
 	}
 
+	client.Id = params.Id
+
 	errCode = clientService.UpdateClient(client)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)

--
Gitblit v1.8.0