From f13912640b945a91b028e9f29d0c50e35c768b93 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 11 八月 2023 11:21:41 +0800
Subject: [PATCH] Merge branch 'master' into zq

---
 api/v1/serviceContract.go |   42 ++++++------------------------------------
 1 files changed, 6 insertions(+), 36 deletions(-)

diff --git a/api/v1/serviceContract.go b/api/v1/serviceContract.go
index 7ab6147..d354aa2 100644
--- a/api/v1/serviceContract.go
+++ b/api/v1/serviceContract.go
@@ -46,11 +46,11 @@
 //	@Tags		ServiceContract
 //	@Summary	鍒犻櫎鏈嶅姟鍚堝悓
 //	@Produce	application/json
-//	@Param		object	body		request.DeleteserviceContract true	"鏌ヨ鍙傛暟"
+//	@Param		object	body		request.DeleteServiceContract true	"鏌ヨ鍙傛暟"
 //	@Success	200	{object}	contextx.Response{}
 //	@Router		/api/serviceContract/delete [delete]
 func (s *ServiceContractApi) Delete(c *gin.Context) {
-	var params request.DeleteserviceContract
+	var params request.DeleteServiceContract
 	ctx, ok := contextx.NewContext(c, &params)
 	if !ok {
 		return
@@ -99,44 +99,11 @@
 
 // check params
 func checkServiceContractParams(serviceContract request.ServiceContract) (errCode int, result model.ServiceContract) {
-	//if serviceContract.SignTime == "" {
-	//	return ecode.InvalidParams, result
-	//}
-	//
-	//if serviceContract.Number == "" {
-	//	return ecode.InvalidParams, result
-	//}
-	//
-	//if serviceContract.MemberId <= 0 {
-	//	return ecode.InvalidParams, result
-	//}
-
-	t, err := checkTimeFormat(serviceContract.SignTime)
-	if err != nil {
-		return ecode.InvalidParams, result
-	}
-
-	result.SignTime = t
-
-	t, err = checkTimeFormat(serviceContract.StartTime)
-	if err != nil {
-		return ecode.InvalidParams, result
-	}
-
-	result.StartTime = t
-
-	t, err = checkTimeFormat(serviceContract.EndTime)
-	if err != nil {
-		return ecode.InvalidParams, result
-	}
-
-	result.EndTime = t
-
 	result.Number = serviceContract.Number
 	result.MemberId = serviceContract.MemberId
 	result.Remark = serviceContract.Remark
 	result.ClientId = serviceContract.ClientId
-	result.ContactId = serviceContract.ContactId
+	result.SalesDetailsId = serviceContract.SalesDetailsId
 	result.SaleChanceId = serviceContract.SaleChanceId
 	result.QuotationId = serviceContract.QuotationId
 	result.ServiceContractTypeId = serviceContract.TypeId
@@ -144,6 +111,9 @@
 	result.ServiceTimes = serviceContract.ServiceTimes
 	result.Terms = serviceContract.Terms
 	result.Products = serviceContract.Products
+	result.SignTime = serviceContract.SignTime
+	result.StartTime = serviceContract.StartTime
+	result.EndTime = serviceContract.EndTime
 
 	return ecode.OK, result
 }

--
Gitblit v1.8.0