diff --git a/business/partner/printer/xpyun/xpyun.go b/business/partner/printer/xpyun/xpyun.go index c881e7514..9425d9195 100644 --- a/business/partner/printer/xpyun/xpyun.go +++ b/business/partner/printer/xpyun/xpyun.go @@ -319,7 +319,7 @@ func (c *PrinterHandler) getCancelOrRefundOrderContent(order *model.GoodsOrder, orderFmt := `` if storeDetail != nil { if storeDetail.BrandIsPrint == model.NO { - orderFmt += `%s` + orderFmt += `%s` if order.VendorOrgCode == "34665" { orderParams = append(orderParams, globals.StoreNameEbai2) } else { @@ -329,16 +329,16 @@ func (c *PrinterHandler) getCancelOrRefundOrderContent(order *model.GoodsOrder, } title := `` if printType == model.YES { // 取消订单 - title = `取消订单详情` + title = `取消订单详情` } else { // 售后订单 - title = `退款订单详情` + title = `退款订单详情` } orderFmt += xpyunapi.StrRepeat("-", 32) + ` 下单时间: %s 订单编号: %s -%s#%d +%s#%d ` + title orderParams = append(orderParams, utils.Time2Str(order.OrderCreatedAt), @@ -347,7 +347,10 @@ func (c *PrinterHandler) getCancelOrRefundOrderContent(order *model.GoodsOrder, order.OrderSeq, ) orderFmt += xpyunapi.StrRepeat("-", 32) - orderParams = append(orderParams, order.SkuCount, order.GoodsCount, jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice)) + orderFmt += `共%d种%d件商品 +实际支付:¥%d` + orderFmt += xpyunapi.StrRepeat("-", 14) + "#%d完" + xpyunapi.StrRepeat("-", 14) + `
` + orderParams = append(orderParams, order.SkuCount, order.GoodsCount, jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), order.OrderSeq) return fmt.Sprintf(orderFmt, orderParams...) } @@ -361,7 +364,7 @@ func (c *PrinterHandler) getCancelOrRefundOrderContentBig(order *model.GoodsOrde orderFmt := `` if storeDetail != nil { if storeDetail.BrandIsPrint == model.NO { - orderFmt += `%s` + orderFmt += `%s` if order.VendorOrgCode == "34665" { orderParams = append(orderParams, globals.StoreNameEbai2) } else { @@ -369,21 +372,18 @@ func (c *PrinterHandler) getCancelOrRefundOrderContentBig(order *model.GoodsOrde } } } - - // 加载用户取消订单售后单 - title := `` if printType == model.YES { // 取消订单 - title = `取消订单详情` + title = `取消订单详情` } else { // 售后订单 - title = `退款订单详情` + title = `退款订单详情` } orderFmt += xpyunapi.StrRepeat("-", 32) + ` -下单时间: %s -订单编号: %s
-%s#%d +下单时间: %s +订单编号: %s +%s#%d ` + title orderParams = append(orderParams, utils.Time2Str(order.OrderCreatedAt), @@ -392,6 +392,9 @@ func (c *PrinterHandler) getCancelOrRefundOrderContentBig(order *model.GoodsOrde order.OrderSeq, ) orderFmt += xpyunapi.StrRepeat("-", 32) - orderParams = append(orderParams, order.SkuCount, order.GoodsCount, jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice)) + orderFmt += `共%d种%d件商品 +实际支付:¥%d
` + orderFmt += xpyunapi.StrRepeat("-", 14) + "#%d完
" + xpyunapi.StrRepeat("-", 14) + `
` + orderParams = append(orderParams, order.SkuCount, order.GoodsCount, jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), order.OrderSeq) return fmt.Sprintf(orderFmt, orderParams...) }