diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index ae0a03bb8..1366b6581 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -555,6 +555,7 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db *dao.
}
v.SkuName = jxutils.ComposeSkuNameOriginal(skuBindInfo.Prefix, skuBindInfo.Name, skuBindInfo.Comment, skuBindInfo.Unit, skuBindInfo.SpecQuality, skuBindInfo.SpecUnit, 0)
v.Weight = skuBindInfo.Weight // 以本地信息中的WEIGHT为准
+ v.Upc = skuBindInfo.Upc
//饿鲜达的订单做一下处理
if strings.Contains(order.StoreName, model.ExdStoreName) {
if v.SkuID == 0 && !strings.Contains(v.SkuName, "免费") {
diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index 4f2fd18f4..aae03b63a 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -345,6 +345,7 @@ type StoreSkuPriceAndWeight struct {
Comment string
SpecQuality float32
SpecUnit string
+ Upc string
}
type StoreSkuAndName struct {
@@ -688,7 +689,7 @@ func GetStoreSkuPriceAndWeight(db *DaoDB, vendorStoreID string, vendorID int, ve
}
sql := fmt.Sprintf(`
SELECT %s vendor_sku_id, t1.id sku_id, t2.price, t1.weight,
- t5.prefix, t5.name, t1.comment, t5.unit, t1.spec_quality, t1.spec_unit
+ t5.prefix, t5.name, t1.comment, t5.unit, t1.spec_quality, t1.spec_unit, t5.upc
FROM sku t1
JOIN store_sku_bind t2 ON t2.sku_id = t1.id AND t2.deleted_at = ?
JOIN store_map t3 ON t3.store_id = t2.store_id AND t3.vendor_id = ? AND t3.vendor_store_id = ? AND t3.deleted_at = ?
diff --git a/business/partner/printer/feie/feie.go b/business/partner/printer/feie/feie.go
index c940f9b23..6154dd559 100644
--- a/business/partner/printer/feie/feie.go
+++ b/business/partner/printer/feie/feie.go
@@ -95,6 +95,11 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
orderFmt += `%s
`
orderFmt += `%8s%10s%10s
`
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 += `%s
`
+ orderParams = append(orderParams, sku.Upc)
+ }
}
orderFmt += `
共%d种%d件商品
@@ -181,6 +186,11 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
orderFmt += `%s
`
orderFmt += `%s %s %s
`
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 += `%s
`
+ orderParams = append(orderParams, sku.Upc)
+ }
}
orderFmt += `
共%d种%d件商品
diff --git a/business/partner/printer/yilianyun/yilianyun.go b/business/partner/printer/yilianyun/yilianyun.go
index 1241812aa..5701ae1f8 100644
--- a/business/partner/printer/yilianyun/yilianyun.go
+++ b/business/partner/printer/yilianyun/yilianyun.go
@@ -92,6 +92,11 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
orderFmt += `%s\n`
orderFmt += `%8s%10s%10s\n`
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 += `
%s\n`
+ orderParams = append(orderParams, sku.Upc)
+ }
}
orderFmt += `\n
共%d种%d件商品
@@ -172,6 +177,11 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
orderFmt += `%s\n`
orderFmt += `%s %s %s\n\n`
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 += `
%s\n`
+ orderParams = append(orderParams, sku.Upc)
+ }
}
orderFmt += `\n
共%d种%d件商品