From ae4076a20e4b93703028dc1af321f6920290375f Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 10 十一月 2023 21:29:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/crm

---
 api/v1/salesDetails.go |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/api/v1/salesDetails.go b/api/v1/salesDetails.go
index 4ad4730..4511e60 100644
--- a/api/v1/salesDetails.go
+++ b/api/v1/salesDetails.go
@@ -209,18 +209,18 @@
 //	@Tags		SalesDetails
 //	@Summary	鏇存柊閿�鍞槑缁嗙姸鎬�
 //	@Produce	application/json
-//	@Param		object	body		request.UpdateSalesDetails	true	"鏌ヨ鍙傛暟"
+//	@Param		object	body		request.UpdateSalesDetailsStatus	true	"鏌ヨ鍙傛暟"
 //	@Success	200		{object}	contextx.Response{}
-//	@Router		/api/salesDetails/update [post]
+//	@Router		/api/salesDetails/updateStatus [post]
 func (s *SalesDetailsApi) UpdateStatus(c *gin.Context) {
-	var params request.UpdateSalesDetails
+	var params request.UpdateSalesDetailsStatus
 	ctx, ok := contextx.NewContext(c, &params)
 	if !ok {
 		return
 	}
 
 	m := make(map[string]interface{})
-	m["status"] = params.SalesDetails.Status
+	m["status"] = params.Status
 	err := model.NewSalesDetailsSearch().SetId(params.Id).UpdateByMap(m)
 	if err != nil {
 		ctx.FailWithMsg(ecode.UnknownErr, "鏇存柊澶辫触")
@@ -289,6 +289,13 @@
 	if !ok {
 		return
 	}
+	m := make(map[string]interface{})
+	m["status"] = params.Status
+	err := model.NewSalesDetailsSearch().SetNumber(params.Number).UpdateByMap(m)
+	if err != nil {
+		ctx.FailWithMsg(ecode.UnknownErr, "鐘舵�佹洿鏂板け璐�")
+		return
+	}
 
 	client := product_inventory.NewProductInventoryServiceClient(ProductInventoryServiceConn)
 	products := make([]*product_inventory.InventoryProduct, 0)
@@ -298,7 +305,7 @@
 		p.Amount = product.Amount.String()
 		products = append(products, &p)
 	}
-	_, err := client.CreateOperation(ctx.GetCtx(), &product_inventory.CreateOperationRequest{
+	_, err = client.CreateOperation(ctx.GetCtx(), &product_inventory.CreateOperationRequest{
 		Number:      params.Number,
 		Addressee:   params.Addressee,
 		Address:     params.Address,

--
Gitblit v1.8.0