diff --git a/business/partner/printer/xiaowm/xiaowm.go b/business/partner/printer/xiaowm/xiaowm.go index f4d67e533..e90f4fb8c 100644 --- a/business/partner/printer/xiaowm/xiaowm.go +++ b/business/partner/printer/xiaowm/xiaowm.go @@ -140,6 +140,9 @@ func (c *PrinterHandler) RegisterPrinter(ctx *jxcontext.Context, printerNumber, err = fmt.Errorf("外卖管家打印机设备编号:%s长度不合法", printerNumber) } else { printerToken, err = api.XiaoWMAPI.AuthPrinter(printerNumber, "", "") + if _, err = c.GetPrinterStatus(ctx, printerName, printerToken); err != nil { + c.UnregisterPrinter(ctx, printerNumber, printerToken) + } } return "", printerToken, err } diff --git a/business/partner/printer/zhongwu/zhongwu.go b/business/partner/printer/zhongwu/zhongwu.go index 9f76b2796..2be5a4bb0 100644 --- a/business/partner/printer/zhongwu/zhongwu.go +++ b/business/partner/printer/zhongwu/zhongwu.go @@ -34,31 +34,29 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin expectedDeliveryTime = order.OrderCreatedAt.Add(1 * time.Hour) } orderFmt := ` -京西菜市
-手机买菜上京西
-极速到家送惊喜
---------------------------------
-下单时间: %s
-预计送达: %s
-订单编号: %s
-
- -%s#%d

+京西菜市 +手机买菜上京西 +极速到家送惊喜 +******************************** +下单时间: %s +预计送达: %s +订单编号: %s + +%s#%d %s -
-客户: %s
-电话: %s
-地址: %s
-
-客户备注:
-%s
-
- -实际支付:%s
-
-商品明细:
-品名 数量 单价 小计
---------------------------------
` + +客户: %s +电话: %s +地址: %s + +客户备注: +%s + +实际支付:%s + +商品明细: +品名 数量 单价 小计 +********************************` orderParams := []interface{}{ utils.Time2Str(order.OrderCreatedAt), utils.Time2Str(expectedDeliveryTime), @@ -74,28 +72,23 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin } for _, sku := range order.Skus { - orderFmt += `%s
` - orderFmt += `%10s%10s%10s
` + orderFmt += `%s` + orderFmt += `%8s%10s%10s` orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count))) } - orderFmt += `
-共%d种%d件商品 -
---------------------------------
-商品质量问题请联系:
-%s:%s

-
-官方服务热线: 18011516898
-更多信息请关注官方微信: 京西菜市
-
-

---------------------------------
---------------------------------
-

+ orderFmt += ` +共%d种%d件商品 + +******************************** +

商品质量问题请联系: +

%s:%s +更多信息请关注官方微信: 京西菜市 +******************************** +******************************** ` // http://weixin.qq.com/r/tkkDGzTERmk5rXB49xyk orderParams = append(orderParams, order.SkuCount, order.GoodsCount, order.StoreName, storeTel) - return fmt.Sprintf(strings.Replace(orderFmt, "\n", "", -1), orderParams...) + return fmt.Sprintf(strings.Replace(orderFmt, "", "", -1), orderParams...) } func (c *PrinterHandler) GetVendorID() int { @@ -136,7 +129,7 @@ func (c *PrinterHandler) RegisterPrinter(ctx *jxcontext.Context, deviceID, devic if deviceID == "" || deviceSecret == "" { err = fmt.Errorf("打印机ID与打印机密钥都不能为空") } - // 中午云不需要注册 + _, err = c.GetPrinterStatus(ctx, deviceID, deviceSecret) return "", "", err }