liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2022-08-24 14:58:12 +08:00
parent 3c36866fad
commit ca4ef5171d
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -499,7 +499,7 @@ func (s *DefScheduler) OnOrderStatusChanged(order *model.GoodsOrder, status *mod
} }
msghub.OnKeyOrderStatusChanged(savedOrderInfo.order) msghub.OnKeyOrderStatusChanged(savedOrderInfo.order)
} }
netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder) //netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder)
} }
} }
return err return err
@@ -513,7 +513,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
order := savedOrderInfo.order order := savedOrderInfo.order
// 打印通知 // 打印通知
netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeWayBill) //netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeWayBill)
// 获取订单配送平台，如果是美团则需要获取门店配置的配送方式 // 获取订单配送平台，如果是美团则需要获取门店配置的配送方式
//isBlendWay := false //isBlendWay := false

11
business/jxcallback/scheduler/defsch/defsch_afs.go
View File

@@ -3,7 +3,6 @@ package defsch
import ( import (
"git.rosy.net.cn/jx-callback/business/jxutils" "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/jxcontext"
"git.rosy.net.cn/jx-callback/business/jxutils/netprinter"
push "git.rosy.net.cn/jx-callback/business/jxutils/unipush" 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/jxutils/weixinmsg"
"git.rosy.net.cn/jx-callback/business/model" "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) push.NotifyAfsOrder(order)
// 打印通知 // 打印通知
if handler := partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID); handler != nil { //if handler := partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID); handler != nil {
if orderObj, err2 := handler.GetOrder(order.VendorOrgCode, order.VendorOrderID, ""); err2 == nil && order != nil { // if orderObj, err2 := handler.GetOrder(order.VendorOrgCode, order.VendorOrderID, ""); err2 == nil && order != nil {
netprinter.PrintOrderByOrder(jxcontext.AdminCtx, orderObj, model.PrintTypeOrder) // netprinter.PrintOrderByOrder(jxcontext.AdminCtx, orderObj, model.PrintTypeOrder)
} // }
} //}
} }
} }
return err return err