From d1710be56613d7f59e3b9de8d9ccfee14c1c5d0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 13 Jun 2022 10:58:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=B0=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partner/printer/xiaowm/xiaowm_test.go | 2 +- .../partner/printer/yilianyun/yilianyun.go | 4 +-- .../printer/yilianyun/yilianyun_test.go | 34 +++++++++++-------- .../partner/printer/zhongwu/zhongwu_test.go | 2 +- 4 files changed, 24 insertions(+), 18 deletions(-) diff --git a/business/partner/printer/xiaowm/xiaowm_test.go b/business/partner/printer/xiaowm/xiaowm_test.go index 50d62c110..ee26b4595 100644 --- a/business/partner/printer/xiaowm/xiaowm_test.go +++ b/business/partner/printer/xiaowm/xiaowm_test.go @@ -27,7 +27,7 @@ func TestPrintMsg(t *testing.T) { } // context := CurPrinterHandler.getOrderContent(order, "13412345678") - context := CurPrinterHandler.getOrderContentBig(order, "13412345678") + context := CurPrinterHandler.getOrderContentBig(order, "13412345678", nil) status, err := CurPrinterHandler.PrintMsg(jxcontext.AdminCtx, "7JizmSyiXNzkggaqU", "177f213277dd842ba2b53f6c926a48ea", "test", context) t.Log(utils.Format4Output(status, false)) if err != nil { diff --git a/business/partner/printer/yilianyun/yilianyun.go b/business/partner/printer/yilianyun/yilianyun.go index d06ca8839..2bcd3faf5 100644 --- a/business/partner/printer/yilianyun/yilianyun.go +++ b/business/partner/printer/yilianyun/yilianyun.go @@ -184,9 +184,9 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st ) for _, sku := range order.Skus { - orderFmt += `%s\n\n` + orderFmt += `%s\n` //orderFmt += `%s %s %s\n\n` - orderFmt += `%20s%8s\n` + orderFmt += `%15s%8s\n` //orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count))) orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count))) //标品需要打印条形码 diff --git a/business/partner/printer/yilianyun/yilianyun_test.go b/business/partner/printer/yilianyun/yilianyun_test.go index 0f69d0fc1..82eb11c20 100644 --- a/business/partner/printer/yilianyun/yilianyun_test.go +++ b/business/partner/printer/yilianyun/yilianyun_test.go @@ -1,6 +1,8 @@ package yilianyun import ( + "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/partner" "testing" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" @@ -17,20 +19,24 @@ func init() { } func TestPrintMsg(t *testing.T) { - //orderID := "910838879000442" - //vendorID := 0 - //order, err := partner.CurOrderManager.LoadOrder(orderID, vendorID) - //if err != nil { - // t.Fatal(err) - //} - // - //// context := CurPrinterHandler.getOrderContent(order, "13412345678") - //context := CurPrinterHandler.getOrderContentBig(order, "13412345678") - //status, err := CurPrinterHandler.PrintMsg(jxcontext.AdminCtx, "4004600675", "fem2ukwvduik", "test", context) - //t.Log(utils.Format4Output(status, false)) - //if err != nil { - // t.Fatal(err) - //} + orderID := "88387051001754" + vendorID := 0 + order, err := partner.CurOrderManager.LoadOrder(orderID, vendorID) + if err != nil { + t.Fatal(err) + } + + storeDetail, err := partner.CurOrderManager.LoadStoreDetail(667278, 9) + if err != nil { + t.Fatal(err) + } + // context := CurPrinterHandler.getOrderContent(order, "13412345678") + context := CurPrinterHandler.getOrderContentBig(order, "18981810340", storeDetail) + status, err := CurPrinterHandler.PrintMsg(jxcontext.AdminCtx, "4004806902", "755845185619", "test", context) + t.Log(utils.Format4Output(status, false)) + if err != nil { + t.Fatal(err) + } } func TestRegisterPrinter(t *testing.T) { diff --git a/business/partner/printer/zhongwu/zhongwu_test.go b/business/partner/printer/zhongwu/zhongwu_test.go index 808d0e920..649916da0 100644 --- a/business/partner/printer/zhongwu/zhongwu_test.go +++ b/business/partner/printer/zhongwu/zhongwu_test.go @@ -14,7 +14,7 @@ func init() { testinit.Init() } -func TestPrintMsg(t *testing.T) { +func Msg(t *testing.T) { //orderID := "910838879000442" //vendorID := 0 //order, err := partner.CurOrderManager.LoadOrder(orderID, vendorID)