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

改声音修改一下

Browse Source
This commit is contained in:
苏尹岚
2020-04-21 14:24:42 +08:00
parent fecf20a62e
commit 5206b45430
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -762,7 +762,7 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa
delete(valid, "printerKey") delete(valid, "printerKey")
} }
// 网络打印机处理 // 网络打印机处理
if valid["printerVendorID"] != nil || valid["printerSN"] != nil || valid["printerKey"] != nil || valid["soundPercentage"] != nil { if valid["printerVendorID"] != nil || valid["printerSN"] != nil || valid["printerKey"] != nil {
if valid["printerVendorID"] == nil { if valid["printerVendorID"] == nil {
valid["printerVendorID"] = store.PrinterVendorID valid["printerVendorID"] = store.PrinterVendorID
} }
@@ -788,12 +788,6 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa
if newID2 != "" { if newID2 != "" {
valid["printerKey"] = newID2 valid["printerKey"] = newID2
} }
if valid["soundPercentage"] != nil {
err = handler.SetSound(ctx, store.PrinterSN, store.PrinterKey, jxutils.TranslateSoundSize(printerVendorID, valid["soundPercentage"].(int)))
if err != nil {
return 0, err
}
}
} else { } else {
valid["printerVendorID"] = 0 valid["printerVendorID"] = 0
valid["printerSN"] = "" valid["printerSN"] = ""
@@ -804,6 +798,16 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa
handler.UnregisterPrinter(ctx, store.PrinterSN, store.PrinterKey) handler.UnregisterPrinter(ctx, store.PrinterSN, store.PrinterKey)
} }
} }
if valid["soundPercentage"] != nil {
handler := partner.GetPrinterPlatformFromVendorID(printerVendorID)
if handler == nil {
return 0, fmt.Errorf("不支持的打印机厂商ID:%d", printerVendorID)
}
err = handler.SetSound(ctx, store.PrinterSN, store.PrinterKey, jxutils.TranslateSoundSize(printerVendorID, valid["soundPercentage"].(int)))
if err != nil {
return 0, err
}
}
if valid["linkStoreID"] != nil { if valid["linkStoreID"] != nil {
linkStoreID := int(utils.Interface2Int64WithDefault(valid["linkStoreID"], 0)) linkStoreID := int(utils.Interface2Int64WithDefault(valid["linkStoreID"], 0))
linkStoreID, err = dao.GetRealLinkStoreID(db, linkStoreID) linkStoreID, err = dao.GetRealLinkStoreID(db, linkStoreID)