fix(order): 修复超时与异常过渡态下的状态机流转及权限断层
This commit is contained in:
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user