Dun.Jason vor 4 Monaten
Ursprung
Commit
48a802b596

+ 10 - 2
src/Hotline.Application/Orders/OrderApplication.cs

@@ -1,4 +1,5 @@
-using DotNetCore.CAP;
+using DocumentFormat.OpenXml.Drawing;
+using DotNetCore.CAP;
 using Hotline.Application.Quality;
 using Hotline.Authentications;
 using Hotline.Caching.Interfaces;
@@ -1028,7 +1029,14 @@ public class OrderApplication : IOrderApplication, IScopeDependency
         }
         else if (dto.Workflow.FlowDirection is EFlowDirection.CenterToOrg)
         {
-            expiredTimeConfig = await _expireTime.CalcExpiredTime(DateTime.Now, DateTime.Now, EFlowDirection.CenterToOrg, order.Adapt<OrderTimeClacInfo>());
+            if (_appOptions.Value.IsLuZhou)
+            {
+                await _expireTime.CalcEndTime(DateTime.Now, DateTime.Now, new TimeConfig() { Count = dto.Data.TimeLimit, TimeType = dto.Data.TimeLimitUnit.Value }, order.AcceptTypeCode);
+            }
+            else
+            {
+                expiredTimeConfig = await _expireTime.CalcExpiredTime(DateTime.Now, DateTime.Now, EFlowDirection.CenterToOrg, order.Adapt<OrderTimeClacInfo>());
+            }
             var canUpdateOrderSender = bool.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.CanUpdateOrderSender).SettingValue[0]);
             order.CenterToOrg(
                 expiredTimeConfig.TimeText, expiredTimeConfig.Count,

+ 9 - 0
src/Hotline.Share/Dtos/Order/OrderStartFlowDto.cs

@@ -1,6 +1,7 @@
 using System.ComponentModel;
 using Hotline.Share.Dtos.FlowEngine;
 using Hotline.Share.Enums.FlowEngine;
+using Hotline.Share.Enums.Settings;
 
 namespace Hotline.Share.Dtos.Order
 {
@@ -125,6 +126,14 @@ namespace Hotline.Share.Dtos.Order
         public string? TranspondCityValue { get; set; }
 
         #endregion
+
+        #region 延期信息
+
+        public int TimeLimit { get; set; }
+
+        public ETimeType? TimeLimitUnit { get; set; }
+
+        #endregion
     }
 
     public class CrossStep : BasicWorkflowDto