From 2ce879a661db72add9f91d33b1d46b0088fffb96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 24 Aug 2022 11:03:22 +0800 Subject: [PATCH] 1 --- business/jxstore/cms/store.go | 6 +++--- business/partner/partner_printer.go | 2 +- business/partner/printer/feie/feie.go | 2 +- business/partner/printer/jxprint/jxprint.go | 11 +++++------ business/partner/printer/xiaowm/xiaowm.go | 2 +- business/partner/printer/yilianyun/yilianyun.go | 2 +- business/partner/printer/zhongwu/zhongwu.go | 2 +- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index f280616d9..7d0d64200 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -895,7 +895,7 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa if valid["printerKey"] == nil { valid["printerKey"] = store.PrinterKey } - newID1, newID2, err2 := handler.RegisterPrinter(ctx, valid["printerSN"].(string), valid["printerKey"].(string), store.Name) + newID1, newID2, err2 := handler.RegisterPrinter(ctx, valid["printerSN"].(string), valid["printerKey"].(string), store.Name, int64(store.ID)) if err = err2; err != nil { return 0, err } @@ -1207,7 +1207,7 @@ func CreateStore(ctx *jxcontext.Context, storeExt *StoreExt, userName string) (i if handler == nil { return 0, fmt.Errorf("不支持的打印机厂商ID:%d", store.PrinterVendorID) } - newID1, newID2, err2 := handler.RegisterPrinter(ctx, store.PrinterSN, store.PrinterKey, store.Name) + newID1, newID2, err2 := handler.RegisterPrinter(ctx, store.PrinterSN, store.PrinterKey, store.Name, int64(store.ID)) if err = err2; err != nil { return 0, err } @@ -1315,7 +1315,7 @@ func CreateStore2JX(ctx *jxcontext.Context, storeExt *StoreExt, userName string) if handler == nil { return 0, fmt.Errorf("不支持的打印机厂商ID:%d", store.PrinterVendorID) } - newID1, newID2, err2 := handler.RegisterPrinter(ctx, store.PrinterSN, store.PrinterKey, store.Name) + newID1, newID2, err2 := handler.RegisterPrinter(ctx, store.PrinterSN, store.PrinterKey, store.Name, int64(store.ID)) if err = err2; err != nil { return 0, err } diff --git a/business/partner/partner_printer.go b/business/partner/partner_printer.go index a67a20cfa..f0b177393 100644 --- a/business/partner/partner_printer.go +++ b/business/partner/partner_printer.go @@ -56,7 +56,7 @@ type IPrinterHandler interface { PrintMsg(ctx *jxcontext.Context, id1, id2, msgTitle, msgContent string) (printerStatus *PrinterStatus, err error) GetPrinterStatus(ctx *jxcontext.Context, id1, id2 string) (printerStatus *PrinterStatus, err error) - RegisterPrinter(ctx *jxcontext.Context, id1, id2, printerName string) (newID1, newID2 string, err error) + RegisterPrinter(ctx *jxcontext.Context, id1, id2, printerName string, soreId int64) (newID1, newID2 string, err error) UnregisterPrinter(ctx *jxcontext.Context, id1, id2 string) (err error) BindPrinter(ctx *jxcontext.Context, mapData map[string]interface{}) (bindResult *BindPrinterResult, err error) diff --git a/business/partner/printer/feie/feie.go b/business/partner/printer/feie/feie.go index 762f462cf..cceab9bda 100644 --- a/business/partner/printer/feie/feie.go +++ b/business/partner/printer/feie/feie.go @@ -273,7 +273,7 @@ func (c *PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printT return nil, err } -func (c *PrinterHandler) RegisterPrinter(ctx *jxcontext.Context, printerSN, printerKey, printerName string) (notUsed1, notUsed2 string, err error) { +func (c *PrinterHandler) RegisterPrinter(ctx *jxcontext.Context, printerSN, printerKey, printerName string, storeID int64) (notUsed1, notUsed2 string, err error) { var no map[string]string if globals.EnableStoreWrite { _, no, err = api.FeieAPI.PrinterAddList([]*feieapi.PrinterInfo{ diff --git a/business/partner/printer/jxprint/jxprint.go b/business/partner/printer/jxprint/jxprint.go index ff9e480f3..8c76e59db 100644 --- a/business/partner/printer/jxprint/jxprint.go +++ b/business/partner/printer/jxprint/jxprint.go @@ -59,15 +59,14 @@ func (c *PrinterHandler) GetPrinterStatus(ctx *jxcontext.Context, id1, id2 strin return nil, err } -func (c *PrinterHandler) RegisterPrinter(ctx *jxcontext.Context, id1, id2, printerName string) (newID1, newID2 string, err error) { +func (c *PrinterHandler) RegisterPrinter(ctx *jxcontext.Context, id1, id2, printerName string, storeID int64) (newID1, newID2 string, err error) { if globals.EnableStoreWrite { err = api.JxPrintAPI.AddPrinter([]*jxprintapi.AddPrinterParam{ &jxprintapi.AddPrinterParam{ - PrintNo: id1, // 打印机编号 - Name: printerName, - SIM: id2, // printKey-指定验证用户号码 - StoreId: 0, // 门店id - StoreName: printerName, // 门店名称 + PrintNo: id1, // 打印机编号 + Name: printerName, // 门店名称 + SIM: id2, // printKey-指定验证用户号码 + StoreId: storeID, // 门店id }, }) } diff --git a/business/partner/printer/xiaowm/xiaowm.go b/business/partner/printer/xiaowm/xiaowm.go index eb55a87aa..6ec3ec472 100644 --- a/business/partner/printer/xiaowm/xiaowm.go +++ b/business/partner/printer/xiaowm/xiaowm.go @@ -320,7 +320,7 @@ func isV500(printerNo string) bool { return printerNoNum > 1000000000 } -func (c *PrinterHandler) RegisterPrinter(ctx *jxcontext.Context, printerNumber, notUsed, printerName string) (newID1, printerToken string, err error) { +func (c *PrinterHandler) RegisterPrinter(ctx *jxcontext.Context, printerNumber, notUsed, printerName string, storeID int64) (newID1, printerToken string, err error) { globals.SugarLogger.Debugf("xiaowm RegisterPrinter printerNumber:%s", printerNumber) if printerNumber == "" { //len(printerNumber) != len("7JizmSyiXNzkggaqU") { err = fmt.Errorf("外卖管家打印机设备编号:%s长度不合法", printerNumber) diff --git a/business/partner/printer/yilianyun/yilianyun.go b/business/partner/printer/yilianyun/yilianyun.go index 104f5a301..360dced3f 100644 --- a/business/partner/printer/yilianyun/yilianyun.go +++ b/business/partner/printer/yilianyun/yilianyun.go @@ -442,7 +442,7 @@ func (c *PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printT return c.PrintMsg(ctx, store.PrinterSN, store.PrinterKey, order.VendorOrderID, content) } -func (c *PrinterHandler) RegisterPrinter(ctx *jxcontext.Context, machineCode, secret, printerName string) (notUsed1, notUsed2 string, err error) { +func (c *PrinterHandler) RegisterPrinter(ctx *jxcontext.Context, machineCode, secret, printerName string, storeID int64) (notUsed1, notUsed2 string, err error) { if globals.EnableStoreWrite { err = api.YilianyunAPI.AddPrinter(machineCode, secret, printerName) } diff --git a/business/partner/printer/zhongwu/zhongwu.go b/business/partner/printer/zhongwu/zhongwu.go index 80f582acc..78cf43e51 100644 --- a/business/partner/printer/zhongwu/zhongwu.go +++ b/business/partner/printer/zhongwu/zhongwu.go @@ -238,7 +238,7 @@ func (c *PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printT return nil, err } -func (c *PrinterHandler) RegisterPrinter(ctx *jxcontext.Context, deviceID, deviceSecret, printerName string) (notUsed1, notUsed2 string, err error) { +func (c *PrinterHandler) RegisterPrinter(ctx *jxcontext.Context, deviceID, deviceSecret, printerName string, storeID int64) (notUsed1, notUsed2 string, err error) { if deviceID == "" || deviceSecret == "" { err = fmt.Errorf("打印机ID与打印机密钥都不能为空") }