From a631f0f8f824caca91bc99e7dbb1f27c6c0a39ef Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 18 八月 2023 17:12:20 +0800
Subject: [PATCH] fix

---
 api/v1/masterOrder.go |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/api/v1/masterOrder.go b/api/v1/masterOrder.go
index 6415320..ec53bae 100644
--- a/api/v1/masterOrder.go
+++ b/api/v1/masterOrder.go
@@ -7,7 +7,6 @@
 	"aps_crm/pkg/contextx"
 	"aps_crm/pkg/ecode"
 	"github.com/gin-gonic/gin"
-	"strconv"
 )
 
 type MasterOrderApi struct{}
@@ -47,17 +46,17 @@
 //	@Tags		MasterOrder
 //	@Summary	鍒犻櫎涓昏鍗�
 //	@Produce	application/json
-//	@Param		id	path		int	true	"鏌ヨ鍙傛暟"
+//	@Param		object	body		request.DeleteMasterOrder true	"鏌ヨ鍙傛暟"
 //	@Success	200	{object}	contextx.Response{}
-//	@Router		/api/masterOrder/delete/{id} [delete]
+//	@Router		/api/masterOrder/delete [delete]
 func (s *MasterOrderApi) Delete(c *gin.Context) {
-	ctx, ok := contextx.NewContext(c, nil)
+	var params request.DeleteMasterOrder
+	ctx, ok := contextx.NewContext(c, &params)
 	if !ok {
 		return
 	}
 
-	id, _ := strconv.Atoi(c.Param("id"))
-	errCode := masterOrderService.DeleteMasterOrder(id)
+	errCode := masterOrderService.DeleteMasterOrder(params.Ids)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
@@ -97,7 +96,6 @@
 
 	ctx.Ok()
 }
-
 
 // checkMasterOrderParams
 // 妫�鏌ヤ富璁㈠崟鍙傛暟
@@ -145,14 +143,14 @@
 		return
 	}
 
-	masterOrders, errCode := masterOrderService.GetMasterOrderList(params.Page, params.PageSize, params.Keyword)
+	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: len(masterOrders),
+		List:  masterOrders,
+		Count: int(total),
 	})
 }

--
Gitblit v1.8.0