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 +}