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)