From b4400a06b5f801bc7a85320680d0b6c45c547ff0 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 28 七月 2023 10:21:33 +0800
Subject: [PATCH] fix

---
 api/v1/serviceFeeManage.go |   71 ++++++++++++++++++++---------------
 1 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/api/v1/serviceFeeManage.go b/api/v1/serviceFeeManage.go
index afa4313..c7b71d5 100644
--- a/api/v1/serviceFeeManage.go
+++ b/api/v1/serviceFeeManage.go
@@ -33,6 +33,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)
@@ -105,39 +113,16 @@
 	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 +130,6 @@
 	}
 
 	result = model.ServiceFeeManage{
-		ClientId:   serviceFeeManage.ClientId,
 		MemberId:   serviceFeeManage.MemberId,
 		Remark:     serviceFeeManage.Remark,
 		LatestDate: t,
@@ -154,3 +138,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),
+	})
+}
\ No newline at end of file

--
Gitblit v1.8.0