From e24d7e50fac1b9310c8da115473552695301cb19 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 26 Dec 2022 17:15:36 +0800 Subject: [PATCH 1/5] 1 --- business/partner/delivery/tiktok_store/waybill.go | 2 +- business/partner/purchase/tiktok_store/store.go | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/business/partner/delivery/tiktok_store/waybill.go b/business/partner/delivery/tiktok_store/waybill.go index bf7ee099c..1919d6e86 100644 --- a/business/partner/delivery/tiktok_store/waybill.go +++ b/business/partner/delivery/tiktok_store/waybill.go @@ -100,7 +100,7 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee if dispatcherFee, err := apiObj.GetDispatcherInfo(int64(order.StoreID), order.VendorOrderID, tiktok_api.DispatcherFeeTypeCall); err == nil { bill.DesiredFee = dispatcherFee } - if err := apiObj.OrderDispatcher(utils.Str2Int64(order.VendorStoreID), utils.Str2Int64(order.VendorOrderID), tiktok_api.DispatcherFeeTypeCall); err != nil { + if err := apiObj.ShopOrderDispatcher(utils.Str2Int64(order.VendorStoreID), order.VendorOrderID, tiktok_api.DispatcherFeeTypeCall); err != nil { return nil, err } delivery.OnWaybillCreated(bill) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index 32ad95489..027df2c61 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -788,12 +788,6 @@ func CreateAndBindMinPriceTemplate(vendorOrgCode string, vendorStoreID, minimum }, TradeLimitSubjectList: []int32{ tiktok_api.TradeLimitSubjectEndUser, - tiktok_api.TradeLimitSubjectUserGroup, - tiktok_api.TradeLimitSubjectDevice, - tiktok_api.TradeLimitSubjectBuyMobile, - tiktok_api.TradeLimitSubjectReceivingMobile, - tiktok_api.TradeLimitSubjectIDCard, - tiktok_api.TradeLimitSubjectPayAccount, }, }, }, @@ -823,12 +817,6 @@ func UpdateTradeLimitTemplate(vendorOrgCode string, tradeLimitID, minPrice int64 }, TradeLimitSubjectLisit: []int32{ tiktok_api.TradeLimitSubjectEndUser, - tiktok_api.TradeLimitSubjectUserGroup, - tiktok_api.TradeLimitSubjectDevice, - tiktok_api.TradeLimitSubjectBuyMobile, - tiktok_api.TradeLimitSubjectReceivingMobile, - tiktok_api.TradeLimitSubjectIDCard, - tiktok_api.TradeLimitSubjectPayAccount, }, }, }, From 9ae785793b7da6465a30013e332878fe1e4128cf Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 26 Dec 2022 17:27:45 +0800 Subject: [PATCH 2/5] 1 --- business/model/store.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/business/model/store.go b/business/model/store.go index 83e26ea0e..1ad7da035 100644 --- a/business/model/store.go +++ b/business/model/store.go @@ -33,6 +33,7 @@ const ( BrandOpenMTPS = 1 //品牌开关标志, 美团配送 BrandOpenDaDa = 2 //达达 BrandOpenFN = 4 //蜂鸟 + BrandOpenDYPS = 5 //抖音配送 BrandOpenSMS = 8 //短信 BrandOpenVoice = 16 //语音 @@ -297,6 +298,7 @@ var ( VendorIDMTPS: BrandOpenMTPS, VendorIDDada: BrandOpenDaDa, VendorIDFengNiao: BrandOpenFN, + VendorIDDYPS: BrandOpenDYPS, } ) From 670a3750fe266f40443d133a106393ef82fe0d67 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 26 Dec 2022 17:30:45 +0800 Subject: [PATCH 3/5] 1 --- business/partner/delivery/tiktok_store/waybill.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/delivery/tiktok_store/waybill.go b/business/partner/delivery/tiktok_store/waybill.go index 1919d6e86..b8ec58534 100644 --- a/business/partner/delivery/tiktok_store/waybill.go +++ b/business/partner/delivery/tiktok_store/waybill.go @@ -88,7 +88,7 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee return nil, errors.New("获取抖音平台账号信息失败，请重试") } apiObj := getAPI(relInfo.VendorOrgCode) - if order.VendorID != model.VendorIDDYPS { + if order.VendorID != model.VendorIDDD { return nil, errors.New("非抖音平台店铺不可发抖音配送") } bill = &model.Waybill{ From ac2d8cc0c484caeed1ae68788d7274c4305ec20c Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 26 Dec 2022 17:45:08 +0800 Subject: [PATCH 4/5] 1 --- business/jxcallback/scheduler/basesch/basesch.go | 1 + business/jxcallback/scheduler/defsch/defsch.go | 1 + business/jxcallback/scheduler/defsch/defsch_ext.go | 1 + 3 files changed, 3 insertions(+) diff --git a/business/jxcallback/scheduler/basesch/basesch.go b/business/jxcallback/scheduler/basesch/basesch.go index 863c9a35c..c1e186c43 100644 --- a/business/jxcallback/scheduler/basesch/basesch.go +++ b/business/jxcallback/scheduler/basesch/basesch.go @@ -248,6 +248,7 @@ func (c *BaseScheduler) CancelWaybill(bill *model.Waybill, cancelReasonID int, c return err } order, _ := partner.CurOrderManager.LoadOrder(bill.VendorOrderID, bill.OrderVendorID) + globals.SugarLogger.Debugf("BaseScheduler CancelWaybill order=========%s", utils.Format4Output(order, false)) return orderman.ResetCreateWaybillFee(nil, order) }, "CancelWaybill bill:%v", bill); err == nil { bill.Status = model.WaybillStatusCanceled diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index ea05bd33d..60b726a65 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -1010,6 +1010,7 @@ func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2 !model.IsWaybillPlatformOwn(v) && (bill2Keep == nil || !(v.WaybillVendorID == bill2Keep.WaybillVendorID && v.VendorWaybillID == bill2Keep.VendorWaybillID)) { err2 := s.CancelWaybill(v, cancelReasonID, cancelReason) + globals.SugarLogger.Debugf("DefScheduler cancelOtherWaybills err2=======%v", err2) if err2 == nil { // 在这里就从map里删除，而不是等收到运单结束事件才删除，可避免不必要的重复取消（第二次取消还会失败） s.removeWaybillFromMap(savedOrderInfo, v.WaybillVendorID) diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go index 6821ac868..5122d048c 100644 --- a/business/jxcallback/scheduler/defsch/defsch_ext.go +++ b/business/jxcallback/scheduler/defsch/defsch_ext.go @@ -417,6 +417,7 @@ func (s *DefScheduler) CancelAll3rdWaybills(ctx *jxcontext.Context, vendorOrderI err = func() (err error) { // 取消三方运单,取消各平台单号信息,间隔一段时间后定时任务重新调度 savedOrderInfo := s.loadSavedOrderByID(vendorOrderID, vendorID, true) + globals.SugarLogger.Debugf("savedOrderInfo========%s", utils.Format4Output(savedOrderInfo, false)) if savedOrderInfo != nil { err = s.cancelOtherWaybills(savedOrderInfo, nil, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive) } else { From 80ffd895f85cab2813c35c414429bd1c98be3353 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 26 Dec 2022 17:58:28 +0800 Subject: [PATCH 5/5] 1 --- business/jxcallback/scheduler/defsch/defsch_ext.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go index 5122d048c..ef80f5779 100644 --- a/business/jxcallback/scheduler/defsch/defsch_ext.go +++ b/business/jxcallback/scheduler/defsch/defsch_ext.go @@ -423,6 +423,7 @@ func (s *DefScheduler) CancelAll3rdWaybills(ctx *jxcontext.Context, vendorOrderI } else { err = scheduler.ErrCanNotFindOrder } + globals.SugarLogger.Debugf("err===========%v", err) // 停止调度,同事停止订单调度,不在通知第三方 if err == nil && isStopSchedule { order := savedOrderInfo.order