1
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
package defsch
|
package defsch
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"git.rosy.net.cn/baseapi/utils"
|
||||||
"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"
|
"git.rosy.net.cn/jx-callback/business/jxutils/netprinter"
|
||||||
@@ -23,6 +24,9 @@ var (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func (s *DefScheduler) OnAfsOrderNew(order *model.AfsOrder, isPending bool) (err error) {
|
func (s *DefScheduler) OnAfsOrderNew(order *model.AfsOrder, isPending bool) (err error) {
|
||||||
|
if order.VendorOrderID == "3301223263215186716" {
|
||||||
|
globals.SugarLogger.Debugf("-----------OnAfsOrderNew := %s", utils.Format4Output(order, false))
|
||||||
|
}
|
||||||
if order.Status == model.AfsOrderStatusWait4Approve {
|
if order.Status == model.AfsOrderStatusWait4Approve {
|
||||||
if !isPending {
|
if !isPending {
|
||||||
if isAutoRejectAfsOrder(order) {
|
if isAutoRejectAfsOrder(order) {
|
||||||
@@ -45,19 +49,19 @@ func (s *DefScheduler) OnAfsOrderNew(order *model.AfsOrder, isPending bool) (err
|
|||||||
weixinmsg.NotifyAfsOrderStatus(order)
|
weixinmsg.NotifyAfsOrderStatus(order)
|
||||||
push.NotifyAfsOrder(order)
|
push.NotifyAfsOrder(order)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
// 京西云打印机打印数据-如果门店使用京西打印机才使用如下代码块
|
}
|
||||||
store, err := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, order.VendorOrgCode)
|
if order.Status == model.AfsOrderStatusWait4Approve || order.Status == model.AfsOrderStatusFinished || order.Status == model.AfsOrderStatusNew {
|
||||||
if err == nil && store.PrinterVendorID == model.VendorIDJxprint && store.IsPrintCancelOrder == model.YES {
|
// 京西云打印机打印数据-如果门店使用京西打印机才使用如下代码块
|
||||||
if handler := partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID); handler != nil {
|
store, err := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, order.VendorOrgCode)
|
||||||
orderObj, err2 := handler.GetOrder(order.VendorOrgCode, order.VendorOrderID, "")
|
if err == nil && store.PrinterVendorID == model.VendorIDJxprint && store.IsPrintCancelOrder == model.YES {
|
||||||
if err2 != nil {
|
if handler := partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID); handler != nil {
|
||||||
return err
|
orderObj, err2 := handler.GetOrder(order.VendorOrgCode, order.VendorOrderID, "")
|
||||||
}
|
if err2 != nil {
|
||||||
netprinter.PrintOrderByOrder(jxcontext.AdminCtx, orderObj, model.PrintAfsOrder, order)
|
return err
|
||||||
}
|
}
|
||||||
|
netprinter.PrintOrderByOrder(jxcontext.AdminCtx, orderObj, model.PrintAfsOrder, order)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return err
|
return err
|
||||||
|
|||||||
Reference in New Issue
Block a user