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

Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
邹宗楠
2022-12-26 18:37:20 +08:00
parent b331970338 80ffd895f8
commit a6aca5afe9
6 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/jxcallback/scheduler/basesch/basesch.go
View File

@@ -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

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

@@ -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)

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

@@ -417,11 +417,13 @@ 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 {
err = scheduler.ErrCanNotFindOrder
}
globals.SugarLogger.Debugf("err===========%v", err)
// 停止调度,同事停止订单调度,不在通知第三方
if err == nil && isStopSchedule {
order := savedOrderInfo.order

2
business/model/store.go
View File

@@ -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,
}
)

4
business/partner/delivery/tiktok_store/waybill.go
View File

@@ -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{
@@ -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)

12
business/partner/purchase/tiktok_store/store.go
View File

@@ -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,
},
},
},