From deebdd0f5b66f4acbd768f4cba7f55ddd6106eb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 16 Aug 2022 14:34:00 +0800 Subject: [PATCH] 1 --- business/jxcallback/scheduler/defsch/defsch.go | 2 +- business/jxcallback/scheduler/defsch/defsch_afs.go | 8 ++++++++ business/jxutils/netprinter/netprinter.go | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 7ab965494..cb86159f8 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -513,7 +513,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo order := savedOrderInfo.order // 打印通知 - netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder) + 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 260aec703..b3c24e506 100644 --- a/business/jxcallback/scheduler/defsch/defsch_afs.go +++ b/business/jxcallback/scheduler/defsch/defsch_afs.go @@ -3,6 +3,7 @@ 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" @@ -33,6 +34,13 @@ func (s *DefScheduler) OnAfsOrderNew(order *model.AfsOrder, isPending bool) (err msghub.OnNewWait4ApproveAfsOrder(order) weixinmsg.NotifyAfsOrderStatus(order) 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) + } + } } } return err diff --git a/business/jxutils/netprinter/netprinter.go b/business/jxutils/netprinter/netprinter.go index a29d95490..59c83053e 100644 --- a/business/jxutils/netprinter/netprinter.go +++ b/business/jxutils/netprinter/netprinter.go @@ -82,6 +82,7 @@ func PrintOrderByOrder4Store(ctx *jxcontext.Context, order *model.GoodsOrder, st PrintResult: partner.PrintResultNoPrinter, }, nil } + storeDetail, _ := dao.GetStoreDetail(db, storeID, order.VendorID, order.VendorOrgCode) if storeDetail == nil && order.VendorOrderID == testVendorOrderID { storeDetail = &dao.StoreDetail{