diff --git a/business/partner/printer/feie/feie.go b/business/partner/printer/feie/feie.go
index b7863b2b9..289e11b73 100644
--- a/business/partner/printer/feie/feie.go
+++ b/business/partner/printer/feie/feie.go
@@ -85,10 +85,10 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
商品明细:
`
- priceQuote := `品名 数量
+ orderFmt += `品名 数量
--------------------------------
` // 报价
- pricePoints := `品名 数量 单价 小计
---------------------------------
` // 扣点
+ // pricePoints := `品名 数量 单价 小计
+ //--------------------------------
` // 扣点
// 实际支付:%s
orderParams = append(orderParams,
jxutils.GetVendorName(order.VendorID),
@@ -104,23 +104,29 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
order.BuyerComment,
// jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice),
)
- switch order.EarningType {
- case model.EarningTypePoints: // 扣点
- orderFmt += pricePoints
- case model.EarningTypeQuote: // 报价
- orderFmt += priceQuote
- }
+ //switch order.EarningType {
+ //case model.EarningTypePoints: // 扣点
+ // orderFmt += pricePoints
+ //case model.EarningTypeQuote: // 报价
+ // orderFmt += priceQuote
+ //}
for _, sku := range order.Skus {
- switch order.EarningType {
- case model.EarningTypePoints: // 扣点
- orderFmt += `%s
`
- orderFmt += `%8s%10s%10s
`
- orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count)))
- case model.EarningTypeQuote: // 报价
- orderFmt += `%s %25s
`
- orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count))
+ if sku.Count > 1 {
+ orderFmt += `%s %s
`
+ } else {
+ orderFmt += `%s %s
`
}
+ orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count))
+ //switch order.EarningType {
+ //case model.EarningTypePoints: // 扣点
+ // orderFmt += `%s
`
+ // orderFmt += `%8s%10s%10s
`
+ // orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count)))
+ //case model.EarningTypeQuote: // 报价
+ // orderFmt += `%s %25s
`
+ // orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count))
+ //}
//标品需要打印条形码
if sku.Upc != "" {
orderFmt += `upc码: %s
`
@@ -129,7 +135,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
}
orderFmt += `
共%d种%d件商品
-实付:%s
+实付:%s
--------------------------------
商品质量问题请联系:
更多信息请关注官方微信: %s
@@ -215,16 +221,22 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
)
for _, sku := range order.Skus {
- orderFmt += `%s
`
- switch order.EarningType {
- case model.EarningTypePoints: // 扣点
- orderFmt += `%s %s %s
`
- orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count)))
- case model.EarningTypeQuote: // 报价
- orderFmt += `%s
`
- orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count))
+ if sku.Count > 1 {
+ orderFmt += `%s %s
`
+ } else {
+ orderFmt += `%s %s
`
}
+ orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count))
+ //orderFmt += `%s
`
+ //switch order.EarningType {
+ //case model.EarningTypePoints: // 扣点
+ // orderFmt += `%s %s %s
`
+ // orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count)))
+ //case model.EarningTypeQuote: // 报价
+ // orderFmt += `%s
`
+ // orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count))
+ //}
//orderFmt += `%s %s %s
`
//orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count)))
//标品需要打印条形码
@@ -235,8 +247,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
}
orderFmt += `
共%d种%d件商品
-实付:%s
-
+实付:%s
--------------------------------
商品质量问题请联系:
更多信息请关注官方微信: %s