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

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

@@ -101,10 +101,10 @@ func (c *PrinterHandler) GetVendorID() int {
return model.VendorIDFeiE
}
func (c *PrinterHandler) PrintMsg(ctx *jxcontext.Context, id1, id2, msg string) (printerStatus *partner.PrinterStatus, err error) {
func (c *PrinterHandler) PrintMsg(ctx *jxcontext.Context, id1, id2, msgTitle, msgContent string) (printerStatus *partner.PrinterStatus, err error) {
globals.SugarLogger.Debugf("PrintMsg id1:%s", id1)
if id1 != "" {
if _, err = api.FeieAPI.PrintMsg(id1, msg, 1); err == nil {
if _, err = api.FeieAPI.PrintMsg(id1, msgContent, 1); err == nil {
printerStatus, err = c.GetPrinterStatus(ctx, id1, id2)
}
} else {
@@ -130,48 +130,30 @@ func (c *PrinterHandler) GetPrinterStatus(ctx *jxcontext.Context, printerSN, pri
func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) {
globals.SugarLogger.Debugf("feie PrintOrderByOrder orderID:%s", order.VendorOrderID)
content := c.getOrderContent(order, store.Tel1)
return c.PrintMsg(ctx, store.PrinterSN, store.PrinterKey, content)
return c.PrintMsg(ctx, store.PrinterSN, store.PrinterKey, order.VendorOrderID, content)
}
func (c *PrinterHandler) RegisterPrinter(ctx *jxcontext.Context, store *model.Store, id1, id2 string) (err error) {
if store.PrinterSN != "" && (store.PrinterSN != id1 || store.PrinterKey != id2) {
err = c.UnregisterPrinter(ctx, store)
}
if true { //err == nil {
if id1 != "" {
if err = addNetPrinter(id1, id2, store.Name); err == nil {
store.PrinterSN = id1
store.PrinterKey = id2
}
}
}
return err
}
func (c *PrinterHandler) UnregisterPrinter(ctx *jxcontext.Context, store *model.Store) (err error) {
if store.PrinterSN != "" {
_, _, err = api.FeieAPI.PrinterDelList([]string{store.PrinterSN})
}
return err
}
func addNetPrinter(sn, key, storeName string) (err error) {
name := storeName
func (c *PrinterHandler) RegisterPrinter(ctx *jxcontext.Context, printerSN, printerKey, printerName string) (notUsed1, notUsed2 string, err error) {
_, no, err := api.FeieAPI.PrinterAddList([]*feieapi.PrinterInfo{
&feieapi.PrinterInfo{
SN: sn,
Key: key,
Name: name,
SN: printerSN,
Key: printerKey,
Name: printerName,
},
})
if err == nil {
if no[sn] != "" {
if no[sn] == feieapi.ErrMsgAlredyAdded {
api.FeieAPI.PrinterEdit(sn, name, "")
if no[printerSN] != "" {
if no[printerSN] == feieapi.ErrMsgAlredyAdded {
api.FeieAPI.PrinterEdit(printerSN, printerName, "")
} else {
err = fmt.Errorf("添加打印机出错:%s", no[sn])
err = fmt.Errorf("添加打印机出错:%s", no[printerSN])
}
}
}
return "", "", err
}
func (c *PrinterHandler) UnregisterPrinter(ctx *jxcontext.Context, printerSN, notUsed string) (err error) {
_, _, err = api.FeieAPI.PrinterDelList([]string{printerSN})
return err
}