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

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
@@ -15,20 +15,22 @@ import (
func canAdminForceHandoff(order model.RentalOrder) bool {
if isPlatformHandoffOrder(order) {
if order.Status == orderStatusPendingHandoff {
return order.HandoffStatus == handoffStatusPendingRenterConfirm
if order.Status == orderStatusPendingHandoff || order.Status == orderStatusAbnormal {
return order.HandoffStatus == handoffStatusPendingRenterConfirm ||
order.HandoffStatus == handoffStatusRenterConfirmTimeout
}
return order.Status == orderStatusAbnormal && order.HandoffStatus == handoffStatusRenterConfirmTimeout
return false
}
if isPlatformSettlementOrder(order) {
return false
}
if order.Status == orderStatusPendingHandoff {
if order.Status == orderStatusPendingHandoff || order.Status == orderStatusAbnormal {
return order.HandoffStatus == handoffStatusPendingOwner ||
order.HandoffStatus == handoffStatusOwnerTimeout ||
order.HandoffStatus == handoffStatusPendingRenterConfirm
order.HandoffStatus == handoffStatusPendingRenterConfirm ||
order.HandoffStatus == handoffStatusRenterConfirmTimeout
}
return order.Status == orderStatusAbnormal && order.HandoffStatus == handoffStatusRenterConfirmTimeout
return false
}
func forceHandoffRecordType(order model.RentalOrder) string {