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:
邹宗楠
2022-07-21 09:51:25 +08:00
parent d7ff56db61
commit 17cf89789d
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/partner/printer/jxprint/jxprint.go
View File

@@ -246,9 +246,9 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store,
printData[BigFont] = true
}
// 打印次数
printData[PrintNumber] = 1
printData[PrintNumber] = utils.Int2Str(model.YES)
if store.PrinterFontSize == partner.PrinterFontSizeBig2 || store.PrinterFontSize == partner.PrinterFontSizeNormal2 {
printData[PrintNumber] = 2
printData[PrintNumber] = utils.Int2Str(2)
}
orderPrint, err := json.Marshal(printData)

12
business/partner/printer/jxprint/jxprint_const.go
View File

@@ -59,16 +59,16 @@ func ManagerOrderAndStore(order *model.GoodsOrder, storeTel string, storeDetail
}
// 是否为预定单
if order.BusinessType == model.BusinessTypeDingshida {
printOrder[BusinessType] = model.BusinessTypeDingshida
printOrder[BusinessType] = utils.Int2Str(model.BusinessTypeDingshida)
} else {
printOrder[BusinessType] = model.BusinessTypeImmediate
printOrder[BusinessType] = utils.Int2Str(model.BusinessTypeImmediate)
}
printOrder[PayOrderTime] = utils.Time2Str(order.OrderCreatedAt)
printOrder[TrySendTime] = utils.Time2Str(order.ExpectedDeliveredTime)
printOrder[OrderNo] = order.VendorOrderID
printOrder[VendorName] = jxutils.GetVendorName(order.VendorID)
printOrder[VendorOrderNo] = order.OrderSeq
printOrder[VendorOrderNo] = utils.Int2Str(order.OrderSeq)
printOrder[QRCOrder] = order.VendorOrderID
printOrder[ConsigneeName] = order.ConsigneeName
printOrder[ConsigneeMobile] = order.ConsigneeMobile
@@ -86,9 +86,9 @@ func ManagerOrderAndStore(order *model.GoodsOrder, storeTel string, storeDetail
}
skuListByte, _ := json.Marshal(skuList)
printOrder[SkuList] = string(skuListByte)
printOrder[AllSkuTypeCount] = order.SkuCount
printOrder[AllSkuCount] = order.GoodsCount
printOrder[UserPayMoney] = order.ActualPayPrice
printOrder[AllSkuTypeCount] = utils.Int2Str(order.SkuCount)
printOrder[AllSkuCount] = utils.Int2Str(order.GoodsCount)
printOrder[UserPayMoney] = utils.Int64ToStr(order.ActualPayPrice)
printOrder[StoreName] = order.StoreName
printOrder[StoreTel] = storeTel
printOrder[OfficialName] = globals.StoreName