From 763c31a5e43394894f4a4ea52b9eaebae0767ec7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 8 Aug 2022 10:24:05 +0800 Subject: [PATCH] 1 --- business/jxcallback/scheduler/defsch/defsch.go | 6 ++---- business/partner/printer/jxprint/jxprint.go | 4 ++-- business/partner/printer/jxprint/jxprint_const.go | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 3e5b39baf..acc86b085 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -1033,10 +1033,8 @@ func (s *DefScheduler) swtich2SelfDeliverWithRetry(savedOrderInfo *WatchOrderInf order := savedOrderInfo.order globals.SugarLogger.Debugf("swtich2SelfDeliverWithRetry orderID:%s", order.VendorOrderID) if order.WaybillVendorID != order.VendorID { // && err != scheduler.ErrOrderStatusAlreadySatisfyCurOperationELM && err != scheduler.ErrOrderStatusAlreadySatisfyCurOperationMTWM - if err := s.Swtich2SelfDeliver(order, ""); err != nil && (err != scheduler.ErrOrderStatusAlreadySatisfyCurOperation && !strings.Contains(err.Error(), "1047") && !strings.Contains(err.Error(), "301251")) { //301251饿了转自送 1047美团混合送 - if strings.Contains(err.Error(), "1047") || strings.Contains(err.Error(), "301251") { - s.SelfDeliverDelivering(order, "非专送、快送、混合送订单，转自送失败，调用deriving转自送") - } + if err := s.Swtich2SelfDeliver(order, ""); err != nil && (err != scheduler.ErrOrderStatusAlreadySatisfyCurOperation && strings.Contains(err.Error(), "1047") || strings.Contains(err.Error(), "301251")) { //301251饿了转自送 1047美团混合送 + s.SelfDeliverDelivering(order, "非专送、快送、混合送订单，转自送失败，调用deriving转自送") globals.SugarLogger.Infof("swtich2SelfDeliverWithRetry failed, bill:%v, err:%v", bill, err) if retryCount > 0 { utils.AfterFuncWithRecover(duration, func() { diff --git a/business/partner/printer/jxprint/jxprint.go b/business/partner/printer/jxprint/jxprint.go index 73e0505fb..482674340 100644 --- a/business/partner/printer/jxprint/jxprint.go +++ b/business/partner/printer/jxprint/jxprint.go @@ -241,9 +241,9 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, return } printData := ManagerOrderAndStore(order, store.Tel1, storeDetail) - printData[BigFont] = false + printData[BigFont] = "small" if store.PrinterFontSize == partner.PrinterFontSizeBig || store.PrinterFontSize == partner.PrinterFontSizeBig2 { - printData[BigFont] = true + printData[BigFont] = "big" } // 打印次数 printData[PrintNumber] = utils.Int2Str(model.YES) diff --git a/business/partner/printer/jxprint/jxprint_const.go b/business/partner/printer/jxprint/jxprint_const.go index 673d478a4..01e17cb7e 100644 --- a/business/partner/printer/jxprint/jxprint_const.go +++ b/business/partner/printer/jxprint/jxprint_const.go @@ -48,8 +48,8 @@ type SkuListPrintOrder struct { } // ManagerOrderAndStore 京西云参数组装 -func ManagerOrderAndStore(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) map[string]interface{} { - printOrder := make(map[string]interface{}, 0) +func ManagerOrderAndStore(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) map[string]string { + printOrder := make(map[string]string, 0) skuList := make([]*SkuListPrintOrder, 0, 0) // 获取品牌名称 if storeDetail != nil && storeDetail.BrandIsPrint == model.NO {