Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

src/Hotline.Api/Controllers/OrderController.cs

@@ -6400,7 +6400,9 @@ public class OrderController : BaseController
             if (dto.AlterTime)
             {
                 DateTime startTime = DateTime.Now;
-                if (order.CenterToOrgTime.HasValue && order.FileOrgIsCenter.HasValue &&  !order.FileOrgIsCenter.Value)
+                DateTime beginTime = DateTime.Now;
+
+				if (order.CenterToOrgTime.HasValue && order.FileOrgIsCenter.HasValue &&  !order.FileOrgIsCenter.Value)
                 {
                     startTime = order.CenterToOrgTime.Value;
                 }
@@ -6412,13 +6414,14 @@ public class OrderController : BaseController
                 if (_appOptions.Value.IsLuZhou)
                 {
                     startTime = order.ExpiredTime.Value;
+                    beginTime = startTime;
 				}
                 
-                var expiredTime = await _expireTime.CalcEndTime(DateTime.Now, startTime, order.AcceptTypeCode);
+                var expiredTime = await _expireTime.CalcEndTime(beginTime, startTime, order.AcceptTypeCode);
                 if (dto.TimeLimit.HasValue && dto.TimeLimit.Value > 0)
                 {
                     var config = new TimeConfig(dto.TimeLimit.Value, ETimeType.WorkDay);
-                    expiredTime = await _expireTime.CalcEndTime(DateTime.Now, startTime, config, order.AcceptTypeCode);
+                    expiredTime = await _expireTime.CalcEndTime(beginTime, startTime, config, order.AcceptTypeCode);
                 }
 
                 //if (expiredTime.EndTime < order.ExpiredTime.Value)