diff --git a/business/jxcallback/scheduler/basesch/basesch.go b/business/jxcallback/scheduler/basesch/basesch.go index b15dc2e54..0ff86f162 100644 --- a/business/jxcallback/scheduler/basesch/basesch.go +++ b/business/jxcallback/scheduler/basesch/basesch.go @@ -186,8 +186,7 @@ func (c *BaseScheduler) SelfDeliverDelivering(order *model.GoodsOrder, userName } func (c *BaseScheduler) SelfDeliverDelivered(order *model.GoodsOrder, userName string) (err error) { - if /*order.LockStatus == model.OrderStatusUnknown && */ order.Status >= model.OrderStatusFinishedPickup && - order.Status <= model.OrderStatusDelivering { + if order.Status >= model.OrderStatusFinishedPickup && order.Status <= model.OrderStatusDelivering { if c.IsReallyCallPlatformAPI { err = utils.CallFuncLogError(func() error { if err = partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID).SelfDeliverDelivered(order, userName); err == nil { @@ -196,6 +195,7 @@ func (c *BaseScheduler) SelfDeliverDelivered(order *model.GoodsOrder, userName s c.CancelWaybill(bill, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive) } } + globals.SugarLogger.Debugf("===err0 := %v", err) return err }, "SelfDeliverDelivered orderID:%s", order.VendorOrderID) } diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go index 3d84b9d82..962c4846a 100644 --- a/business/jxcallback/scheduler/basesch/basesch_ext.go +++ b/business/jxcallback/scheduler/basesch/basesch_ext.go @@ -86,6 +86,7 @@ func (c *BaseScheduler) SelfDeliveredAndUpdateStatus(ctx *jxcontext.Context, ven if err == nil { if model.IsOrderDeliveryByStore(order) { err = c.SelfDeliverDelivered(order, userName) + globals.SugarLogger.Debugf("===err := %v", err) } else if model.IsOrderDeliveryByPlatform(order) { err = c.Swtich2SelfDelivered(order, userName) } @@ -98,9 +99,11 @@ func (c *BaseScheduler) SelfDeliveredAndUpdateStatus(ctx *jxcontext.Context, ven dao.UpdateEntity(dao.GetDB(), order, "Status", "OrderFinishedAt") } } + globals.SugarLogger.Debugf("===err2 := %v", err) return err }() }, jxutils.ComposeUniversalOrderID(vendorOrderID, vendorID)) + globals.SugarLogger.Debugf("===err3 := %v", err) return err }