From b0940df6ba0571d6bcc5f12192b485da37eb59e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Fri, 12 Aug 2022 10:24:40 +0800
Subject: [PATCH] 1

---
 .../partner/printer/jxprint/jxprint_const.go  | 37 +++++++++----------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/business/partner/printer/jxprint/jxprint_const.go b/business/partner/printer/jxprint/jxprint_const.go
index eb105b224..b9aafd96b 100644
--- a/business/partner/printer/jxprint/jxprint_const.go
+++ b/business/partner/printer/jxprint/jxprint_const.go
@@ -58,26 +58,6 @@ type SkuListPrintOrder struct {
 	Upc             string `json:"upc"`             // 条形码
 }
 
-// ManagerStore 送达提示数据组装
-func ManagerStore(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) map[string]string {
-	printOrder := make(map[string]string, 0)
-	// 获取品牌名称
-	if storeDetail != nil && storeDetail.BrandIsPrint == model.NO {
-		if order.VendorOrgCode == "34665" {
-			printOrder[EBailOrderNo] = globals.StoreNameEbai2
-		} else {
-			printOrder[EBailOrderNo] = storeDetail.BrandName
-		}
-	}
-
-	printOrder[VendOrID] = utils.Int2Str(order.VendorID)
-	printOrder[VendorName] = jxutils.GetVendorName(order.VendorID)
-	printOrder[StoreName] = order.StoreName
-	printOrder[StoreTel] = storeTel
-	printOrder[OfficialName] = globals.StoreName
-	return printOrder
-}
-
 // ManagerOrderPrint 京西云参数组装(订单参数)
 func ManagerOrderPrint(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) map[string]string {
 	printOrder := make(map[string]string, 0)
@@ -149,3 +129,20 @@ func ManageWayBillPrint(order *model.GoodsOrder, storeTel string, storeDetail *d
 	printOrder[OfficialName] = globals.StoreName
 	return printOrder
 }
+
+// ManagerStore 送达提示数据组装
+func ManagerStore(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) map[string]string {
+	printOrder := make(map[string]string, 0)
+	printOrder[OrderNo] = order.VendorOrderID
+	printOrder[VendorOrderNo] = utils.Int2Str(order.VendorID)
+	printOrder[VendorName] = jxutils.GetVendorName(order.VendorID)
+	printOrder[StoreName] = order.StoreName
+	printOrder[StoreTel] = storeTel
+	return printOrder
+}
+
+// ManagerEnterTheStore 进店咨询
+func ManagerEnterTheStore(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) map[string]string {
+	printOrder := make(map[string]string, 0)
+	return printOrder
+}