From 299c1e4974553e4b23d23be3947192fc2c7fe0d9 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:05:50 +0800 Subject: [PATCH] 1 --- business/partner/printer/jxprint/jxprint.go | 10 +++++++++- controllers/bidding.go | 16 ++++++++++++++++ routers/commentsRouter_controllers.go | 9 +++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/business/partner/printer/jxprint/jxprint.go b/business/partner/printer/jxprint/jxprint.go index c6eb14c10..f11709b95 100644 --- a/business/partner/printer/jxprint/jxprint.go +++ b/business/partner/printer/jxprint/jxprint.go @@ -267,7 +267,15 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, } orderSel := utils.Int2Str(order.VendorID) + utils.Int2Str(order.OrderSeq) - return c.PrintMsg(ctx, store.PrinterSN, orderSel, "", string(orderPrint)) + 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 } func (c *PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printType int, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { diff --git a/controllers/bidding.go b/controllers/bidding.go index 6a710c901..58215c369 100644 --- a/controllers/bidding.go +++ b/controllers/bidding.go @@ -4,7 +4,9 @@ import ( "errors" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/bidding" + "git.rosy.net.cn/jx-callback/business/jxcallback/scheduler" "git.rosy.net.cn/jx-callback/business/model" + "git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/globals/api" "github.com/astaxie/beego/server/web" ) @@ -108,3 +110,17 @@ func (c *BiddingController) UpdateTiktokOrderPhoneAddress() { return nil, "", err }) } + +// JXPrintAfsOrder 售后单打印 +// @Title 售后单打印 +// @Description 售后单打印 +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /JXPrintAfsOrder [get] +func (c *BiddingController) JXPrintAfsOrder() { + c.callJXPrintAfsOrder(func(params *tBindJXPrintAfsOrderParams) (interface{}, string, error) { + afsOrder2, _ := partner.CurOrderManager.LoadAfsOrder("3301223263215186716", model.VendorIDMTWM) + err := scheduler.CurrentScheduler.OnAfsOrderNew(afsOrder2, false) + return nil, "", err + }) +} diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index b42e300f4..5c6f72fc6 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -4442,6 +4442,15 @@ func init() { Filters: nil, Params: nil}) + web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:BiddingController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:BiddingController"], + web.ControllerComments{ + Method: "JXPrintAfsOrder", + Router: `/JXPrintAfsOrder`, + AllowHTTPMethods: []string{"get"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + // 版本设置 web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:VersionController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:VersionController"], web.ControllerComments{