From 17cf89789d3370ecf43fa723a1e362a62f28bf33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 21 Jul 2022 09:51:25 +0800 Subject: [PATCH] 1 --- business/partner/printer/jxprint/jxprint.go | 4 ++-- business/partner/printer/jxprint/jxprint_const.go | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/business/partner/printer/jxprint/jxprint.go b/business/partner/printer/jxprint/jxprint.go index 295eb6a53..599530a7d 100644 --- a/business/partner/printer/jxprint/jxprint.go +++ b/business/partner/printer/jxprint/jxprint.go @@ -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) diff --git a/business/partner/printer/jxprint/jxprint_const.go b/business/partner/printer/jxprint/jxprint_const.go index 0e0d34c14..8c1e69e63 100644 --- a/business/partner/printer/jxprint/jxprint_const.go +++ b/business/partner/printer/jxprint/jxprint_const.go @@ -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