Merge branch 'master' of http://git.12345lm.cn/Fengwo/hotline

src/Hotline.Api/Controllers/OrderController.cs

@@ -3405,18 +3405,18 @@ public class OrderController : BaseController
 				NextHandlers = dto.NextHandlers,
 				Opinion = dto.Cause
 			};
-            // 计算期满时间
-            if (dto.AlterTime)
+			var expiredTime = _timeLimitDomainService.CalcEndTime(DateTime.Now,
+				ETimeType.WorkDay,
+				dto.TimeLimit.Value, order.AcceptTypeCode);
+			// 计算期满时间
+			if (dto.AlterTime)
             {
-	            var expiredTime = _timeLimitDomainService.CalcEndTime(DateTime.Now,
-		             ETimeType.WorkDay,
-					 dto.TimeLimit.Value, order.AcceptTypeCode);
 				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, order.ExpiredTime, HttpContext.RequestAborted);
+            await _workflowApplication.RecallAsync(recall, expiredTime.EndTime, HttpContext.RequestAborted);
 			var publish = await _orderPublishRepository.GetAsync(x => x.OrderId == dto.OrderId);
 			if (publish != null)
 			{