From 06c0b03df2955475fe39ff2a793a5f151f4da99f Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期四, 17 八月 2023 19:25:30 +0800
Subject: [PATCH] Merge branch 'master' into fly

---
 api/v1/masterOrder.go |   51 +++++++++++++++++++++++++++------------------------
 1 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/api/v1/masterOrder.go b/api/v1/masterOrder.go
index 3c479b3..eedae04 100644
--- a/api/v1/masterOrder.go
+++ b/api/v1/masterOrder.go
@@ -98,30 +98,6 @@
 	ctx.Ok()
 }
 
-// List
-//
-//	@Tags		MasterOrder
-//	@Summary	涓昏鍗曞垪琛�
-//	@Produce	application/json
-//	@Success	200	{object}	contextx.Response{data=response.MasterOrderResponse}
-//	@Router		/api/masterOrder/list [get]
-func (s *MasterOrderApi) List(c *gin.Context) {
-	ctx, ok := contextx.NewContext(c, nil)
-	if !ok {
-		return
-	}
-
-	list, errCode := masterOrderService.GetMasterOrderList()
-	if errCode != ecode.OK {
-		ctx.Fail(errCode)
-		return
-	}
-
-	ctx.OkWithDetailed(response.MasterOrderResponse{
-		List: list,
-	})
-}
-
 // checkMasterOrderParams
 // 妫�鏌ヤ富璁㈠崟鍙傛暟
 func checkMasterOrderParams(masterOrder request.MasterOrder) (errCode int, masterOrderModel model.MasterOrder) {
@@ -152,3 +128,30 @@
 
 	return ecode.OK, masterOrderModel
 }
+
+// List
+//
+//	@Tags		MasterOrder
+//	@Summary	閿�鍞�诲崟鍒楄〃
+//	@Produce	application/json
+//	@Param		object	body		request.GetMasterOrderList	true	"鍙傛暟"
+//	@Success	200		{object}	contextx.Response{data=response.MasterOrderResponse}
+//	@Router		/api/masterOrder/list [post]
+func (con *MasterOrderApi) List(c *gin.Context) {
+	var params request.GetMasterOrderList
+	ctx, ok := contextx.NewContext(c, &params)
+	if !ok {
+		return
+	}
+
+	masterOrders, total, errCode := masterOrderService.GetMasterOrderList(params.Page, params.PageSize, params.SearchMap)
+	if errCode != ecode.OK {
+		ctx.Fail(errCode)
+		return
+	}
+
+	ctx.OkWithDetailed(response.MasterOrderResponse{
+		List:  masterOrders,
+		Count: int(total),
+	})
+}

--
Gitblit v1.8.0