Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

This commit is contained in:
邹宗楠
2023-03-20 17:28:27 +08:00

View File

@@ -329,9 +329,9 @@ func (c *PrinterHandler) getCancelOrRefundOrderContent(order *model.GoodsOrder,
}
title := ``
if printType == model.YES { // 取消订单
title = `<HB><C>取消订单详情</HB></C><BR>`
title = `<HB><L>取消订单详情</HB><BR>`
} else { // 售后订单
title = `<HB><C>退款订单详情</HB></C><BR>`
title = `<HB><L>退款订单详情</HB><BR>`
}
orderFmt +=
@@ -348,7 +348,7 @@ func (c *PrinterHandler) getCancelOrRefundOrderContent(order *model.GoodsOrder,
)
orderFmt += xpyunapi.StrRepeat("-", 32)
orderFmt += `<L>共%d种%d件商品</L>
实际支付:%s<BR>`
实际支付:%s<BR>`
orderFmt += xpyunapi.StrRepeat("-", 14) + "#%d完</HB>" + xpyunapi.StrRepeat("-", 14) + `<BR>`
orderParams = append(orderParams, order.SkuCount, order.GoodsCount, jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), order.OrderSeq)
return fmt.Sprintf(orderFmt, orderParams...)
@@ -374,9 +374,9 @@ func (c *PrinterHandler) getCancelOrRefundOrderContentBig(order *model.GoodsOrde
}
title := ``
if printType == model.YES { // 取消订单
title = `<HB><C>取消订单详情</HB></C><BR>`
title = `<HB><L>取消订单详情</HB><BR>`
} else { // 售后订单
title = `<HB><C>退款订单详情</HB></C><BR>`
title = `<HB><L>退款订单详情</HB><BR>`
}
orderFmt +=
@@ -393,7 +393,7 @@ func (c *PrinterHandler) getCancelOrRefundOrderContentBig(order *model.GoodsOrde
)
orderFmt += xpyunapi.StrRepeat("-", 32)
orderFmt += `<L><HB>共%d种%d件商品</L>
实际支付:%s</HB><BR>`
实际支付:%s</HB><BR>`
orderFmt += xpyunapi.StrRepeat("-", 14) + "#%d完</HB>" + xpyunapi.StrRepeat("-", 14) + `<BR>`
orderParams = append(orderParams, order.SkuCount, order.GoodsCount, jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), order.OrderSeq)
return fmt.Sprintf(orderFmt, orderParams...)