fixed: 自贡、泸州的12315的默认办理时间实现进行了调整

src/Hotline.Application/Orders/OrderApplication.cs

@@ -933,36 +933,6 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             {
                 throw UserFriendlyException.SameMessage("该工单不存在拓展信息,不能推送至全国12315平台!");
             }
-            var startTime = DateTime.Now;
-            if (order.CenterToOrgTime.HasValue)
-            {
-                startTime = order.CenterToOrgTime.Value;
-            }
-            var timeResult = await _expireTime.CalcEndTime(DateTime.Now, startTime, ETimeType.WorkDay, 45, 80, 50);
-            expiredTimeConfig = new ExpiredTimeWithConfig
-            {
-                Count = 45,
-                TimeType = ETimeType.WorkDay,
-                TimeText = "45个工作日",
-                ExpiredTime = timeResult.EndTime,
-                NearlyExpiredTime = timeResult.NearlyExpiredTime,
-                NearlyExpiredTimeOne = timeResult.NearlyExpiredTimeOne
-            };
-            var canUpdateOrderSender = bool.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.CanUpdateOrderSender).SettingValue[0]);
-            order.CenterToOrg(
-                expiredTimeConfig.TimeText, expiredTimeConfig.Count,
-                expiredTimeConfig.TimeType, expiredTimeConfig.ExpiredTime,
-                expiredTimeConfig.NearlyExpiredTime, expiredTimeConfig.NearlyExpiredTimeOne, dto.Workflow.Opinion,
-                _sessionContextProvider.SessionContext.RequiredUserId, _sessionContextProvider.SessionContext.UserName,
-                canUpdateOrderSender);
-            //TODO发送短信即将超期
-            //_capPublisher.PublishDelay(expiredTimeConfig.NearlyExpiredTime - DateTime.Now, EventNames.HotlineOrderNearlyExpiredTimeSms, new PublishNearlyExpiredTimeSmsDto() { OrderId = order.Id });
-            //自动延期订阅
-            _capPublisher.PublishDelay(expiredTimeConfig.ExpiredTime - DateTime.Now.AddHours(1), EventNames.HotlineOrderAutomaticDelay,
-                new PublishAutomaticDelayDto() { OrderId = order.Id });
-        }
-        else if (dto.Workflow.NextHandlers.Any(d => d.Key == cityBase?.Province12315?.OrgId) && !_appOptions.Value.IsYiBin)
-        {
             var startTime = order.CenterToOrgTime ?? DateTime.Now;
 
             TimeResult? timeResult;
@@ -992,6 +962,19 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                     NearlyExpiredTimeOne = timeResult.NearlyExpiredTimeOne
                 };
             }
+            else if (_appOptions.Value.IsYiBin)
+            {
+                timeResult = await _expireTime.CalcEndTime(DateTime.Now, startTime, ETimeType.WorkDay, 45, 80, 50);
+                expiredTimeConfig = new ExpiredTimeWithConfig
+                {
+                    Count = 45,
+                    TimeType = ETimeType.WorkDay,
+                    TimeText = "45个工作日",
+                    ExpiredTime = timeResult.EndTime,
+                    NearlyExpiredTime = timeResult.NearlyExpiredTime,
+                    NearlyExpiredTimeOne = timeResult.NearlyExpiredTimeOne
+                };
+            }
             else
             {
                 throw new UserFriendlyException("暂不支持该方案");
@@ -1004,6 +987,11 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                 expiredTimeConfig.NearlyExpiredTime, expiredTimeConfig.NearlyExpiredTimeOne, dto.Workflow.Opinion,
                 _sessionContextProvider.SessionContext.RequiredUserId, _sessionContextProvider.SessionContext.UserName,
                 canUpdateOrderSender);
+            //TODO发送短信即将超期
+            //_capPublisher.PublishDelay(expiredTimeConfig.NearlyExpiredTime - DateTime.Now, EventNames.HotlineOrderNearlyExpiredTimeSms, new PublishNearlyExpiredTimeSmsDto() { OrderId = order.Id });
+            //自动延期订阅
+            _capPublisher.PublishDelay(expiredTimeConfig.ExpiredTime - DateTime.Now.AddHours(1), EventNames.HotlineOrderAutomaticDelay,
+                new PublishAutomaticDelayDto() { OrderId = order.Id });
         }
         else if (dto.Workflow.FlowDirection is EFlowDirection.CenterToOrg)
         {