- 所有环境打印打印

2019-07-01 11:12:56 +08:00
parent df95de82e6
commit b881e6d242
5 changed files with 34 additions and 22 deletions
--- a/business/jxutils/netprinter/netprinter.go
+++ b/business/jxutils/netprinter/netprinter.go
@@ -47,8 +47,10 @@ func PrintOrderByOrder(ctx *jxcontext.Context, order *model.GoodsOrder) (printRe
 				PrintResult: partner.PrintResultNoPrinter,
 			}, nil
 		}
-		if globals.EnableStoreWrite {
+		if true { //globals.EnableStoreWrite {
 			printResult, err = handler.PrintOrder(ctx, store, order)
+		} else {
+			err = fmt.Errorf("当前环境不支持打印")
 		}
 		if err == nil {
 			dao.SetOrderPrintFlag(db, ctx.GetUserName(), order.VendorOrderID, order.VendorID, true)
--- a/business/partner/printer/feie/feie.go
+++ b/business/partner/printer/feie/feie.go
@@ -34,7 +34,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 	}
 	getCode := ""
 	if order.VendorID == model.VendorIDEBAI {
-		getCode = fmt.Sprintf("<B>%s</B>\n", jxutils.GetEbaiOrderGetCode(order))
+		getCode = fmt.Sprintf("<B>饿百取货码:%s</B><BR><BR>\n", jxutils.GetEbaiOrderGetCode(order))
 	}
 	orderFmt := `
 <CB>%s</CB><BR><BR>
@@ -48,8 +48,8 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin

 <B>%s#%d</B><BR><BR>
 <QR>%s</QR><BR>
-%s
-客户: %s<BR>
+` + getCode +
+		`客户: %s<BR>
 电话: %s<BR>
 地址: %s<BR>
 <BR>
@@ -67,7 +67,6 @@ 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,
--- a/business/partner/printer/xiaowm/xiaowm.go
+++ b/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
--- a/business/partner/printer/yilianyun/yilianyun.go
+++ b/business/partner/printer/yilianyun/yilianyun.go
@@ -34,7 +34,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 	}
 	getCode := ""
 	if order.VendorID == model.VendorIDEBAI {
-		getCode = fmt.Sprintf("<FS2>%s</FS2>\\n\n", jxutils.GetEbaiOrderGetCode(order))
+		getCode = fmt.Sprintf("<FS2>饿百取货码:%s</FS2>\\n\n", jxutils.GetEbaiOrderGetCode(order))
 	}
 	orderFmt := `
 <FS2><center>%s</center></FS2>\n\n
@@ -47,8 +47,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 \n
 <FS2>%s#%d</FS2>\n\n
 <QR>%s</QR>
-%s
-\n
+` + getCode + `\n
 客户: %s\n
 电话: %s\n
 地址: %s\n
@@ -66,7 +65,6 @@ 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,
--- a/business/partner/printer/zhongwu/zhongwu.go
+++ b/business/partner/printer/zhongwu/zhongwu.go
@@ -35,7 +35,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 	}
 	getCode := ""
 	if order.VendorID == model.VendorIDEBAI {
-		getCode = fmt.Sprintf("<S2>%s</S2><RN>", jxutils.GetEbaiOrderGetCode(order))
+		getCode = fmt.Sprintf("<S2>饿百取货码:%s</S2><RN>\n", jxutils.GetEbaiOrderGetCode(order))
 	}
 	orderFmt := `
 <S2><C>%s</C></S2><RN><RN>
@@ -48,8 +48,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 <RN>
 <S2>%s#%d</S2><RN><RN>
 <QR>%s</QR>
-%s
-<RN>
+` + getCode + `<RN>
 客户: %s<RN>
 电话: %s<RN>
 地址: %s<RN>
@@ -67,7 +66,6 @@ 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,