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

1

Browse Source
This commit is contained in:
邹宗楠
2025-08-14 09:52:20 +08:00
parent ba3ef50091
commit 7ee7f6f259
4 changed files with 65 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/jxcallback/orderman/orderman_ext.go
View File

@@ -1034,6 +1034,9 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
if len(skuList) > 0 { if len(skuList) > 0 {
flagVendorOrderID = skuList[0].VendorOrderID flagVendorOrderID = skuList[0].VendorOrderID
} }
if storeIDList[0] == 805178 {
globals.SugarLogger.Debugf("-------skuList := %s", utils.Format4Output(skuList, false))
}
for k, v := range skuList { for k, v := range skuList {
storeDetail, _ := dao.GetStoreDetail(db, v.StoreID, v.VendorID, "") storeDetail, _ := dao.GetStoreDetail(db, v.StoreID, v.VendorID, "")
if v.EarningPrice == 0 { if v.EarningPrice == 0 {

37
business/partner/printer/xiaowm/xiaowm.go
View File

@@ -68,12 +68,12 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
<big>%s* <big>%s*
商品明细: * 商品明细: *
` `
priceQuote := `品名 数量 orderFmt += `品名 数量
--------------------------------*
`
pricePoints := `品名 数量 单价 小计
--------------------------------* --------------------------------*
` `
// pricePoints := `品名 数量 单价 小计
//--------------------------------*
//`
// <S011>实际支付: %s* // <S011>实际支付: %s*
orderParams := []interface{}{ orderParams := []interface{}{
globals.StoreName, globals.StoreName,
@@ -89,23 +89,24 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
buyerComment, buyerComment,
// jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), // jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice),
} }
switch order.EarningType { //switch order.EarningType {
case model.EarningTypePoints: // 扣点 //case model.EarningTypePoints: // 扣点
orderFmt += pricePoints // orderFmt += pricePoints
case model.EarningTypeQuote: // 报价 //case model.EarningTypeQuote: // 报价
orderFmt += priceQuote // orderFmt += priceQuote
} //}
for _, sku := range order.Skus { for _, sku := range order.Skus {
switch order.EarningType {
case model.EarningTypePoints: // 扣点
orderFmt += `%s*`
orderFmt += `%8s%10s%10s*`
orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count)))
case model.EarningTypeQuote: // 报价
orderFmt += `%s %25s*` orderFmt += `%s %25s*`
orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count)) orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count))
} //switch order.EarningType {
//case model.EarningTypePoints: // 扣点
// orderFmt += `%s*`
// orderFmt += `%8s%10s%10s*`
// orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count)))
//case model.EarningTypeQuote: // 报价
// orderFmt += `%s %25s*`
// orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count))
//}
} }
orderFmt += ` orderFmt += `

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

@@ -80,18 +80,18 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
\n \n
\n \n
商品明细: \n` 商品明细: \n`
points := ` orderFmt += `
品名 数量 小计\n 品名 数量 小计\n
--------------------------------\n` --------------------------------\n`
quote := ` // quote := `
品名 数量 \n //品名 数量 \n
--------------------------------\n` //--------------------------------\n`
switch order.EarningType { //switch order.EarningType {
case model.EarningTypePoints: // 扣点 //case model.EarningTypePoints: // 扣点
orderFmt += points // orderFmt += points
case model.EarningTypeQuote: // 报价 //case model.EarningTypeQuote: // 报价
orderFmt += quote // orderFmt += quote
} //}
orderParams = append(orderParams, orderParams = append(orderParams,
jxutils.GetVendorName(order.VendorID), jxutils.GetVendorName(order.VendorID),
order.OrderSeq, order.OrderSeq,
@@ -107,15 +107,17 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
) )
for _, sku := range order.Skus { for _, sku := range order.Skus {
switch order.EarningType { orderFmt += `<FH><LR>%s,%s</LR></FH>\n`
case model.EarningTypePoints: // 扣点
orderFmt += `<FH>%s</FH>\n`
orderFmt += `<FH>%20s%8s</FH>\n`
orderParams = append(orderParams, sku.SkuName, "X"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count)))
case model.EarningTypeQuote: // 报价
orderFmt += `<FH>%s%25s</FH>\n`
orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count)) orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count))
} //switch order.EarningType {
//case model.EarningTypePoints: // 扣点
// orderFmt += `<FH>%s</FH>\n`
// orderFmt += `<FH>%20s%8s</FH>\n`
// orderParams = append(orderParams, sku.SkuName, "X"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count)))
//case model.EarningTypeQuote: // 报价
// orderFmt += `<FH>%s%25s</FH>\n`
// orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count))
//}
//标品需要打印条形码 //标品需要打印条形码
if sku.Upc != "" { if sku.Upc != "" {
@@ -188,17 +190,14 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
\n \n
<FS>商品明细: \n</FS>` <FS>商品明细: \n</FS>`
points := `品名 数量 小计\n orderFmt += `品名 小计\n
--------------------------------\n` --------------------------------\n`
//switch order.EarningType {
quote := `品名 小计\n //case model.EarningTypePoints: // 扣点
--------------------------------\n` // orderFmt += points
switch order.EarningType { //case model.EarningTypeQuote: // 报价
case model.EarningTypePoints: // 扣点 // orderFmt += quote
orderFmt += points //}
case model.EarningTypeQuote: // 报价
orderFmt += quote
}
orderParams = append(orderParams, orderParams = append(orderParams,
jxutils.GetVendorName(order.VendorID), jxutils.GetVendorName(order.VendorID),
@@ -215,15 +214,17 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
) )
for _, sku := range order.Skus { for _, sku := range order.Skus {
switch order.EarningType { orderFmt += `<FH2><LR>%s,%s</LR></FH2>\n`
case model.EarningTypePoints: // 扣点
orderFmt += `<FH2>%s\n</FH2>`
orderFmt += `<FS><FB>%15s%8s</FB>\n</FS>`
orderParams = append(orderParams, sku.SkuName, "X"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count)))
case model.EarningTypeQuote: // 报价
orderFmt += `<FH2>%s%25s\n</FH2>`
orderParams = append(orderParams, sku.SkuName, "X"+utils.Int2Str(sku.Count)) orderParams = append(orderParams, sku.SkuName, "X"+utils.Int2Str(sku.Count))
} //switch order.EarningType {
//case model.EarningTypePoints: // 扣点
// orderFmt += `<FH2>%s\n</FH2>`
// orderFmt += `<FS><FB>%15s%8s</FB>\n</FS>`
// orderParams = append(orderParams, sku.SkuName, "X"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count)))
//case model.EarningTypeQuote: // 报价
// orderFmt += `<FH2>%s%25s\n</FH2>`
// orderParams = append(orderParams, sku.SkuName, "X"+utils.Int2Str(sku.Count))
//}
//标品需要打印条形码 //标品需要打印条形码
if sku.Upc != "" { if sku.Upc != "" {

6
business/partner/printer/zhongwu/zhongwu.go
View File

@@ -95,8 +95,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
) )
for _, sku := range order.Skus { for _, sku := range order.Skus {
orderFmt += `%s<RN>` orderFmt += `%s <R>%s</R><RN>`
orderFmt += `%8s<RN>`
orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count)) orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count))
//jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count)) //jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count))
} }
@@ -179,8 +178,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
) )
for _, sku := range order.Skus { for _, sku := range order.Skus {
orderFmt += `<S2>%s<RN></S2>` orderFmt += `<S2>%s <R>%s</R></S2><RN>`
orderFmt += `<S2>%s<RN><RN></S2>`
orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count)) orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count))
//jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count)) //jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count))
} }