liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2024-01-30 13:49:52 +08:00
parent 8ea8663e4f
commit b66a3a0852
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/jxcallback/scheduler/defsch/defsch_ext.go
View File

@@ -298,7 +298,6 @@ func (s *DefScheduler) CreateWaybillOnProvidersEx(ctx *jxcontext.Context, vendor
excludeCourierVendorIDs = append(excludeCourierVendorIDs, k) excludeCourierVendorIDs = append(excludeCourierVendorIDs, k)
} }
globals.SugarLogger.Debugf("===excludeCourierVendorIDs===========:%s", utils.Format4Output(excludeCourierVendorIDs, false))
billFunc := func() { billFunc := func() {
bills, err = func() (bills []*model.Waybill, err error) { bills, err = func() (bills []*model.Waybill, err error) {
if vendorID == model.VendorIDELM { if vendorID == model.VendorIDELM {

8
business/partner/printer/trendit/trendit.go
View File

@@ -477,9 +477,9 @@ func (c *PrinterHandler) getCancelOrRefundOrderContent(order *model.GoodsOrder,
title, title,
) )
orderFmt += `<LEFT><font# bolder=1 height=2 width=1>共%d种%d件商品</font#></LEFT> 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#>` <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...) return fmt.Sprintf(orderFmt, orderParams...)
} }
@@ -518,8 +518,8 @@ func (c *PrinterHandler) getCancelOrRefundOrderContentBig(order *model.GoodsOrde
) )
orderFmt += xpyunapi.StrRepeat("-", 32) orderFmt += xpyunapi.StrRepeat("-", 32)
orderFmt += `<LEFT><font# bolder=1 height=2 width=1>共%d种%d件商品</font#></LEFT> 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#>` <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...) return fmt.Sprintf(orderFmt, orderParams...)
} }

12
business/partner/printer/xpyun/xpyun.go
View File

@@ -471,10 +471,10 @@ func (c *PrinterHandler) getCancelOrRefundOrderContent(order *model.GoodsOrder,
order.OrderSeq, order.OrderSeq,
) )
orderFmt += xpyunapi.StrRepeat("-", 32) orderFmt += xpyunapi.StrRepeat("-", 32)
orderFmt += `<L>共%d种%d件商品</L> orderFmt += `<L>共%d种%d件商品</L>`
实际支付:%s<BR>` /*实际支付:%s<BR>`*/
orderFmt += xpyunapi.StrRepeat("-", 14) + "#%d完</HB>" + xpyunapi.StrRepeat("-", 14) + `<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...) return fmt.Sprintf(orderFmt, orderParams...)
} }
@@ -516,9 +516,9 @@ func (c *PrinterHandler) getCancelOrRefundOrderContentBig(order *model.GoodsOrde
order.OrderSeq, order.OrderSeq,
) )
orderFmt += xpyunapi.StrRepeat("-", 32) orderFmt += xpyunapi.StrRepeat("-", 32)
orderFmt += `<L><HB>共%d种%d件商品</L> orderFmt += `<L><HB>共%d种%d件商品</L>`
实际支付:%s</HB><BR>` /*实际支付:%s</HB><BR>`*/
orderFmt += xpyunapi.StrRepeat("-", 14) + "#%d完</HB>" + xpyunapi.StrRepeat("-", 14) + `<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...) return fmt.Sprintf(orderFmt, orderParams...)
} }