This commit is contained in:
邹宗楠
2023-03-22 17:19:10 +08:00
parent 288c4a1607
commit 8a4d2f24fe
2 changed files with 37 additions and 39 deletions

View File

@@ -258,13 +258,14 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store,
printData[OrderStatus] = utils.Int2Str(130)
}
printData[AppID] = "1000" // 菜市应用
if printData[VendorID] == utils.Int2Str(model.VendorIDEBAI) && printData[OrderStatus] == utils.Int2Str(model.OrderStatusFinishedPickup) {
if printData[VendorID] == utils.Int2Str(model.VendorIDEBAI) && (printData[OrderStatus] == utils.Int2Str(model.OrderStatusFinishedPickup) || printData[OrderStatus] == utils.Int2Str(model.OrderStatusWaitAccepted)) {
printData[OrderStatus] = utils.Int2Str(model.OrderStatusNew)
}
orderPrint, err := json.Marshal(printData)
if err != nil {
return nil, err
}
globals.SugarLogger.Debugf("==========jxprintMsg:%s", string(orderPrint))
orderSel := utils.Int2Str(order.VendorID) + utils.Int2Str(order.OrderSeq)
return c.PrintMsg(ctx, store.PrinterSN, orderSel, "", string(orderPrint))