From 8bf1cad94113d5c604e95e370cf068efdea87d27 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期三, 30 八月 2023 09:43:49 +0800
Subject: [PATCH] fix

---
 api/v1/salesDetails.go |  110 +++++++++++++++++++++++++++---------------------------
 1 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/api/v1/salesDetails.go b/api/v1/salesDetails.go
index d7f8bec..24a27a1 100644
--- a/api/v1/salesDetails.go
+++ b/api/v1/salesDetails.go
@@ -18,7 +18,7 @@
 //	@Summary	娣诲姞閿�鍞槑缁�
 //	@Produce	application/json
 //	@Param		object	body		request.AddSalesDetails	true	"鏌ヨ鍙傛暟"
-//	@Success	200		{object}	contextx.Response{}
+//	@Success	200		{object}	contextx.Response{data=request.AddSalesDetails}
 //	@Router		/api/salesDetails/add [post]
 func (s *SalesDetailsApi) Add(c *gin.Context) {
 	var params request.AddSalesDetails
@@ -39,7 +39,7 @@
 		return
 	}
 
-	ctx.Ok()
+	ctx.OkWithDetailed(salesDetails)
 }
 
 // Delete
@@ -58,6 +58,29 @@
 
 	id, _ := strconv.Atoi(c.Param("id"))
 	errCode := salesDetailsService.DeleteSalesDetails(id)
+	if errCode != ecode.OK {
+		ctx.Fail(errCode)
+		return
+	}
+
+	ctx.Ok()
+}
+
+// BatchDelete
+// @Tags	SalesDetails 閿�鍞槑缁�
+// @Summary	鎵归噺鍒犻櫎閿�鍞槑缁�
+// @Produce	application/json
+// @Param	object	body request.CommonIds	true "鍙傛暟"
+// @Success	200	{object}	contextx.Response{}
+// @Router		/api/salesDetails/delete [delete]
+func (s *SalesDetailsApi) BatchDelete(c *gin.Context) {
+	var params request.CommonIds
+	ctx, ok := contextx.NewContext(c, &params)
+	if !ok {
+		return
+	}
+
+	errCode := salesDetailsService.BatchDeleteSalesDetails(params.Ids)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
@@ -97,65 +120,15 @@
 	ctx.Ok()
 }
 
-// List
-//
-//	@Tags		SalesDetails
-//	@Summary	鑾峰彇閿�鍞槑缁嗗垪琛�
-//	@Produce	application/json
-//	@Success	200	{object}	contextx.Response{data=response.SalesDetailsResponse}
-//	@Router		/api/salesDetails/list [get]
-func (s *SalesDetailsApi) List(c *gin.Context) {
-	ctx, ok := contextx.NewContext(c, nil)
-	if !ok {
-		return
-	}
-
-	list, errCode := salesDetailsService.GetSalesDetailsList()
-	if errCode != ecode.OK {
-		ctx.Fail(errCode)
-		return
-	}
-
-	ctx.OkWithDetailed(response.SalesDetailsResponse{
-		List: list,
-	})
-}
-
 func checkSalesDetailsParams(salesDetails request.SalesDetails) (errCode int, salesDetailsModel model.SalesDetails) {
-	//if salesDetails.ClientId == 0 {
-	//	return ecode.InvalidParams, salesDetailsModel
-	//}
-	//
-	//if salesDetails.Number == "" {
-	//	return ecode.InvalidParams, salesDetailsModel
-	//}
-	//
-	//if salesDetails.MemberId == 0 {
-	//	return ecode.InvalidParams, salesDetailsModel
-	//}
-	//
-	//if salesDetails.SignTime == "" {
-	//	return ecode.InvalidParams, salesDetailsModel
-	//}
-
-	t, err := checkTimeFormat(salesDetails.SignTime)
-	if err != nil {
-		return ecode.InvalidParams, salesDetailsModel
-	}
-
-	t, err = checkTimeFormat(salesDetails.DeliveryDate)
-	if err != nil {
-		return ecode.InvalidParams, salesDetailsModel
-	}
-
 	salesDetailsModel.ClientId = salesDetails.ClientId
 	salesDetailsModel.Number = salesDetails.Number
 	salesDetailsModel.SaleChanceId = salesDetails.SaleChanceId
 	salesDetailsModel.SaleType = salesDetails.SaleType
-	salesDetailsModel.SignTime = t
+	salesDetailsModel.SignTime = salesDetails.SignTime
 	salesDetailsModel.MemberId = salesDetails.MemberId
-	salesDetailsModel.DeliveryDate = t
-	salesDetailsModel.WechatOrderStatus = salesDetails.WechatOrderStatus
+	salesDetailsModel.DeliveryDate = salesDetails.DeliveryDate
+	salesDetailsModel.WechatOrderStatusId = salesDetails.WechatOrderStatusId
 	salesDetailsModel.Address = salesDetails.Address
 	salesDetailsModel.Phone = salesDetails.Phone
 	salesDetailsModel.Remark = salesDetails.Remark
@@ -168,3 +141,30 @@
 
 	return ecode.OK, salesDetailsModel
 }
+
+// List
+//
+//	@Tags		SalesDetails
+//	@Summary	閿�鍞槑缁嗗崟鍒楄〃
+//	@Produce	application/json
+//	@Param		object	body		request.GetSalesDetailsList	true	"鍙傛暟"
+//	@Success	200		{object}	contextx.Response{data=response.SalesDetailsResponse}
+//	@Router		/api/salesDetails/list [post]
+func (con *SalesDetailsApi) List(c *gin.Context) {
+	var params request.GetSalesDetailsList
+	ctx, ok := contextx.NewContext(c, &params)
+	if !ok {
+		return
+	}
+
+	salesDetailss, total, errCode := salesDetailsService.GetSalesDetailsList(params.Page, params.PageSize, params.KeywordType, params.Keyword)
+	if errCode != ecode.OK {
+		ctx.Fail(errCode)
+		return
+	}
+
+	ctx.OkWithDetailed(response.SalesDetailsResponse{
+		List:  salesDetailss,
+		Count: int(total),
+	})
+}

--
Gitblit v1.8.0