From ca4ef5171d2d0c4073e1c3d3b53d9871f9358f92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 24 Aug 2022 14:58:12 +0800 Subject: [PATCH] 1 --- business/jxcallback/scheduler/defsch/defsch.go | 4 ++-- business/jxcallback/scheduler/defsch/defsch_afs.go | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index a07288289..373c2d227 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -499,7 +499,7 @@ func (s *DefScheduler) OnOrderStatusChanged(order *model.GoodsOrder, status *mod } msghub.OnKeyOrderStatusChanged(savedOrderInfo.order) } - netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder) + //netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder) } } return err @@ -513,7 +513,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo order := savedOrderInfo.order // 打印通知 - netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeWayBill) + //netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeWayBill) // 获取订单配送平台，如果是美团则需要获取门店配置的配送方式 //isBlendWay := false diff --git a/business/jxcallback/scheduler/defsch/defsch_afs.go b/business/jxcallback/scheduler/defsch/defsch_afs.go index b3c24e506..6db0d3357 100644 --- a/business/jxcallback/scheduler/defsch/defsch_afs.go +++ b/business/jxcallback/scheduler/defsch/defsch_afs.go @@ -3,7 +3,6 @@ package defsch import ( "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" - "git.rosy.net.cn/jx-callback/business/jxutils/netprinter" push "git.rosy.net.cn/jx-callback/business/jxutils/unipush" "git.rosy.net.cn/jx-callback/business/jxutils/weixinmsg" "git.rosy.net.cn/jx-callback/business/model" @@ -36,11 +35,11 @@ func (s *DefScheduler) OnAfsOrderNew(order *model.AfsOrder, isPending bool) (err push.NotifyAfsOrder(order) // 打印通知 - if handler := partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID); handler != nil { - if orderObj, err2 := handler.GetOrder(order.VendorOrgCode, order.VendorOrderID, ""); err2 == nil && order != nil { - netprinter.PrintOrderByOrder(jxcontext.AdminCtx, orderObj, model.PrintTypeOrder) - } - } + //if handler := partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID); handler != nil { + // if orderObj, err2 := handler.GetOrder(order.VendorOrgCode, order.VendorOrderID, ""); err2 == nil && order != nil { + // netprinter.PrintOrderByOrder(jxcontext.AdminCtx, orderObj, model.PrintTypeOrder) + // } + //} } } return err