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-08-12 14:16:55 +08:00
parent 98ff1bca54
commit 827b4f2f29
8 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -234,12 +234,12 @@ func (c *PrinterHandler) getOrderContentByTemplate(order *model.GoodsOrder, stor
return ""
}
func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) {
func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder, printType string) (printerStatus *partner.PrinterStatus, err error) {
globals.SugarLogger.Debugf("jxprint PrintOrderByOrder orderID:%s, storeID:%d", order.VendorOrderID, store.ID)
if len(order.Skus) == 0 {
return
}
printData := ManagerOrderAndStore(order, store.Tel1, storeDetail)
printData := ManagerOrderPrint(order, store.Tel1, storeDetail)
//printData[BigFont] = "small"
//if store.PrinterFontSize == partner.PrinterFontSizeBig || store.PrinterFontSize == partner.PrinterFontSizeBig2 {
// printData[BigFont] = "big"
@@ -249,9 +249,17 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store,
//if store.PrinterFontSize == partner.PrinterFontSizeBig2 || store.PrinterFontSize == partner.PrinterFontSizeNormal2 {
// printData[PrintNumber] = utils.Int2Str(2)
//}
printData[AppID] = "1000" // 菜市应用
printData[OrderStatus] = utils.Int2Str(order.Status) // 订单状态
printData[WayBillStatus] = order.VendorStatus // 运单状态
printData[AppID] = "1000" // 菜市应用
switch printType {
case "order":
printData[OrderStatus] = utils.Int2Str(order.Status) // 订单状态
case "wayBill":
printData[WayBillStatus] = order.VendorStatus // 运单状态
case "store":
printData[StoreStatus] = utils.Int2Str(store.Status) // 运单状态
case "reminder":
printData[ReminderStatus] = "1" // 催单
}
orderPrint, err := json.Marshal(printData)
if err != nil {
return nil, err