diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 128b0f34b..c7309a44b 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -378,12 +378,14 @@ func Init() { func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder, isPending bool, isAuto bool) (err error) { savedOrderInfo := s.loadSavedOrderFromMap(model.Order2Status(order), false) savedOrderInfo.SetOrder(order) + globals.SugarLogger.Debugf("===order========:%s", utils.Format4Output(order, false)) if order.VendorID == model.VendorIDEBAI { //饿百订单待接单的时候就推所有东西 if order.Status == model.OrderStatusWaitAccepted || order.Status == model.OrderStatusNew || order.Status >= model.OrderStatusFinishedPickup { //错序 s.resetTimer(savedOrderInfo, nil, isPending) if order.Flag&model.OrderFlagMaskFake == 0 { utils.CallFuncAsync(func() { // order = setFakeActualPayPrice(order) + globals.SugarLogger.Debugf("===order2========:%s", utils.Format4Output(order, false)) netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder, nil) //目前暂且认为AdjustCount > 0 就是调整单 if order.AdjustCount > 0 { diff --git a/business/jxutils/unipush/push.go b/business/jxutils/unipush/push.go index 658b98350..c439f5fc9 100644 --- a/business/jxutils/unipush/push.go +++ b/business/jxutils/unipush/push.go @@ -16,9 +16,9 @@ import ( ) const ( - SoundsFileNewOrder = "newOrder.mp4" - SoundsFileNewAfsOrder = "newAfsOrder.mp4" - SoundsFileNewCancelOrder = "newCancelOrder.mp4" + SoundsFileNewOrder = "pushsound.caf" + SoundsFileNewAfsOrder = "pushsound.caf" + SoundsFileNewCancelOrder = "pushsound.caf" ) // NotifyNewOrder 推送新订单 diff --git a/business/partner/printer/jxprint/jxprint.go b/business/partner/printer/jxprint/jxprint.go index fbb472a8d..a0833b73a 100644 --- a/business/partner/printer/jxprint/jxprint.go +++ b/business/partner/printer/jxprint/jxprint.go @@ -265,6 +265,9 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, } orderSel := utils.Int2Str(order.VendorID) + utils.Int2Str(order.OrderSeq) + globals.SugarLogger.Debugf("=store.PrinterSN=====:%s", store.PrinterSN) + globals.SugarLogger.Debugf("=store.orderSel=====:%s", orderSel) + globals.SugarLogger.Debugf("string(orderPrint)======%s", string(orderPrint)) return c.PrintMsg(ctx, store.PrinterSN, orderSel, "", string(orderPrint)) }