From 0ad94d882a078b53dba328c473951837cc84ac38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Wed, 18 Dec 2024 17:12:10 +0800
Subject: [PATCH] 1

---
 platformapi/ebaiapi/sku_test.go        | 2 +-
 platformapi/trenditapi/trendit_test.go | 2 +-
 platformapi/trenditapi/trenditapi.go   | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/platformapi/ebaiapi/sku_test.go b/platformapi/ebaiapi/sku_test.go
index 026505d7..166dd6d2 100644
--- a/platformapi/ebaiapi/sku_test.go
+++ b/platformapi/ebaiapi/sku_test.go
@@ -24,7 +24,7 @@ func TestSkuBrandList(t *testing.T) {
 }
 
 func TestPictureUpload(t *testing.T) {
-	result, err := api.PictureUpload("https://image.jxc4.com/image/cc7119fbe87cdefc66995cd79321c21c.jpg", nil)
+	result, err := api.PictureUpload("http://image.jxc4.com/image/bd3d57f1be97f55693f44c6f5167efd7.jpg", nil)
 	if err != nil {
 		t.Fatal(err)
 	} else {
diff --git a/platformapi/trenditapi/trendit_test.go b/platformapi/trenditapi/trendit_test.go
index ddd3d1d9..cab85cec 100644
--- a/platformapi/trenditapi/trendit_test.go
+++ b/platformapi/trenditapi/trendit_test.go
@@ -99,7 +99,7 @@ func TestAPI_AddPrinterOrder(t *testing.T) {
 	//--------------------------------
 	//<font# bolder=1 height=2 width=1>1.哇哈哈纯净水24瓶装    x8 ￥321.0</font#><BR><BR><LEFT><font# bolder=0 height=2 width=1>共1种8件商品</font#></LEFT>
 	//<font# bolder=0 height=2 width=1>--------------#19完-------------</font#>`
-	result, err := api.Print("680020033919", context, "10")
+	result, err := api.Print("580011089858", context, "10")
 	fmt.Println(result)
 	fmt.Println(err)
 }
diff --git a/platformapi/trenditapi/trenditapi.go b/platformapi/trenditapi/trenditapi.go
index 633f2e94..cb0979bd 100644
--- a/platformapi/trenditapi/trenditapi.go
+++ b/platformapi/trenditapi/trenditapi.go
@@ -179,8 +179,12 @@ func FormatPrintOrderItemV2(foodName string, quantity, cnt int) string {
 		} else {
 			restLen = foodNameLen - LineLength
 		}
+		repeatTimes := MaxLineLength - restLen
+		if repeatTimes < 0 {
+			repeatTimes = MaxLineLength
+		}
 		result += `<font# bolder=0 height=2 width=1>` + utils.Int2Str(cnt) + `.` + foodName
-		result += StrRepeat(" ", MaxLineLength-restLen) + `x` + quantityStr + `</font#>`
+		result += StrRepeat(" ", repeatTimes) + `x` + quantityStr + `</font#>`
 	} else {
 		result += `<font# bolder=0 height=2 width=1>` + utils.Int2Str(cnt) + `.` + foodName + StrRepeat(" ", MaxLineLength-foodNameLen) + `x` + quantityStr + `</font#>`
 	}