统一发货口径并保护结果数据

This commit is contained in:
yml2213
2026-07-31 17:45:20 +08:00
parent 4ae9ef53ff
commit 4aa5258c2d
17 changed files with 120 additions and 73 deletions
@@ -86,11 +86,11 @@ func validateOrderStatusTransition(order *model.FulfillmentOrder, next string, k
if next == model.OrderStatusPaid || next == model.OrderStatusCancelled {
return nil
}
return errors.New("订单未支付,不能履约")
return errors.New("订单未支付,不能发货")
case model.OrderStatusCancelled:
return errors.New("订单已取消,不能更新状态")
case model.OrderStatusDelivered:
return errors.New("订单已履约成功,不能回退状态")
return errors.New("订单已交付,不能回退状态")
}
switch next {
case model.OrderStatusDelivering:
@@ -105,7 +105,7 @@ func validateOrderStatusTransition(order *model.FulfillmentOrder, next string, k
}
case model.OrderStatusShipFailed:
if kind == fulfillmentTransitionTimeout && current != model.OrderStatusDelivering {
return errors.New("只有履约中的订单可以标记超时")
return errors.New("只有发货中的订单可以标记超时")
}
if current == model.OrderStatusPaid ||
current == model.OrderStatusShipFailed ||
@@ -134,7 +134,7 @@ func canCancelOrder(order *model.FulfillmentOrder) error {
case model.OrderStatusPending:
return errors.New("订单未支付,不能取消")
case model.OrderStatusDelivering, model.OrderStatusDelivered:
return errors.New("订单已进入履约流程,不能取消")
return errors.New("订单已进入发货流程,不能取消")
default:
return errors.New("订单当前状态不能取消")
}