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

- yilianyun printer added

Browse Source
This commit is contained in:
gazebo
2019-04-09 20:56:53 +08:00
parent 3203201bc6
commit 54a0cc216d
13 changed files with 330 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -375,33 +375,35 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa
syncStatus |= model.SyncFlagStoreName
}
// 网络打印机处理
if valid["printerVendorID"] != nil {
printerVendorID := valid["printerVendorID"].(int)
if printerVendorID != store.PrinterVendorID {
if handler := partner.GetPrinterPlatformFromVendorID(store.PrinterVendorID); handler != nil {
handler.UnregisterPrinter(ctx, store)
}
store.PrinterSN = ""
store.PrinterKey = ""
store.PrinterVendorID = printerVendorID
valid["printerSN"], valid["printerKey"] = store.PrinterSN, store.PrinterKey
if valid["printerVendorID"] != nil || valid["printerSN"] != nil || valid["printerKey"] != nil {
if handler := partner.GetPrinterPlatformFromVendorID(store.PrinterVendorID); handler != nil {
handler.UnregisterPrinter(ctx, store.PrinterSN, store.PrinterKey)
}
}
if valid["printerSN"] != nil || valid["printerKey"] != nil {
if valid["printerKey"] != nil && valid["printerSN"] == nil {
if valid["printerVendorID"] == nil {
valid["printerVendorID"] = store.PrinterVendorID
} else {
store.PrinterVendorID = valid["printerVendorID"].(int)
}
if valid["printerSN"] == nil {
valid["printerSN"] = store.PrinterSN
}
if valid["printerSN"] != nil && valid["printerKey"] == nil {
if valid["printerKey"] == nil {
valid["printerKey"] = store.PrinterKey
}
var handler partner.IPrinterHandler
if handler, err = netprinter.GetHandlerFromStore(store); err != nil {
return 0, err
}
if err = handler.RegisterPrinter(ctx, store, valid["printerSN"].(string), valid["printerKey"].(string)); err != nil {
newID1, newID2, err2 := handler.RegisterPrinter(ctx, valid["printerSN"].(string), valid["printerKey"].(string), store.Name)
if err = err2; err != nil {
return 0, err
}
valid["printerSN"], valid["printerKey"] = store.PrinterSN, store.PrinterKey
if newID1 != "" {
valid["printerSN"] = newID1
}
if newID2 != "" {
valid["printerKey"] = newID2
}
}
for _, v := range []string{
@@ -473,9 +475,21 @@ func CreateStore(ctx *jxcontext.Context, storeExt *StoreExt, userName string) (i
store.Name = jxutils.FormalizeName(store.Name)
store.DeliveryRange = strings.Trim(store.DeliveryRange, ";")
if store.PrinterSN != "" {
if err = addNetPrinter(store.PrinterSN, store.PrinterKey, store.Name); err != nil {
var handler partner.IPrinterHandler
handler, err = netprinter.GetHandlerFromStore(store)
if err != nil {
return 0, err
}
newID1, newID2, err2 := handler.RegisterPrinter(ctx, store.PrinterSN, store.PrinterKey, store.Name)
if err = err2; err != nil {
return 0, err
}
if newID1 != "" {
store.PrinterSN = newID1
}
if newID2 != "" {
store.PrinterKey = newID2
}
}
dao.WrapAddIDCULDEntity(store, userName)
store.ID = existingID

4
business/jxstore/tempop/tempop.go
View File

@@ -885,10 +885,10 @@ func RefreshEbaiBadComment(ctx *jxcontext.Context, fromTime, toTime time.Time, i
return hint, err
}
func PrintMsg(ctx *jxcontext.Context, vendorID int, id1, id2, msg string) (printerStatus *partner.PrinterStatus, err error) {
func PrintMsg(ctx *jxcontext.Context, vendorID int, id1, id2, msgTitle, msgContent string) (printerStatus *partner.PrinterStatus, err error) {
handler := partner.GetPrinterPlatformFromVendorID(vendorID)
if handler == nil {
return nil, fmt.Errorf("打印机厂商:%d当前不被支持，请检查vendorID", vendorID)
}
return handler.PrintMsg(ctx, id1, id2, msg)
return handler.PrintMsg(ctx, id1, id2, msgTitle, msgContent)
}