dachui/hfb_sys
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(order): 修复超时与异常过渡态下的状态机流转及权限断层

Browse Source
This commit is contained in:
yml2213
2026-09-09 16:15:21 +08:00
parent 17d4f7be9e
commit 8b7a0c8059
9 changed files with 267 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/internal/modules/order/checkout.go
+18 -4
View File
@@ -112,7 +112,15 @@ func (r *Repository) ConfirmCheckout(ctx context.Context, userID uint64, orderID
if order.OwnerID != userID {
return ErrPermissionDenied
}
if order.Status != orderStatusPendingCheckoutConfirm || order.HandoffStatus != handoffStatusPendingOwnerCheckout {
isOwnerPending := order.Status == orderStatusPendingCheckoutConfirm ||
(order.Status == orderStatusAbnormal &&
(order.HandoffStatus == handoffStatusOwnerCheckoutConfirmTimeout ||
order.HandoffStatus == handoffStatusOwnerReturnConfirmTimeout ||
order.HandoffStatus == handoffStatusPendingOwnerCheckout))
if !isOwnerPending ||
(order.HandoffStatus != handoffStatusPendingOwnerCheckout &&
order.HandoffStatus != handoffStatusOwnerCheckoutConfirmTimeout &&
order.HandoffStatus != handoffStatusOwnerReturnConfirmTimeout) {
return ErrCheckoutCannotConfirm
}
before := orderState(order)
@@ -162,7 +170,13 @@ func (r *Repository) CounterCheckout(ctx context.Context, userID uint64, orderID
if !isOwner && !isRenter {
return ErrPermissionDenied
}
if order.Status != orderStatusPendingCheckoutConfirm && order.Status != orderStatusPendingCheckoutAccept {
isOwnerPending := order.Status == orderStatusPendingCheckoutConfirm ||
(order.Status == orderStatusAbnormal &&
(order.HandoffStatus == handoffStatusOwnerCheckoutConfirmTimeout ||
order.HandoffStatus == handoffStatusOwnerReturnConfirmTimeout ||
order.HandoffStatus == handoffStatusPendingOwnerCheckout))
isRenterPending := order.Status == orderStatusPendingCheckoutAccept
if !isOwnerPending && !isRenterPending {
return ErrCheckoutCannotCounter
}
before := orderState(order)
@@ -171,10 +185,10 @@ func (r *Repository) CounterCheckout(ctx context.Context, userID uint64, orderID
return err
}
turn := normalizeCheckoutTurn(checkout)
if isOwner && (turn != checkoutTurnOwner || order.Status != orderStatusPendingCheckoutConfirm) {
if isOwner && (turn != checkoutTurnOwner || !isOwnerPending) {
return ErrCheckoutCannotCounter
}
if isRenter && (turn != checkoutTurnRenter || order.Status != orderStatusPendingCheckoutAccept) {
if isRenter && (turn != checkoutTurnRenter || !isRenterPending) {
return ErrCheckoutCannotCounter
}
round := checkout.RoundCount