diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index 7cdac28c6..ce53fabd3 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -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) } diff --git a/business/partner/printer/xpyun/xpyun.go b/business/partner/printer/xpyun/xpyun.go index a694fa41c..dacda8067 100644 --- a/business/partner/printer/xpyun/xpyun.go +++ b/business/partner/printer/xpyun/xpyun.go @@ -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, "1", utils.Int2Str(xpyunapi.VoicePlayOrder), content) if (store.PrinterFontSize == partner.PrinterFontSizeBig2 || store.PrinterFontSize == partner.PrinterFontSizeNormal2) && count < 1 { count += 1 continue