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

- RefreshWeixinToken and RefreshElmToken firs time run must completed before main workflow going.

Browse Source
This commit is contained in:
gazebo
2018-07-21 13:30:43 +08:00
parent 1958f24705
commit 260453be69
3 changed files with 69 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -219,7 +219,7 @@ func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill
globals.SugarLogger.Debugf("cancelOtherWaybills, order:%v, bill:%v", savedOrderInfo.order, bill)
for _, v := range savedOrderInfo.waybills {
if bill == nil || (v.WaybillVendorID != bill.OrderVendorID && !(v.WaybillVendorID == bill.WaybillVendorID && v.VendorWaybillID == bill.VendorWaybillID)) {
globals.SugarLogger.Debugf("cancelOtherWaybills, cancel bill:%v", bill)
globals.SugarLogger.Debugf("cancelOtherWaybills, cancel bill:%v", v)
_ = s.GetDeliveryPlatformFromVendorID(v.WaybillVendorID).CancelWaybill(v)
}
}