1
This commit is contained in:
@@ -336,9 +336,15 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
|
||||
` + xpyunapi.StrRepeat("-", 32) + `客户备注: %s
|
||||
` + xpyunapi.StrRepeat("-", 32) + `
|
||||
商品列表
|
||||
商品名` + xpyunapi.StrRepeat(" ", 2) + `数量` + xpyunapi.StrRepeat(" ", 3) + `单价` + xpyunapi.StrRepeat(" ", 5) + `小计
|
||||
商品名`
|
||||
switch order.EarningType {
|
||||
case model.EarningTypePoints: // 扣点
|
||||
orderFmt += xpyunapi.StrRepeat(" ", 2) + `数量` + xpyunapi.StrRepeat(" ", 3) + `单价` + xpyunapi.StrRepeat(" ", 5) + `小计
|
||||
` + xpyunapi.StrRepeat("-", 32) + `
|
||||
`
|
||||
case model.EarningTypeQuote: // 报价
|
||||
orderFmt += xpyunapi.StrRepeat(" ", 20) + `数量<BR>` + xpyunapi.StrRepeat("-", 32)
|
||||
}
|
||||
orderParams = append(orderParams,
|
||||
utils.Time2Str(order.OrderCreatedAt),
|
||||
utils.Time2Str(expectedDeliveryTime),
|
||||
@@ -352,8 +358,13 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
|
||||
order.BuyerComment,
|
||||
)
|
||||
|
||||
for _, sku := range order.Skus {
|
||||
orderFmt += xpyunapi.FormatPrintOrderItem(sku.SkuName, sku.Count, utils.Int64ToFloat64(sku.VendorPrice))
|
||||
for k, sku := range order.Skus {
|
||||
switch order.EarningType {
|
||||
case model.EarningTypePoints: // 扣点
|
||||
orderFmt += xpyunapi.FormatPrintOrderItem(sku.SkuName, sku.Count, utils.Int64ToFloat64(sku.VendorPrice))
|
||||
case model.EarningTypeQuote: // 报价
|
||||
orderFmt += xpyunapi.FormatPrintOrderItemV2(sku.SkuName, sku.Count, k+1)
|
||||
}
|
||||
}
|
||||
orderFmt += `
|
||||
<L>共%d种%d件商品</L>
|
||||
@@ -405,9 +416,16 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
|
||||
` + xpyunapi.StrRepeat("-", 32) + `<HB>客户备注: %s
|
||||
` + xpyunapi.StrRepeat("-", 32) + `
|
||||
商品列表
|
||||
商品名` + xpyunapi.StrRepeat(" ", 2) + `数量` + xpyunapi.StrRepeat(" ", 3) + `单价` + xpyunapi.StrRepeat(" ", 5) + `小计</HB>
|
||||
商品名`
|
||||
switch order.EarningType {
|
||||
case model.EarningTypePoints: // 扣点
|
||||
orderFmt += xpyunapi.StrRepeat(" ", 2) + `数量` + xpyunapi.StrRepeat(" ", 3) + `单价` + xpyunapi.StrRepeat(" ", 5) + `小计</HB>
|
||||
` + xpyunapi.StrRepeat("-", 32) + "<HB>" + `
|
||||
`
|
||||
case model.EarningTypeQuote: // 报价
|
||||
orderFmt += xpyunapi.StrRepeat(" ", 20) + `数量<BR>` + xpyunapi.StrRepeat("-", 32)
|
||||
}
|
||||
|
||||
orderParams = append(orderParams,
|
||||
utils.Time2Str(order.OrderCreatedAt),
|
||||
utils.Time2Str(expectedDeliveryTime),
|
||||
@@ -421,8 +439,13 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
|
||||
order.BuyerComment,
|
||||
)
|
||||
|
||||
for _, sku := range order.Skus {
|
||||
orderFmt += xpyunapi.FormatPrintOrderItem(sku.SkuName, sku.Count, utils.Int64ToFloat64(sku.VendorPrice))
|
||||
for k2, sku := range order.Skus {
|
||||
switch order.EarningType {
|
||||
case model.EarningTypePoints: // 扣点
|
||||
orderFmt += xpyunapi.FormatPrintOrderItem(sku.SkuName, sku.Count, utils.Int64ToFloat64(sku.VendorPrice))
|
||||
case model.EarningTypeQuote: // 报价
|
||||
orderFmt += xpyunapi.FormatPrintOrderItemV2(sku.SkuName, sku.Count, k2+1)
|
||||
}
|
||||
}
|
||||
orderFmt += `<L>共%d种%d件商品</L>
|
||||
<L>实际支付: %s</L>
|
||||
|
||||
Reference in New Issue
Block a user