From a53591167bf111ffc0eb2cb129aa7ff8b4cb470d Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期二, 15 八月 2023 19:34:22 +0800
Subject: [PATCH] add
---
api/v1/serviceContract.go | 38 +++++++++-----------------------------
1 files changed, 9 insertions(+), 29 deletions(-)
diff --git a/api/v1/serviceContract.go b/api/v1/serviceContract.go
index d354aa2..7cf4b9d 100644
--- a/api/v1/serviceContract.go
+++ b/api/v1/serviceContract.go
@@ -6,6 +6,7 @@
"aps_crm/model/response"
"aps_crm/pkg/contextx"
"aps_crm/pkg/ecode"
+ "aps_crm/pkg/structx"
"github.com/gin-gonic/gin"
)
@@ -26,13 +27,13 @@
return
}
- errCode, serviceContract := checkServiceContractParams(params.ServiceContract)
- if errCode != ecode.OK {
- ctx.Fail(errCode)
+ serviceContract := new(model.ServiceContract)
+ if err := structx.AssignTo(params, serviceContract); err != nil {
+ ctx.Fail(ecode.ParamsErr)
return
}
- errCode = serviceContractService.AddServiceContract(&serviceContract)
+ errCode := serviceContractService.AddServiceContract(serviceContract)
if errCode != ecode.OK {
ctx.Fail(errCode)
return
@@ -80,42 +81,21 @@
return
}
- errCode, serviceContract := checkServiceContractParams(params.ServiceContract)
- if errCode != ecode.OK {
- ctx.Fail(errCode)
+ serviceContract := new(model.ServiceContract)
+ if err := structx.AssignTo(params, serviceContract); err != nil {
+ ctx.Fail(ecode.ParamsErr)
return
}
serviceContract.Id = params.Id
- errCode = serviceContractService.UpdateServiceContract(&serviceContract)
+ errCode := serviceContractService.UpdateServiceContract(serviceContract)
if errCode != ecode.OK {
ctx.Fail(errCode)
return
}
ctx.Ok()
-}
-
-// check params
-func checkServiceContractParams(serviceContract request.ServiceContract) (errCode int, result model.ServiceContract) {
- result.Number = serviceContract.Number
- result.MemberId = serviceContract.MemberId
- result.Remark = serviceContract.Remark
- result.ClientId = serviceContract.ClientId
- result.SalesDetailsId = serviceContract.SalesDetailsId
- result.SaleChanceId = serviceContract.SaleChanceId
- result.QuotationId = serviceContract.QuotationId
- result.ServiceContractTypeId = serviceContract.TypeId
- result.ServiceContractStatusId = serviceContract.StatusId
- 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
}
// List
--
Gitblit v1.8.0