From b66a3a08529e61a7f9d85f98eeb2390d201ebb88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Tue, 30 Jan 2024 13:49:52 +0800
Subject: [PATCH] 1

---
 business/jxcallback/scheduler/defsch/defsch_ext.go |  1 -
 business/partner/printer/trendit/trendit.go        |  8 ++++----
 business/partner/printer/xpyun/xpyun.go            | 12 ++++++------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go
index a2bea512b..f719bc95f 100644
--- a/business/jxcallback/scheduler/defsch/defsch_ext.go
+++ b/business/jxcallback/scheduler/defsch/defsch_ext.go
@@ -298,7 +298,6 @@ func (s *DefScheduler) CreateWaybillOnProvidersEx(ctx *jxcontext.Context, vendor
 		excludeCourierVendorIDs = append(excludeCourierVendorIDs, k)
 	}
 
-	globals.SugarLogger.Debugf("===excludeCourierVendorIDs===========:%s", utils.Format4Output(excludeCourierVendorIDs, false))
 	billFunc := func() {
 		bills, err = func() (bills []*model.Waybill, err error) {
 			if vendorID == model.VendorIDELM {
diff --git a/business/partner/printer/trendit/trendit.go b/business/partner/printer/trendit/trendit.go
index 2d08b6fe8..2d67ebf6f 100644
--- a/business/partner/printer/trendit/trendit.go
+++ b/business/partner/printer/trendit/trendit.go
@@ -477,9 +477,9 @@ func (c *PrinterHandler) getCancelOrRefundOrderContent(order *model.GoodsOrder,
 		title,
 	)
 	orderFmt += `<LEFT><font# bolder=1 height=2 width=1>共%d种%d件商品</font#></LEFT>
-<LEFT><font# bolder=1 height=2 width=1>实付金额: %s</font#></LEFT>
 <font# bolder=0 height=1 width=1>--------------#%d完-------------</font#>`
-	orderParams = append(orderParams, order.SkuCount, order.GoodsCount, jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), order.OrderSeq)
+	/*<LEFT><font# bolder=1 height=2 width=1>实付金额: %s</font#></LEFT>*/
+	orderParams = append(orderParams, order.SkuCount, order.GoodsCount /* jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice),*/, order.OrderSeq)
 	return fmt.Sprintf(orderFmt, orderParams...)
 }
 
@@ -518,8 +518,8 @@ func (c *PrinterHandler) getCancelOrRefundOrderContentBig(order *model.GoodsOrde
 	)
 	orderFmt += xpyunapi.StrRepeat("-", 32)
 	orderFmt += `<LEFT><font# bolder=1 height=2 width=1>共%d种%d件商品</font#></LEFT>
-<LEFT><font# bolder=1 height=2 width=1>实付金额: %s</font#></LEFT>
 <font# bolder=0 height=1 width=1>--------------#%d完-------------</font#>`
-	orderParams = append(orderParams, order.SkuCount, order.GoodsCount, jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), order.OrderSeq)
+	/*<LEFT><font# bolder=1 height=2 width=1>实付金额: %s</font#></LEFT>*/
+	orderParams = append(orderParams, order.SkuCount, order.GoodsCount /*jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice),*/, order.OrderSeq)
 	return fmt.Sprintf(orderFmt, orderParams...)
 }
diff --git a/business/partner/printer/xpyun/xpyun.go b/business/partner/printer/xpyun/xpyun.go
index 0641f4623..1a27bd09a 100644
--- a/business/partner/printer/xpyun/xpyun.go
+++ b/business/partner/printer/xpyun/xpyun.go
@@ -471,10 +471,10 @@ func (c *PrinterHandler) getCancelOrRefundOrderContent(order *model.GoodsOrder,
 		order.OrderSeq,
 	)
 	orderFmt += xpyunapi.StrRepeat("-", 32)
-	orderFmt += `<L>共%d种%d件商品</L>
-实际支付:%s<BR>`
+	orderFmt += `<L>共%d种%d件商品</L>`
+	/*实际支付:%s<BR>`*/
 	orderFmt += xpyunapi.StrRepeat("-", 14) + "#%d完</HB>" + xpyunapi.StrRepeat("-", 14) + `<BR>`
-	orderParams = append(orderParams, order.SkuCount, order.GoodsCount, jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), order.OrderSeq)
+	orderParams = append(orderParams, order.SkuCount, order.GoodsCount /*jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice),*/, order.OrderSeq)
 	return fmt.Sprintf(orderFmt, orderParams...)
 }
 
@@ -516,9 +516,9 @@ func (c *PrinterHandler) getCancelOrRefundOrderContentBig(order *model.GoodsOrde
 		order.OrderSeq,
 	)
 	orderFmt += xpyunapi.StrRepeat("-", 32)
-	orderFmt += `<L><HB>共%d种%d件商品</L>
-实际支付:%s</HB><BR>`
+	orderFmt += `<L><HB>共%d种%d件商品</L>`
+	/*实际支付:%s</HB><BR>`*/
 	orderFmt += xpyunapi.StrRepeat("-", 14) + "#%d完</HB>" + xpyunapi.StrRepeat("-", 14) + `<BR>`
-	orderParams = append(orderParams, order.SkuCount, order.GoodsCount, jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), order.OrderSeq)
+	orderParams = append(orderParams, order.SkuCount, order.GoodsCount /*jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice),*/, order.OrderSeq)
 	return fmt.Sprintf(orderFmt, orderParams...)
 }