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/salesDetails.go |   84 +++++++++++++++++++++++-------------------
 1 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/api/v1/salesDetails.go b/api/v1/salesDetails.go
index 2f57c93..113673f 100644
--- a/api/v1/salesDetails.go
+++ b/api/v1/salesDetails.go
@@ -87,6 +87,7 @@
 		return
 	}
 
+	salesDetails.Id = params.Id
 	errCode = salesDetailsService.UpdateSalesDetails(&salesDetails)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
@@ -96,46 +97,23 @@
 	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
-	}
+	//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 {
@@ -161,6 +139,36 @@
 	salesDetailsModel.Addressee = salesDetails.Addressee
 	salesDetailsModel.Conditions = salesDetails.Conditions
 	salesDetailsModel.Products = salesDetails.Products
+	salesDetailsModel.LogisticCompany = salesDetails.LogisticCompany
+	salesDetailsModel.LogisticNumber = salesDetails.LogisticNumber
+	salesDetailsModel.LogisticCost = salesDetails.LogisticCost
 
 	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.Keyword)
+	if errCode != ecode.OK {
+		ctx.Fail(errCode)
+		return
+	}
+
+	ctx.OkWithDetailed(response.SalesDetailsResponse{
+		List: salesDetailss,
+		Count: int(total),
+	})
+}
\ No newline at end of file

--
Gitblit v1.8.0