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

Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
邹宗楠
2023-03-21 16:13:04 +08:00
parent 1c44b0a8f1 165753575c
commit 34d4e20229
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -825,9 +825,6 @@ func PrintMsg(ctx *jxcontext.Context, vendorID int, id1, id2, msgTitle, msgConte
if handler == nil {
return nil, fmt.Errorf("打印机厂商:%d当前不被支持，请检查vendorID", vendorID)
}
if vendorID == model.VendorIDXpYun {
id2 = "1" //id2传打印份数
}
return handler.PrintMsg(ctx, id1, id2, msgTitle, msgContent)
}

9
business/partner/printer/xpyun/xpyun.go
View File

@@ -34,14 +34,11 @@ func (c *PrinterHandler) GetVendorID() int {
func (c *PrinterHandler) PrintMsg(ctx *jxcontext.Context, sn, copies, voiceType, msgContent string) (printerStatus *partner.PrinterStatus, err error) {
if sn != "" {
if globals.EnableStoreWrite {
if utils.Str2Int(copies) < 0 || utils.Str2Int(copies) > 3 {
copies = "1"
}
globals.SugarLogger.Debugf("printMsg voiceType====%s", voiceType)
printOrderID, err1 := api.XpyunAPI.Print(&xpyunapi.PrintRequest{
Sn: sn,
Content: msgContent,
Copies: utils.Str2Int(copies),
Copies: 1,
Voice: utils.Str2Int(voiceType),
Mode: xpyunapi.ModeCheckYes,
ExpiresIn: xpyunapi.ExpiresInDefault,
@@ -116,7 +113,7 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store,
}
count := 0
for {
printerStatus, err := c.PrintMsg(ctx, store.PrinterSN, store.PrinterKey, utils.Int2Str(xpyunapi.VoicePlayOrder), content)
printerStatus, err := c.PrintMsg(ctx, store.PrinterSN, "", utils.Int2Str(xpyunapi.VoicePlayOrder), content)
if (store.PrinterFontSize == partner.PrinterFontSizeBig2 || store.PrinterFontSize == partner.PrinterFontSizeNormal2) && count < 1 {
count += 1
continue
@@ -151,7 +148,7 @@ func (c *PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printT
return nil, nil
}
return c.PrintMsg(ctx, store.PrinterSN, store.PrinterKey, voiceType, content)
return c.PrintMsg(ctx, store.PrinterSN, "", voiceType, content)
}
func (c *PrinterHandler) EmptyPrintList(ctx *jxcontext.Context, sn, id2 string) (err error) {