|
@@ -4275,7 +4275,7 @@ public class OrderController : BaseController
|
|
ETimeType.WorkDay,
|
|
ETimeType.WorkDay,
|
|
dto.TimeLimit.Value, order.AcceptTypeCode);
|
|
dto.TimeLimit.Value, order.AcceptTypeCode);
|
|
endTime = expiredTime.EndTime;
|
|
endTime = expiredTime.EndTime;
|
|
- await _orderRepository.Updateable().SetColumns(o => new Orders.Order() { ExpiredTime = expiredTime.EndTime, NearlyExpiredTime = expiredTime.NearlyExpiredTime, NearlyExpiredTimeOne = expiredTime.NearlyExpiredTimeOne })
|
|
|
|
|
|
+ await _orderRepository.Updateable().SetColumns(o => new Orders.Order() { ExpiredTime = expiredTime.EndTime, NearlyExpiredTime = expiredTime.NearlyExpiredTime, NearlyExpiredTimeOne = expiredTime.NearlyExpiredTimeOne,Status = EOrderStatus.SendBack })
|
|
.Where(o => o.Id == order.Id).ExecuteCommandAsync(HttpContext.RequestAborted);
|
|
.Where(o => o.Id == order.Id).ExecuteCommandAsync(HttpContext.RequestAborted);
|
|
var orderDto = _mapper.Map<OrderDto>(order);
|
|
var orderDto = _mapper.Map<OrderDto>(order);
|
|
await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderExpiredTimeUpdate, orderDto,
|
|
await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderExpiredTimeUpdate, orderDto,
|
|
@@ -6173,7 +6173,7 @@ public class OrderController : BaseController
|
|
if (string.IsNullOrEmpty(dto.StepId))
|
|
if (string.IsNullOrEmpty(dto.StepId))
|
|
{
|
|
{
|
|
await _orderRepository.Updateable()
|
|
await _orderRepository.Updateable()
|
|
- .SetColumns(o => new Orders.Order() { SignerId = dto.Handler.UserId, SignerName = dto.Handler.Username })
|
|
|
|
|
|
+ .SetColumns(o => new Orders.Order() { SignerId = dto.Handler.UserId, SignerName = dto.Handler.Username,Status = EOrderStatus.HandOver })
|
|
.Where(o => o.Id == dto.OrderId).ExecuteCommandAsync(HttpContext.RequestAborted);
|
|
.Where(o => o.Id == dto.OrderId).ExecuteCommandAsync(HttpContext.RequestAborted);
|
|
}
|
|
}
|
|
else
|
|
else
|
|
@@ -6187,7 +6187,10 @@ public class OrderController : BaseController
|
|
{
|
|
{
|
|
new(dto.Handler.UserId,dto.Handler.Username,dto.Handler.OrgId,dto.Handler.OrgName,step.RoleId,step.RoleName, new List<WorkflowStep>{step})
|
|
new(dto.Handler.UserId,dto.Handler.Username,dto.Handler.OrgId,dto.Handler.OrgName,step.RoleId,step.RoleName, new List<WorkflowStep>{step})
|
|
}, HttpContext.RequestAborted);
|
|
}, HttpContext.RequestAborted);
|
|
- }
|
|
|
|
|
|
+ await _orderRepository.Updateable()
|
|
|
|
+ .SetColumns(o => new Orders.Order() { Status = EOrderStatus.HandOver })
|
|
|
|
+ .Where(o => o.Id == dto.OrderId).ExecuteCommandAsync(HttpContext.RequestAborted);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
#endregion
|
|
#endregion
|