diff --git a/business/partner/printer/trendit/trendit.go b/business/partner/printer/trendit/trendit.go
index 5d670d967..5627bc19b 100644
--- a/business/partner/printer/trendit/trendit.go
+++ b/business/partner/printer/trendit/trendit.go
@@ -101,10 +101,14 @@ func (p PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, s
return
}
content := ""
- if store.PrinterFontSize == partner.PrinterFontSizeBig || store.PrinterFontSize == partner.PrinterFontSizeBig2 {
- content = p.getOrderContentBigV2(order, store.Tel1, storeDetail)
+ if store.ID == 669063 {
+ content = p.getOrderContent(order, store.Tel1, storeDetail)
} else {
- content = p.getOrderContentV2(order, store.Tel1, storeDetail)
+ if store.PrinterFontSize == partner.PrinterFontSizeBig || store.PrinterFontSize == partner.PrinterFontSizeBig2 {
+ content = p.getOrderContentBigV2(order, store.Tel1, storeDetail)
+ } else {
+ content = p.getOrderContentV2(order, store.Tel1, storeDetail)
+ }
}
count := 0
for {
@@ -326,6 +330,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
期望送达: %s
客户姓名: %s
客户电话: %s
+店铺名称: %s
订单编号: %s
%s#%d
%s
@@ -334,7 +339,6 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
--------------------------------
客户备注:%s
--------------------------------
-商品列表
商品名` + trenditapi.StrRepeat(" ", 2) + `数量` + trenditapi.StrRepeat(" ", 3) + `单价` + trenditapi.StrRepeat(" ", 5) + `小计
` + trenditapi.StrRepeat("-", 32) + `
`
@@ -343,6 +347,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
utils.Time2Str(expectedDeliveryTime),
order.ConsigneeName,
order.ConsigneeMobile,
+ order.StoreName,
order.VendorOrderID,
jxutils.GetVendorName(order.VendorID),
order.OrderSeq,
@@ -394,6 +399,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
期望送达: %s
客户姓名: %s
客户电话: %s
+店铺名称: %s
订单编号: %s
%s#%d
%s