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:
邹宗楠
2022-08-24 11:03:22 +08:00
parent dde1109150
commit 2ce879a661
7 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/jxstore/cms/store.go
View File

@@ -895,7 +895,7 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa
if valid["printerKey"] == nil { if valid["printerKey"] == nil {
valid["printerKey"] = store.PrinterKey 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 { if err = err2; err != nil {
return 0, err return 0, err
} }
@@ -1207,7 +1207,7 @@ func CreateStore(ctx *jxcontext.Context, storeExt *StoreExt, userName string) (i
if handler == nil { if handler == nil {
return 0, fmt.Errorf("不支持的打印机厂商ID:%d", store.PrinterVendorID) 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 { if err = err2; err != nil {
return 0, err return 0, err
} }
@@ -1315,7 +1315,7 @@ func CreateStore2JX(ctx *jxcontext.Context, storeExt *StoreExt, userName string)
if handler == nil { if handler == nil {
return 0, fmt.Errorf("不支持的打印机厂商ID:%d", store.PrinterVendorID) 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 { if err = err2; err != nil {
return 0, err return 0, err
} }

2
business/partner/partner_printer.go
View File

@@ -56,7 +56,7 @@ type IPrinterHandler interface {
PrintMsg(ctx *jxcontext.Context, id1, id2, msgTitle, msgContent string) (printerStatus *PrinterStatus, err error) PrintMsg(ctx *jxcontext.Context, id1, id2, msgTitle, msgContent string) (printerStatus *PrinterStatus, err error)
GetPrinterStatus(ctx *jxcontext.Context, id1, id2 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) UnregisterPrinter(ctx *jxcontext.Context, id1, id2 string) (err error)
BindPrinter(ctx *jxcontext.Context, mapData map[string]interface{}) (bindResult *BindPrinterResult, err error) BindPrinter(ctx *jxcontext.Context, mapData map[string]interface{}) (bindResult *BindPrinterResult, err error)

2
business/partner/printer/feie/feie.go
View File

@@ -273,7 +273,7 @@ func (c *PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printT
return nil, err 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 var no map[string]string
if globals.EnableStoreWrite { if globals.EnableStoreWrite {
_, no, err = api.FeieAPI.PrinterAddList([]*feieapi.PrinterInfo{ _, no, err = api.FeieAPI.PrinterAddList([]*feieapi.PrinterInfo{

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

@@ -59,15 +59,14 @@ func (c *PrinterHandler) GetPrinterStatus(ctx *jxcontext.Context, id1, id2 strin
return nil, err 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 { if globals.EnableStoreWrite {
err = api.JxPrintAPI.AddPrinter([]*jxprintapi.AddPrinterParam{ err = api.JxPrintAPI.AddPrinter([]*jxprintapi.AddPrinterParam{
&jxprintapi.AddPrinterParam{ &jxprintapi.AddPrinterParam{
PrintNo: id1, // 打印机编号 PrintNo: id1, // 打印机编号
Name: printerName, Name: printerName, // 门店名称
SIM: id2, // printKey-指定验证用户号码 SIM: id2, // printKey-指定验证用户号码
StoreId: 0, // 门店id StoreId: storeID, // 门店id
StoreName: printerName, // 门店名称
}, },
}) })
} }

2
business/partner/printer/xiaowm/xiaowm.go
View File

@@ -320,7 +320,7 @@ func isV500(printerNo string) bool {
return printerNoNum > 1000000000 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) globals.SugarLogger.Debugf("xiaowm RegisterPrinter printerNumber:%s", printerNumber)
if printerNumber == "" { //len(printerNumber) != len("7JizmSyiXNzkggaqU") { if printerNumber == "" { //len(printerNumber) != len("7JizmSyiXNzkggaqU") {
err = fmt.Errorf("外卖管家打印机设备编号:%s长度不合法", printerNumber) err = fmt.Errorf("外卖管家打印机设备编号:%s长度不合法", printerNumber)

2
business/partner/printer/yilianyun/yilianyun.go
View File

@@ -442,7 +442,7 @@ func (c *PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printT
return c.PrintMsg(ctx, store.PrinterSN, store.PrinterKey, order.VendorOrderID, content) 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 { if globals.EnableStoreWrite {
err = api.YilianyunAPI.AddPrinter(machineCode, secret, printerName) err = api.YilianyunAPI.AddPrinter(machineCode, secret, printerName)
} }

2
business/partner/printer/zhongwu/zhongwu.go
View File

@@ -238,7 +238,7 @@ func (c *PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printT
return nil, err 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 == "" { if deviceID == "" || deviceSecret == "" {
err = fmt.Errorf("打印机ID与打印机密钥都不能为空") err = fmt.Errorf("打印机ID与打印机密钥都不能为空")
} }