Browse Source

orderinfo

Dun.Jason 1 year ago
parent
commit
d3ef1e04dc

+ 1 - 0
src/Hotline.Api/Controllers/OrderController.cs

@@ -2199,6 +2199,7 @@ public class OrderController : BaseController
         dto.CountersignId = countersignId;
         dto.CanHandle = order.CanHandle(_sessionContext.RequiredUserId, _sessionContext.RequiredOrgId);
         dto.IsCanDelay = !order.OrderDelays.Any(x => x.DelayState == EDelayState.Examining);
+        dto.IsCanCancelDelay = order.OrderDelays.Any(x => x.DelayState == EDelayState.Examining && x.ApplyOrgCode == _sessionContext.RequiredOrgId);
         var delayModel = order.OrderDelays.Where(x => x.DelayState == EDelayState.Pass).MaxBy(x => x.CreationTime);
         dto.DelayString = delayModel != null ? delayModel?.DelayNum + "个" + delayModel?.DelayUnit.GetDescription() : "";
         dto.CanPrevious = canPrevious;

+ 5 - 0
src/Hotline.Share/Dtos/Order/OrderDto.cs

@@ -330,6 +330,11 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public bool IsCanDelay { get; set; }
 
+        /// <summary>
+        /// 是否可以取消延期
+        /// </summary>
+        public bool IsCanCancelDelay { get; set; }
+
         /// <summary>
         /// 最后一次延期天数
         /// </summary>