From 6053aca73046f02c92d813212da977edaef1175a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 16 May 2024 13:46:14 +0800 Subject: [PATCH] 1 --- business/jxcallback/scheduler/defsch/defsch.go | 6 +++--- business/jxstore/act/act.go | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index ce2f8e332..e7a71e07a 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -1070,8 +1070,8 @@ func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2 func (s *DefScheduler) swtich2SelfDeliverWithRetry(savedOrderInfo *WatchOrderInfo, bill *model.Waybill, retryCount int, duration time.Duration) { order := savedOrderInfo.order if order.WaybillVendorID != order.VendorID { - if err := s.Swtich2SelfDeliver(order, "Swtich2SelfDeliver转自送"); err != nil && (err != scheduler.ErrOrderStatusAlreadySatisfyCurOperation) { //301251饿了转自送 1047美团混合送 - partner.CurOrderManager.OnOrderMsg(order, "调用[swtich2SelfDeliverWithRetry]转自送", err.Error()) + if err := s.Swtich2SelfDeliver(order, "Swtich2SelfDeliver转自送"); err != nil && err != scheduler.ErrOrderStatusAlreadySatisfyCurOperation { //301251饿了转自送 1047美团混合送 + //partner.CurOrderManager.OnOrderMsg(order, "调用[swtich2SelfDeliverWithRetry]转自送", err.Error()) if retryCount > 0 { utils.AfterFuncWithRecover(duration, func() { jxutils.CallMsgHandlerAsync(func() { @@ -1084,7 +1084,7 @@ func (s *DefScheduler) swtich2SelfDeliverWithRetry(savedOrderInfo *WatchOrderInf if err := s.SelfDeliverDelivering(order, "非专送、快送、混合送订单，转自送失败，调用deriving转自送"); err != nil { s.notify3rdPartyWaybill(order, bill, false) s.removeWaybillFromMap(savedOrderInfo, order.VendorID) - partner.CurOrderManager.OnOrderMsg(order, "调用[SelfDeliverDelivering]转自送", err.Error()) + //partner.CurOrderManager.OnOrderMsg(order, "调用[SelfDeliverDelivering]转自送", err.Error()) } } else if strings.Contains(err.Error(), "301251") { //elm 不做处理 //s.cancelOtherWaybills(savedOrderInfo, nil, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrNotAcceptIntime) diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go index b0eee5e92..9e2122049 100644 --- a/business/jxstore/act/act.go +++ b/business/jxstore/act/act.go @@ -670,6 +670,7 @@ func CreateAct(ctx *jxcontext.Context, act *model.Act, vendorIDs []int, vendorOr } func CreateActForMtByOrder(ctx *jxcontext.Context, act *model.Act, vendorIDs []int, vendorOrgCode string, actStoreSku []*ActStoreSkuParam) (err error) { + globals.SugarLogger.Debugf("================actStoreSku := %s", utils.Format4Output(actStoreSku, false)) var ( db = dao.GetDB() actStoreSkuMap = make(map[int][]*model.StoreSkuBind) @@ -783,6 +784,7 @@ func CreateActForMtByOrder(ctx *jxcontext.Context, act *model.Act, vendorIDs []i return err } //同步建到美团 + globals.SugarLogger.Debugf("================actStoreSkuMap := %s", utils.Format4Output(actStoreSkuMap, false)) for storeID, storeSkus := range actStoreSkuMap { if storeDetail, _ := dao.GetStoreDetail(db, storeID, vendorID, vendorOrgCode); storeDetail != nil { var actData []*mtwmapi.RetailDiscountActData @@ -799,7 +801,10 @@ func CreateActForMtByOrder(ctx *jxcontext.Context, act *model.Act, vendorIDs []i }) } actIdResult := make(map[string]int64, 0) - actResult, faileInfoList, _ := api.MtwmAPI.RetailDiscountBatchSave2(storeDetail.VendorStoreID, actType, actData) + actResult, faileInfoList, err := api.MtwmAPI.RetailDiscountBatchSave2(storeDetail.VendorStoreID, actType, actData) + globals.SugarLogger.Debugf("================actResult := %s", utils.Format4Output(actResult, false)) + globals.SugarLogger.Debugf("================faileInfoList := %s", utils.Format4Output(faileInfoList, false)) + globals.SugarLogger.Debugf("================err := %v", err) for _, v := range actResult { var ( actStoreSkuMapUpdate *model.ActStoreSkuMap