liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

a

Browse Source
This commit is contained in:
suyl
2021-08-04 17:33:26 +08:00
parent e5467de15e
commit 3e47450078
4 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/jxcallback/orderman/order.go
View File

@@ -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, "免费") {

3
business/model/dao/store_sku.go
View File

@@ -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 = ?

10
business/partner/printer/feie/feie.go
View File

@@ -95,6 +95,11 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
orderFmt += `%s<BR>`
orderFmt += `%8s%10s%10s<BR>`
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>`
orderParams = append(orderParams, sku.Upc)
}
}
orderFmt += `<BR>
<BOLD>共%d种%d件商品</BOLD>
@@ -181,6 +186,11 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
orderFmt += `<B>%s<BR></B>`
orderFmt += `<B>%s %s %s<BR><BR></B>`
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>`
orderParams = append(orderParams, sku.Upc)
}
}
orderFmt += `<BR>
<B><BOLD>共%d种%d件商品</BOLD></B>

10
business/partner/printer/yilianyun/yilianyun.go
View File

@@ -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 += `<BR>%s</BR>\n`
orderParams = append(orderParams, sku.Upc)
}
}
orderFmt += `\n
<FB>共%d种%d件商品</FB>
@@ -172,6 +177,11 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
orderFmt += `<FS2>%s\n</FS2>`
orderFmt += `<FS2>%s %s %s\n\n</FS2>`
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`
orderParams = append(orderParams, sku.Upc)
}
}
orderFmt += `\n
<FS2><FB>共%d种%d件商品</FB></FS2>