From fe3906038b25efaf0983a7cf5fede29e26d35093 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期四, 03 八月 2023 15:40:27 +0800
Subject: [PATCH] add

---
 api/v1/serviceFeeManage.go |   83 +++++++++++++++++++++++------------------
 1 files changed, 46 insertions(+), 37 deletions(-)

diff --git a/api/v1/serviceFeeManage.go b/api/v1/serviceFeeManage.go
index afa4313..f44d102 100644
--- a/api/v1/serviceFeeManage.go
+++ b/api/v1/serviceFeeManage.go
@@ -7,7 +7,6 @@
 	"aps_crm/pkg/contextx"
 	"aps_crm/pkg/ecode"
 	"github.com/gin-gonic/gin"
-	"strconv"
 )
 
 type ServiceFeeManageApi struct{}
@@ -33,6 +32,14 @@
 		return
 	}
 
+	code, client := checkClientParams(params.Client)
+	if code != ecode.OK {
+		ctx.Fail(code)
+		return
+	}
+
+	serviceFeeManage.Client = client
+
 	errCode = serviceFeeManageService.AddServiceFeeManage(&serviceFeeManage)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
@@ -47,17 +54,17 @@
 //	@Tags		ServiceFeeManage
 //	@Summary	鍒犻櫎鏈嶅姟璐圭鐞�
 //	@Produce	application/json
-//	@Param		id	path		int	true	"鏌ヨ鍙傛暟"
+//	@Param		object	body		request.DeleteServiceFeeManage true	"鏌ヨ鍙傛暟"
 //	@Success	200	{object}	contextx.Response{}
-//	@Router		/api/serviceFeeManage/delete/{id} [delete]
+//	@Router		/api/serviceFeeManage/delete [delete]
 func (s *ServiceFeeManageApi) Delete(c *gin.Context) {
-	ctx, ok := contextx.NewContext(c, nil)
+	var params request.DeleteServiceFeeManage
+	ctx, ok := contextx.NewContext(c, &params)
 	if !ok {
 		return
 	}
 
-	id, _ := strconv.Atoi(c.Param("id"))
-	errCode := serviceFeeManageService.DeleteServiceFeeManage(id)
+	errCode := serviceFeeManageService.DeleteServiceFeeManage(params.Ids)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
@@ -105,39 +112,15 @@
 	ctx.Ok()
 }
 
-// List
-//
-//	@Tags		ServiceFeeManage
-//	@Summary	鏈嶅姟璐圭鐞嗗垪琛�
-//	@Produce	application/json
-//	@Success	200	{object}	contextx.Response{data=response.ServiceFeeManageResponse}
-//	@Router		/api/serviceFeeManage/list [get]
-func (s *ServiceFeeManageApi) List(c *gin.Context) {
-	ctx, ok := contextx.NewContext(c, nil)
-	if !ok {
-		return
-	}
-
-	list, errCode := serviceFeeManageService.GetServiceFeeManageList()
-	if errCode != ecode.OK {
-		ctx.Fail(errCode)
-		return
-	}
-
-	ctx.OkWithDetailed(response.ServiceFeeManageResponse{
-		List: list,
-	})
-}
-
 // checkServiceFeeManageParams
 func checkServiceFeeManageParams(serviceFeeManage request.ServiceFeeManage) (errCode int, result model.ServiceFeeManage) {
-	if serviceFeeManage.ClientId == 0 {
-		return ecode.InvalidParams, result
-	}
+	//if serviceFeeManage.ClientId == 0 {
+	//	return ecode.InvalidParams, result
+	//}
 
-	if serviceFeeManage.MemberId == 0 {
-		return ecode.InvalidParams, result
-	}
+	//if serviceFeeManage.MemberId == 0 {
+	//	return ecode.InvalidParams, result
+	//}
 
 	t, err := checkTimeFormat(serviceFeeManage.LatestDate)
 	if err != nil {
@@ -145,7 +128,6 @@
 	}
 
 	result = model.ServiceFeeManage{
-		ClientId:   serviceFeeManage.ClientId,
 		MemberId:   serviceFeeManage.MemberId,
 		Remark:     serviceFeeManage.Remark,
 		LatestDate: t,
@@ -154,3 +136,30 @@
 
 	return ecode.OK, result
 }
+
+// List
+//
+//	@Tags		ServiceFeeManage
+//	@Summary	鏈嶅姟璐圭鐞嗗垪琛�
+//	@Produce	application/json
+//	@Param		object	body		request.GetServiceFeeManageList	true	"鍙傛暟"
+//	@Success	200		{object}	contextx.Response{data=response.ServiceFeeManageResponse}
+//	@Router		/api/serviceFeeManage/list [post]
+func (con *ServiceFeeManageApi) List(c *gin.Context) {
+	var params request.GetServiceFeeManageList
+	ctx, ok := contextx.NewContext(c, &params)
+	if !ok {
+		return
+	}
+
+	serviceFeeManages, total, errCode := serviceFeeManageService.GetServiceFeeManageList(params.Page, params.PageSize, params.Keyword)
+	if errCode != ecode.OK {
+		ctx.Fail(errCode)
+		return
+	}
+
+	ctx.OkWithDetailed(response.ServiceFeeManageResponse{
+		List:  serviceFeeManages,
+		Count: int(total),
+	})
+}

--
Gitblit v1.8.0