- 所有环境打印打印

business/partner/printer/xiaowm/xiaowm.go

@@ -35,7 +35,11 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 	}
 	getCode := ""
 	if order.VendorID == model.VendorIDEBAI {
-		getCode = fmt.Sprintf("<big>%s*\n", jxutils.GetEbaiOrderGetCode(order))
+		getCode = fmt.Sprintf("<big>饿百取货码:%s**\n", jxutils.GetEbaiOrderGetCode(order))
+	}
+	buyerComment := order.BuyerComment
+	if buyerComment == "" {
+		buyerComment = " "
 	}
 	orderFmt := `
 <big>    %s**
@@ -48,8 +52,8 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 *
 <big>%s\#%d**
 <qrcA4>%s*
-%s
-客户: %s*
+` + getCode +
+		`客户: %s*
 电话: %s*
 地址: %s*
 *
@@ -67,14 +71,13 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 		utils.Time2Str(order.OrderCreatedAt),
 		utils.Time2Str(expectedDeliveryTime),
 		order.VendorOrderID,
-		getCode,
 		jxutils.GetVendorName(order.VendorID),
 		order.OrderSeq,
 		order.VendorOrderID,
 		order.ConsigneeName,
 		order.ConsigneeMobile,
 		order.ConsigneeAddress,
-		order.BuyerComment,
+		buyerComment,
 		jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice),
 	}
 	for _, sku := range order.Skus {
@@ -96,7 +99,10 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 `
 	// <QR>http://weixin.qq.com/r/tkkDGzTERmk5rXB49xyk</QR>
 	orderParams = append(orderParams, order.SkuCount, order.GoodsCount, order.StoreName, storeTel, globals.StoreName)
-	return fmt.Sprintf(strings.Replace(orderFmt, "\n", "", -1), escapeString4Printer(orderParams)...)
+	content = fmt.Sprintf(strings.Replace(orderFmt, "\n", "", -1), escapeString4Printer(orderParams)...)
+	// globals.SugarLogger.Debugf("xiaowm orderParams:%s\n", utils.Format4Output(orderParams, false))
+	// globals.SugarLogger.Debugf("xiaowm getOrderContent:%s\n", content)
+	return content
 }
 
 func (c *PrinterHandler) getOrderContent2(order *model.GoodsOrder, storeTel string) (content string) {
@@ -104,6 +110,14 @@ func (c *PrinterHandler) getOrderContent2(order *model.GoodsOrder, storeTel stri
 	if utils.IsTimeZero(expectedDeliveryTime) {
 		expectedDeliveryTime = order.OrderCreatedAt.Add(1 * time.Hour)
 	}
+	getCode := ""
+	if order.VendorID == model.VendorIDEBAI {
+		getCode = fmt.Sprintf("|7饿百取货码:%s\n\n", jxutils.GetEbaiOrderGetCode(order))
+	}
+	buyerComment := order.BuyerComment
+	if buyerComment == "" {
+		buyerComment = " "
+	}
 	orderFmt := `
 |7    %s
 |5       手机买菜上京西
@@ -114,7 +128,7 @@ func (c *PrinterHandler) getOrderContent2(order *model.GoodsOrder, storeTel stri
 |5订单编号: %s
 |5
 |7%s\#%d
-|5
+` + getCode + `|5
 |2%s
 |5客户: %s
 |5电话: %s
@@ -140,7 +154,7 @@ func (c *PrinterHandler) getOrderContent2(order *model.GoodsOrder, storeTel stri
 		order.ConsigneeName,
 		order.ConsigneeMobile,
 		order.ConsigneeAddress,
-		order.BuyerComment,
+		buyerComment,
 		jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice),
 	}
 	for _, sku := range order.Skus {
@@ -239,7 +253,8 @@ func (c *PrinterHandler) UnregisterPrinter(ctx *jxcontext.Context, printerNumber
 func escapeString4Printer(params []interface{}) []interface{} {
 	for k, v := range params {
 		if vStr, ok := v.(string); ok {
-			params[k] = strings.Replace(vStr, "*", "\\*", -1)
+			vStr = strings.Replace(vStr, "*", "\\*", -1)
+			params[k] = strings.Replace(vStr, "#", "\\#", -1)
 		}
 	}
 	return params