Merge branch 'tianshuang' of Fengwo/hotline into master

src/Hotline.Api/Controllers/OrderController.cs

@@ -3406,18 +3406,20 @@ public class OrderController : BaseController
 				NextHandlers = dto.NextHandlers,
 				Opinion = dto.Cause
 			};
-			var expiredTime = _timeLimitDomainService.CalcEndTime(DateTime.Now,
-				ETimeType.WorkDay,
-				dto.TimeLimit.Value, order.AcceptTypeCode);
+            DateTime endTime = order.ExpiredTime!.Value;
 			// 计算期满时间
 			if (dto.AlterTime)
             {
+	            var expiredTime = _timeLimitDomainService.CalcEndTime(DateTime.Now,
+		            ETimeType.WorkDay,
+		            dto.TimeLimit.Value, order.AcceptTypeCode);
+                endTime = expiredTime.EndTime;
 				await _orderRepository.Updateable().SetColumns(o => new Order() { ExpiredTime = expiredTime.EndTime, NearlyExpiredTime = expiredTime.NearlyExpiredTime })
                     .Where(o => o.Id == order.Id).ExecuteCommandAsync(HttpContext.RequestAborted);
 				var orderDto = _mapper.Map<OrderDto>(order);
 	            await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderExpiredTimeUpdate, orderDto,cancellationToken: HttpContext.RequestAborted);
             }
-            await _workflowApplication.RecallAsync(recall, expiredTime.EndTime, HttpContext.RequestAborted);
+            await _workflowApplication.RecallAsync(recall, endTime, HttpContext.RequestAborted);
 			var publish = await _orderPublishRepository.GetAsync(x => x.OrderId == dto.OrderId);
 			if (publish != null)
 			{