diff --git a/business/partner/printer/feie/feie.go b/business/partner/printer/feie/feie.go
index f50a06181..149ded071 100644
--- a/business/partner/printer/feie/feie.go
+++ b/business/partner/printer/feie/feie.go
@@ -42,9 +42,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
orderFmt := ``
if storeDetail != nil {
if storeDetail.BrandIsPrint == model.NO {
- orderFmt += `
- %s
- `
+ orderFmt += `%s
`
if order.VendorOrgCode == "34665" {
orderParams = append(orderParams, globals.StoreNameEbai2)
} else {
@@ -53,8 +51,8 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
}
}
orderFmt += `
-%s#%d
-%s:%s
+%s#%d
+%s:%s
--------------------------------
下单时间: %s
预计送达: %s
@@ -70,8 +68,6 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
`
}
orderFmt += `
-
-
%s
` + getCode +
`客户: %s
@@ -80,8 +76,6 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
客户备注:
%s
-
-
商品明细:
`
@@ -137,10 +131,8 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
共%d种%d件商品
实付:%s
--------------------------------
-商品质量问题请联系:
+商品质量问题请联系:
更多信息请关注官方微信: %s
-
---------------------------------
--------------------------------
`
// http://weixin.qq.com/r/tkkDGzTERmk5rXB49xyk
@@ -161,9 +153,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
orderFmt := ``
if storeDetail != nil {
if storeDetail.BrandIsPrint == model.NO {
- orderFmt += `
- %s
- `
+ orderFmt += `%s
`
if order.VendorOrgCode == "34665" {
orderParams = append(orderParams, globals.StoreNameEbai2)
} else {
@@ -171,9 +161,8 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
}
}
}
- orderFmt += `
-%s#%d
-%s:%s
+ orderFmt += `%s#%d
+%s:%s
--------------------------------
下单时间: %s
预计送达: %s
@@ -192,17 +181,14 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
orderFmt += `%s
` + getCode +
- `客户: %s
+ `客户: %s
电话: %s
地址: %s
-
-客户备注:
+客户备注:
%s
-
-
-商品明细:
-品名数量单价小计
+商品明细:
+品名数量单价小计
--------------------------------
`
// 实际支付:%s
orderParams = append(orderParams,
@@ -222,7 +208,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
for _, sku := range order.Skus {
if sku.Count > 1 {
- orderFmt += `%s %s
`
+ orderFmt += `%s %s
`
} else {
orderFmt += `%s %s
`
}
@@ -245,14 +231,12 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
orderParams = append(orderParams, sku.Upc)
}
}
- orderFmt += `
+ orderFmt += `
共%d种%d件商品
实付:%s
--------------------------------
-商品质量问题请联系:
+商品质量问题请联系:
更多信息请关注官方微信: %s
-
---------------------------------
--------------------------------
`
// http://weixin.qq.com/r/tkkDGzTERmk5rXB49xyk
@@ -298,7 +282,7 @@ func (c *PrinterHandler) getCancelOrRefundOrderContent(order *model.GoodsOrder,
orderFmt += `
\n
-%s #%d
+%s #%d
` + title + `
--------------------------------\n`
orderParams = append(orderParams,
@@ -341,10 +325,10 @@ func (c *PrinterHandler) getCancelOrRefundOrderContentBig(order *model.GoodsOrde
title = `售后订单详情
`
}
orderFmt += `--------------------------------
-下单时间: %s
-订单编号: %s
+下单时间: %s
+订单编号: %s
\n
-%s #%d
+%s #%d
\n
` + title + `
--------------------------------\n`