This commit is contained in:
邹宗楠
2023-12-27 10:35:04 +08:00
parent e8c5c14981
commit fd9c9983e8
2 changed files with 5 additions and 2 deletions

View File

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