From 57fc039be291907b9fa428d8c2f19314d5a66d52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 27 Aug 2024 14:58:08 +0800 Subject: [PATCH] 1 --- business/jxcallback/scheduler/defsch/defsch_afs.go | 6 ++---- business/partner/printer/jxprint/jxprint.go | 12 ++---------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch_afs.go b/business/jxcallback/scheduler/defsch/defsch_afs.go index eea111e25..c9d4478a4 100644 --- a/business/jxcallback/scheduler/defsch/defsch_afs.go +++ b/business/jxcallback/scheduler/defsch/defsch_afs.go @@ -1,7 +1,6 @@ package defsch import ( - "git.rosy.net.cn/baseapi/utils" "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" @@ -53,10 +52,9 @@ func (s *DefScheduler) OnAfsOrderNew(order *model.AfsOrder, isPending bool) (err store, err := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, order.VendorOrgCode) if err == nil && store.PrinterVendorID == model.VendorIDJxprint && store.IsPrintCancelOrder == model.YES { orderObj, _ := partner.CurOrderManager.LoadOrder(order.VendorOrderID, order.VendorID) - if order.VendorOrderID == "3301223263215186716" { - globals.SugarLogger.Debugf("-----------OnAfsOrderNew orderObj:= %s", utils.Format4Output(orderObj, false)) + if orderObj != nil { + netprinter.PrintOrderByOrder(jxcontext.AdminCtx, orderObj, model.PrintAfsOrder, order) } - netprinter.PrintOrderByOrder(jxcontext.AdminCtx, orderObj, model.PrintAfsOrder, order) } } return err diff --git a/business/partner/printer/jxprint/jxprint.go b/business/partner/printer/jxprint/jxprint.go index f11709b95..1ab030ea8 100644 --- a/business/partner/printer/jxprint/jxprint.go +++ b/business/partner/printer/jxprint/jxprint.go @@ -266,16 +266,8 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, return nil, err } - orderSel := utils.Int2Str(order.VendorID) + utils.Int2Str(order.OrderSeq) - if order.VendorOrderID == "3301223263215186716" { - 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 + orderSeq := utils.Int2Str(order.VendorID) + utils.Int2Str(order.OrderSeq) + return c.PrintMsg(ctx, store.PrinterSN, orderSeq, "", string(orderPrint)) } func (c *PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printType int, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) {