diff --git a/business/partner/printer/feie/feie.go b/business/partner/printer/feie/feie.go index 9ddc08d36..fc40576d4 100644 --- a/business/partner/printer/feie/feie.go +++ b/business/partner/printer/feie/feie.go @@ -79,8 +79,11 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
商品明细:
-品名 数量 单价 小计
---------------------------------
` +` + priceQuote := `品名 数量
+--------------------------------
` // 报价 + pricePoints := `品名 数量 单价 小计
+--------------------------------
` // 扣点 // 实际支付:%s
orderParams = append(orderParams, jxutils.GetVendorName(order.VendorID), @@ -95,11 +98,23 @@ 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 + } for _, sku := range order.Skus { - 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))) + 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
` @@ -186,8 +201,18 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st for _, sku := range order.Skus { orderFmt += `%s
` - 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))) + + 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 += `%25s

` + 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))) //标品需要打印条形码 if sku.Upc != "" { orderFmt += `upc码: %s
` diff --git a/business/partner/printer/xiaowm/xiaowm.go b/business/partner/printer/xiaowm/xiaowm.go index 913c3a5cd..22fafe0de 100644 --- a/business/partner/printer/xiaowm/xiaowm.go +++ b/business/partner/printer/xiaowm/xiaowm.go @@ -62,7 +62,11 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin 客户备注: * %s* 商品明细: * -品名 数量 单价 小计 +` + priceQuote := `品名 数量 +--------------------------------* +` + pricePoints := `品名 数量 单价 小计 --------------------------------* ` // 实际支付: %s* @@ -80,10 +84,24 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin buyerComment, // jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), } + switch order.EarningType { + case model.EarningTypePoints: // 扣点 + orderFmt += pricePoints + case model.EarningTypeQuote: // 报价 + orderFmt += priceQuote + } for _, sku := range order.Skus { - 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))) + + 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)) + } + } orderFmt += ` * @@ -154,9 +172,15 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st // jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), } for _, sku := range order.Skus { - orderFmt += `%s*` - 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))) + switch order.EarningType { + case model.EarningTypePoints: // 扣点 + orderFmt += `%s*` + 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 %s*` + orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count)) + } } orderFmt += ` 共%d种%d件商品* diff --git a/business/partner/printer/xpyun/xpyun.go b/business/partner/printer/xpyun/xpyun.go index 56be13d93..f2a3f8cee 100644 --- a/business/partner/printer/xpyun/xpyun.go +++ b/business/partner/printer/xpyun/xpyun.go @@ -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) + `数量
` + 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 += ` 共%d种%d件商品 @@ -405,9 +416,16 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st ` + 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) + `数量
` + 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 += `共%d种%d件商品 实际支付: %s diff --git a/business/partner/printer/yilianyun/yilianyun.go b/business/partner/printer/yilianyun/yilianyun.go index eb63e003a..9124248c5 100644 --- a/business/partner/printer/yilianyun/yilianyun.go +++ b/business/partner/printer/yilianyun/yilianyun.go @@ -75,9 +75,19 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin %s\n \n \n -商品明细: \n +商品明细: \n` + points := ` 品名 数量 小计\n --------------------------------\n` + quote := ` +品名 数量 \n +--------------------------------\n` + switch order.EarningType { + case model.EarningTypePoints: // 扣点 + orderFmt += points + case model.EarningTypeQuote: // 报价 + orderFmt += quote + } orderParams = append(orderParams, jxutils.GetVendorName(order.VendorID), order.OrderSeq, @@ -93,11 +103,16 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin ) for _, sku := range order.Skus { - orderFmt += `%s\n` - //orderFmt += `%8s%10s%10s\n` - orderFmt += `%20s%8s\n` - //orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count))) - orderParams = append(orderParams, sku.SkuName, "X"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count))) + switch order.EarningType { + case model.EarningTypePoints: // 扣点 + orderFmt += `%s\n` + orderFmt += `%20s%8s\n` + orderParams = append(orderParams, sku.SkuName, "X"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count))) + case model.EarningTypeQuote: // 报价 + orderFmt += `%s%25s\n` + orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count)) + } + //标品需要打印条形码 if sku.Upc != "" { orderFmt += `upc码: %s\n` @@ -158,9 +173,20 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st %s\n \n \n -商品明细: \n -品名 数量 小计\n +商品明细: \n` + + points := `品名 数量 小计\n --------------------------------\n` + + quote := `品名 小计\n +--------------------------------\n` + switch order.EarningType { + case model.EarningTypePoints: // 扣点 + orderFmt += points + case model.EarningTypeQuote: // 报价 + orderFmt += quote + } + orderParams = append(orderParams, jxutils.GetVendorName(order.VendorID), order.OrderSeq, @@ -176,11 +202,16 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st ) for _, sku := range order.Skus { - orderFmt += `%s\n` - //orderFmt += `%s %s %s\n\n` - orderFmt += `%15s%8s\n` - //orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count))) - orderParams = append(orderParams, sku.SkuName, "X"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count))) + switch order.EarningType { + case model.EarningTypePoints: // 扣点 + orderFmt += `%s\n` + orderFmt += `%15s%8s\n` + orderParams = append(orderParams, sku.SkuName, "X"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count))) + case model.EarningTypeQuote: // 报价 + orderFmt += `%s%25s\n` + orderParams = append(orderParams, sku.SkuName, "X"+utils.Int2Str(sku.Count)) + } + //标品需要打印条形码 if sku.Upc != "" { orderFmt += `upc码: %s\n`