From 04b41d6e441f520a998e6e5af146e5dcce40f60f Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Thu, 5 Aug 2021 10:12:46 +0800
Subject: [PATCH] aa

---
 business/jxstore/tempop/tempop.go               | 4 ----
 business/partner/printer/feie/feie.go           | 4 ++--
 business/partner/printer/yilianyun/yilianyun.go | 4 ++--
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index cb23856cb..1d2be4f0c 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1974,10 +1974,6 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	return err
 }
 
-var (
-	textChan chan string
-)
-
 func FreeBatchInfo2(name string, handler func(tasksch.ITask, []*jdapi.SkuIdEntity) (interface{}, int, error), ctx *jxcontext.Context, parentTask tasksch.ITask, storeSkuList []*jdapi.SkuIdEntity, batchSize int, isContinueWhenError bool) (resultList []interface{}, err error) {
 	task := tasksch.NewParallelTask2(fmt.Sprintf("FreeBatchInfo:%s", name), tasksch.NewParallelConfig().SetParallelCount(1).SetBatchSize(batchSize).SetIsContinueWhenError(isContinueWhenError), ctx,
 		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, successCount int, err error) {
diff --git a/business/partner/printer/feie/feie.go b/business/partner/printer/feie/feie.go
index 6154dd559..534b0d68b 100644
--- a/business/partner/printer/feie/feie.go
+++ b/business/partner/printer/feie/feie.go
@@ -97,7 +97,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 		orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count)))
 		//标品需要打印条形码
 		if sku.Upc != "" {
-			orderFmt += `<BC128_C>%s</BC128_C><BR>`
+			orderFmt += `upc码： %s<BR>`
 			orderParams = append(orderParams, sku.Upc)
 		}
 	}
@@ -188,7 +188,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
 		orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count)))
 		//标品需要打印条形码
 		if sku.Upc != "" {
-			orderFmt += `<BC128_C>%s</BC128_C><BR>`
+			orderFmt += `upc码： %s<BR>`
 			orderParams = append(orderParams, sku.Upc)
 		}
 	}
diff --git a/business/partner/printer/yilianyun/yilianyun.go b/business/partner/printer/yilianyun/yilianyun.go
index 5701ae1f8..0bc31a2b6 100644
--- a/business/partner/printer/yilianyun/yilianyun.go
+++ b/business/partner/printer/yilianyun/yilianyun.go
@@ -94,7 +94,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 		orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count)))
 		//标品需要打印条形码
 		if sku.Upc != "" {
-			orderFmt += `<BR>%s</BR>\n`
+			orderFmt += `upc码： %s\n`
 			orderParams = append(orderParams, sku.Upc)
 		}
 	}
@@ -179,7 +179,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
 		orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count)))
 		//标品需要打印条形码
 		if sku.Upc != "" {
-			orderFmt += `<BR>%s</BR>\n`
+			orderFmt += `<FS2>upc码： %s\n</FS2>`
 			orderParams = append(orderParams, sku.Upc)
 		}
 	}