- add more debug info.
This commit is contained in:
@@ -66,6 +66,7 @@ func init() {
|
|||||||
|
|
||||||
// 以下是订单
|
// 以下是订单
|
||||||
func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder) (err error) {
|
func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder) (err error) {
|
||||||
|
globals.SugarLogger.Debugf("OnOrderNew, order:%v", order)
|
||||||
watchInfo := &WatchOrderInfo{
|
watchInfo := &WatchOrderInfo{
|
||||||
order: order,
|
order: order,
|
||||||
}
|
}
|
||||||
@@ -169,6 +170,7 @@ func (s *DefScheduler) addWaybill2Map(savedOrderInfo *WatchOrderInfo, bill *mode
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *DefScheduler) createWaybillOn3rdProviders(order *model.GoodsOrder, excludeBill *model.Waybill) (err error) {
|
func (s *DefScheduler) createWaybillOn3rdProviders(order *model.GoodsOrder, excludeBill *model.Waybill) (err error) {
|
||||||
|
globals.SugarLogger.Debugf("createWaybillOn3rdProviders, order:%v", order)
|
||||||
successCount := 0
|
successCount := 0
|
||||||
for k, v := range s.DeliveryPlatformHandlers {
|
for k, v := range s.DeliveryPlatformHandlers {
|
||||||
if excludeBill == nil || k != excludeBill.WaybillVendorID {
|
if excludeBill == nil || k != excludeBill.WaybillVendorID {
|
||||||
@@ -184,6 +186,7 @@ func (s *DefScheduler) createWaybillOn3rdProviders(order *model.GoodsOrder, excl
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill *model.Waybill) (err error) {
|
func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill *model.Waybill) (err error) {
|
||||||
|
globals.SugarLogger.Debugf("cancelOtherWaybills, order:%v, bill:%v", savedOrderInfo.order, bill)
|
||||||
for _, v := range savedOrderInfo.waybills {
|
for _, v := range savedOrderInfo.waybills {
|
||||||
if v.WaybillVendorID != bill.OrderVendorID && !(v.WaybillVendorID == bill.WaybillVendorID && v.VendorWaybillID == bill.VendorWaybillID) {
|
if v.WaybillVendorID != bill.OrderVendorID && !(v.WaybillVendorID == bill.WaybillVendorID && v.VendorWaybillID == bill.VendorWaybillID) {
|
||||||
_ = s.GetDeliveryPlatformFromVendorID(v.WaybillVendorID).CancelWaybill(v)
|
_ = s.GetDeliveryPlatformFromVendorID(v.WaybillVendorID).CancelWaybill(v)
|
||||||
@@ -248,14 +251,14 @@ func (s *DefScheduler) getLatestPickupTimeout(order *model.GoodsOrder, configTim
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *DefScheduler) stopTimer(savedOrderInfo *WatchOrderInfo) {
|
func (s *DefScheduler) stopTimer(savedOrderInfo *WatchOrderInfo) {
|
||||||
globals.SugarLogger.Debugf("stopTimer orderid:%v", savedOrderInfo.order.VendorOrderID)
|
|
||||||
if savedOrderInfo.timer != nil {
|
if savedOrderInfo.timer != nil {
|
||||||
|
globals.SugarLogger.Debugf("stopTimer orderid:%v", savedOrderInfo.order.VendorOrderID)
|
||||||
savedOrderInfo.timer.Stop()
|
savedOrderInfo.timer.Stop()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *DefScheduler) resetTimer(status int, savedOrderInfo *WatchOrderInfo, gap time.Duration) {
|
func (s *DefScheduler) resetTimer(status int, savedOrderInfo *WatchOrderInfo, gap time.Duration) {
|
||||||
globals.SugarLogger.Debugf("resetTimer status:%v", status)
|
globals.SugarLogger.Debugf("resetTimer status:%v, orderid:%v", status, savedOrderInfo.order.VendorOrderID)
|
||||||
s.stopTimer(savedOrderInfo)
|
s.stopTimer(savedOrderInfo)
|
||||||
config := s.mergeOrderStatusConfig(status, s.GetPurchasePlatformFromVendorID(savedOrderInfo.order.VendorID).GetStatusActionConfig(status))
|
config := s.mergeOrderStatusConfig(status, s.GetPurchasePlatformFromVendorID(savedOrderInfo.order.VendorID).GetStatusActionConfig(status))
|
||||||
if config != nil && config.TimeoutAction != nil {
|
if config != nil && config.TimeoutAction != nil {
|
||||||
@@ -265,6 +268,7 @@ func (s *DefScheduler) resetTimer(status int, savedOrderInfo *WatchOrderInfo, ga
|
|||||||
} else {
|
} else {
|
||||||
timeout = jxutils.GetRealTimeout(savedOrderInfo.order.StatusTime, config.Timeout)
|
timeout = jxutils.GetRealTimeout(savedOrderInfo.order.StatusTime, config.Timeout)
|
||||||
}
|
}
|
||||||
|
globals.SugarLogger.Debugf("resetTimer timeout:%v, orderid:%v", timeout, savedOrderInfo.order.VendorOrderID)
|
||||||
savedOrderInfo.timer = time.AfterFunc(timeout+gap, func() {
|
savedOrderInfo.timer = time.AfterFunc(timeout+gap, func() {
|
||||||
config.TimeoutAction(savedOrderInfo.order)
|
config.TimeoutAction(savedOrderInfo.order)
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user