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:
邹宗楠
2024-08-27 14:58:08 +08:00
parent 610a3e8799
commit 57fc039be2
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,6 @@
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"
@@ -53,12 +52,11 @@ func (s *DefScheduler) OnAfsOrderNew(order *model.AfsOrder, isPending bool) (err
store, err := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, order.VendorOrgCode) store, err := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, order.VendorOrgCode)
if err == nil && store.PrinterVendorID == model.VendorIDJxprint && store.IsPrintCancelOrder == model.YES { if err == nil && store.PrinterVendorID == model.VendorIDJxprint && store.IsPrintCancelOrder == model.YES {
orderObj, _ := partner.CurOrderManager.LoadOrder(order.VendorOrderID, order.VendorID) orderObj, _ := partner.CurOrderManager.LoadOrder(order.VendorOrderID, order.VendorID)
if order.VendorOrderID == "3301223263215186716" { if orderObj != nil {
globals.SugarLogger.Debugf("-----------OnAfsOrderNew orderObj:= %s", utils.Format4Output(orderObj, false))
}
netprinter.PrintOrderByOrder(jxcontext.AdminCtx, orderObj, model.PrintAfsOrder, order) netprinter.PrintOrderByOrder(jxcontext.AdminCtx, orderObj, model.PrintAfsOrder, order)
} }
} }
}
return err return err
} }

12
business/partner/printer/jxprint/jxprint.go
View File

@@ -266,16 +266,8 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store,
return nil, err return nil, err
} }
orderSel := utils.Int2Str(order.VendorID) + utils.Int2Str(order.OrderSeq) orderSeq := utils.Int2Str(order.VendorID) + utils.Int2Str(order.OrderSeq)
if order.VendorOrderID == "3301223263215186716" { return c.PrintMsg(ctx, store.PrinterSN, orderSeq, "", string(orderPrint))
globals.SugarLogger.Debugf("----------------:%s", string(orderPrint))
}
dataSuls, err := c.PrintMsg(ctx, store.PrinterSN, orderSel, "", string(orderPrint))
if order.VendorOrderID == "3301223263215186716" {
globals.SugarLogger.Debugf("----------------:%s", utils.Format4Output(dataSuls, false))
globals.SugarLogger.Debugf("----------------:%v", err)
}
return
} }
func (c *PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printType int, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { func (c *PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printType int, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) {