liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- 删除网络打印机时，修复printerVendorID为0的错误

Browse Source
This commit is contained in:
gazebo
2019-04-10 11:03:17 +08:00
parent ac98b753ae
commit 0f38cadb5f
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -385,25 +385,27 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa
} else {
store.PrinterVendorID = int(utils.Interface2Int64WithDefault(valid["printerVendorID"], 0))
}
if valid["printerSN"] == nil {
valid["printerSN"] = store.PrinterSN
}
if valid["printerKey"] == nil {
valid["printerKey"] = store.PrinterKey
}
var handler partner.IPrinterHandler
if handler, err = netprinter.GetHandlerFromStore(store); err != nil {
return 0, err
}
newID1, newID2, err2 := handler.RegisterPrinter(ctx, valid["printerSN"].(string), valid["printerKey"].(string), store.Name)
if err = err2; err != nil {
return 0, err
}
if newID1 != "" {
valid["printerSN"] = newID1
}
if newID2 != "" {
valid["printerKey"] = newID2
if store.PrinterVendorID > 0 {
if valid["printerSN"] == nil {
valid["printerSN"] = store.PrinterSN
}
if valid["printerKey"] == nil {
valid["printerKey"] = store.PrinterKey
}
var handler partner.IPrinterHandler
if handler, err = netprinter.GetHandlerFromStore(store); err != nil {
return 0, err
}
newID1, newID2, err2 := handler.RegisterPrinter(ctx, valid["printerSN"].(string), valid["printerKey"].(string), store.Name)
if err = err2; err != nil {
return 0, err
}
if newID1 != "" {
valid["printerSN"] = newID1
}
if newID2 != "" {
valid["printerKey"] = newID2
}
}
}