From 3611bc8142460df6898b8fb0a029b217af006d5b Mon Sep 17 00:00:00 2001
From: huangjiajun <582604932@qq.com>
Date: Tue, 28 May 2024 14:39:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/svc/order/svc_order_list.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/admin/svc/order/svc_order_list.go b/app/admin/svc/order/svc_order_list.go
index 007f72e..b753efa 100644
--- a/app/admin/svc/order/svc_order_list.go
+++ b/app/admin/svc/order/svc_order_list.go
@@ -25,7 +25,7 @@ func OrderList(c *gin.Context) {
 	}
 	eg := db.Db
 	list, total := db.GetOrderList(eg, args)
-	data := make([]map[string]string, 0)
+	data := make([]map[string]interface{}, 0)
 	if list != nil {
 		stateArr := []string{"待制作", "制作中", "制作完成", "烘焙完成", "分拣完成", "已取消"}
 		enterpriseIds := make([]int, 0)
@@ -42,11 +42,13 @@ func OrderList(c *gin.Context) {
 			enterpriseName := ""
 			insideEnterpriseName := ""
 			_, ok := enterpriseMap[v.EnterpriseId]
+			companyId := 0
 			if ok {
 				enterpriseName = enterpriseMap[v.EnterpriseId].Name
 				insideEnterpriseName = enterpriseMap[v.EnterpriseId].InsideName
+				companyId = enterpriseMap[v.EnterpriseId].CompanyId
 			}
-			var tmp = map[string]string{
+			var tmp = map[string]interface{}{
 				"buy_phone":       v1.BuyPhone,
 				"ord_no":          v1.OrdNo,
 				"oid":             utils.Int64ToStr(v1.Oid),
@@ -60,6 +62,8 @@ func OrderList(c *gin.Context) {
 				"is_can_cancel":   isCanCancel,
 				"enterprise_name": enterpriseName,
 				"inside_name":     insideEnterpriseName,
+				"enterprise_id":   v.EnterpriseId,
+				"company_id":      companyId,
 			}
 			data = append(data, tmp)
 		}