diff --git a/business/jxcallback/orderman/order_afs.go b/business/jxcallback/orderman/order_afs.go index 86addbc95..03052d28b 100644 --- a/business/jxcallback/orderman/order_afs.go +++ b/business/jxcallback/orderman/order_afs.go @@ -83,6 +83,10 @@ func (c *OrderManager) onAfsOrderNew(afsOrder *model.AfsOrder, orderStatus *mode } } + if afsOrder.Status != existAfsOrder.Status && existAfsOrder.Status >= model.AfsOrderStatusFinished { + return nil + } + if existAfsOrder != nil { // todo 可能导致状态回绕 existAfsOrder.Status = afsOrder.Status diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 1fe782db8..13a0c66a3 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -2,6 +2,7 @@ package defsch import ( "fmt" + "git.rosy.net.cn/jx-callback/business/partner/purchase/mtwm" "math/rand" "sort" "strings" @@ -408,6 +409,8 @@ func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder, isPending bool, isAut } msghub.OnNewOrder(order) } + } else if order.VendorID == model.VendorIDMTWM { + mtwm.GetAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), order.VendorStoreID).PushPrintMsg(order.VendorOrderID) } if order.Status >= model.OrderStatusNew { if !isPending && order.Status >= model.OrderStatusAccepted { // 有订单消息错序,先收到接单消息,再收到新订单消息,导致接单TIMER不动作,这里补一下 diff --git a/business/jxutils/netprinter/netprinter.go b/business/jxutils/netprinter/netprinter.go index 450d100de..732c80b07 100644 --- a/business/jxutils/netprinter/netprinter.go +++ b/business/jxutils/netprinter/netprinter.go @@ -2,6 +2,7 @@ package netprinter import ( "fmt" + "git.rosy.net.cn/jx-callback/business/jxutils" "strings" "time" @@ -10,7 +11,6 @@ import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/partner" - "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" @@ -47,7 +47,8 @@ func PrintOrder(ctx *jxcontext.Context, vendorOrderID string, vendorID int) (pri } func PrintOrderByOrder(ctx *jxcontext.Context, order *model.GoodsOrder, printType string, afs *model.AfsOrder) (printResult *partner.PrinterStatus, err error) { - return PrintOrderByOrder4Store(ctx, order, jxutils.GetSaleStoreIDFromOrder(order), printType, afs) + printResult, err = PrintOrderByOrder4Store(ctx, order, jxutils.GetSaleStoreIDFromOrder(order), printType, afs) + return printResult, err } func getStore4Print(db *dao.DaoDB, storeID int) (store *model.Store, err error) {