From e9f22f3da771926b5f5f94ea7a474ccd96e7b298 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Thu, 11 Aug 2022 17:15:21 +0800
Subject: [PATCH] 1

---
 .../partner/printer/jxprint/jxprint_const.go  | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/business/partner/printer/jxprint/jxprint_const.go b/business/partner/printer/jxprint/jxprint_const.go
index 45cee17ae..eb105b224 100644
--- a/business/partner/printer/jxprint/jxprint_const.go
+++ b/business/partner/printer/jxprint/jxprint_const.go
@@ -78,8 +78,8 @@ func ManagerStore(order *model.GoodsOrder, storeTel string, storeDetail *dao.Sto
 	return printOrder
 }
 
-// ManagerOrderAndStore 京西云参数组装(订单参数)
-func ManagerOrderAndStore(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) map[string]string {
+// ManagerOrderPrint 京西云参数组装(订单参数)
+func ManagerOrderPrint(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) map[string]string {
 	printOrder := make(map[string]string, 0)
 	skuList := make([]*SkuListPrintOrder, 0, 0)
 	// 获取品牌名称
@@ -129,3 +129,23 @@ func ManagerOrderAndStore(order *model.GoodsOrder, storeTel string, storeDetail
 	printOrder[OfficialName] = globals.StoreName
 	return printOrder
 }
+
+// ManageWayBillPrint 组装运单打印数据
+func ManageWayBillPrint(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
+}