From cdd28ce1b7d5c983bbc23dda5d202d5cae8b207d Mon Sep 17 00:00:00 2001
From: chenlin <chenlin@deovo.net>
Date: Wed, 9 Oct 2024 19:47:09 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E9=9B=B6=E5=94=AE?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E4=B8=AD=E9=94=80=E5=94=AE=E6=AF=9B=E5=88=A9?=
 =?UTF-8?q?=E5=92=8C=E5=91=98=E5=B7=A5=E6=AF=9B=E5=88=A9=EF=BC=8C=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E5=90=8E=E6=9B=B4=E6=96=B0=E6=97=B6=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E5=AE=9E=E9=99=85=E9=9B=B6=E5=94=AE=E4=BB=B7=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=EF=BC=9B=202=E3=80=81=E9=9B=B6=E5=94=AE=E5=B0=8F=E7=A5=A8?=
 =?UTF-8?q?=E6=94=B6=E9=93=B6=E4=BA=BA=E5=91=98=E5=90=8D=E7=A7=B0=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=8E=E5=88=B6=E5=8D=95=E4=BA=BA=E5=91=98=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E4=BA=BA=E5=91=98=E5=90=8D=E7=A7=B0=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/models/erp_order.go | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/admin/models/erp_order.go b/app/admin/models/erp_order.go
index e061cf7..9b503d9 100644
--- a/app/admin/models/erp_order.go
+++ b/app/admin/models/erp_order.go
@@ -846,8 +846,8 @@ func updateErpStockCommodityID(gdb *gorm.DB, commodity ErpOrderCommodity, nIdLis
 			"retail_price":           stockCommodity.RetailPrice,
 			"wholesale_price":        stockCommodity.WholesalePrice,
 			"staff_cost_price":       stockCommodity.StaffCostPrice,
-			"sales_profit":           commodity.SalePrice - stockCommodity.WholesalePrice,
-			"staff_profit":           commodity.SalePrice - stockCommodity.WholesalePrice - stockCommodity.StaffCostPrice,
+			"sales_profit":           commodity.ReceivedAmount - stockCommodity.WholesalePrice,
+			"staff_profit":           commodity.ReceivedAmount - stockCommodity.WholesalePrice - stockCommodity.StaffCostPrice,
 		}).Error
 	//Update("erp_stock_commodity_id", strId).Error
 	if err != nil {
@@ -5168,12 +5168,28 @@ func QueryReceiptData(req *ErpOrderDeleteReq, c *gin.Context) (*ErpOrderReceiptD
 	}
 
 	order := orders[0]
+	var salesName string
+	if order.SalesmanList != "" {
+		var salesmanInfo []ErpOrderSales
+		err = json.Unmarshal([]byte(order.SalesmanList), &salesmanInfo)
+		if err != nil {
+			logger.Error("unmarshal err:", logger.Field("err", err))
+		}
+
+		// 遍历销售员信息，拼接名称
+		var names []string
+		for _, item := range salesmanInfo {
+			names = append(names, item.Name)
+		}
+		salesName = strings.Join(names, "，") // 使用中文逗号拼接
+	}
+
 	resp := new(ErpOrderReceiptDataResp)
 	resp.StoreName = order.StoreName
 	resp.Barcode = order.BillSn
 	resp.OddNum = order.BillSn
 	resp.Time = orders[0].UpdatedAt
-	resp.CollectS = order.MakerName
+	resp.CollectS = salesName
 
 	var totalCouponAmount float64
 	commodityMap := make(map[string]TableData, 0)