|
@@ -4741,7 +4741,15 @@ public class OrderController : BaseController
|
|
//if (dto.AlterTime)
|
|
//if (dto.AlterTime)
|
|
//{
|
|
//{
|
|
//var expiredTime = _timeLimitDomainService.CalcEndTime(DateTime.Now, order.AcceptTypeCode);
|
|
//var expiredTime = _timeLimitDomainService.CalcEndTime(DateTime.Now, order.AcceptTypeCode);
|
|
- var expiredTime = await _expireTime.CalcEndTime(DateTime.Now, order.AcceptTypeCode);
|
|
|
|
|
|
+ ExpiredTimeWithConfig? expiredTime = null;
|
|
|
|
+ if (_appOptions.Value.IsZiGong)
|
|
|
|
+ {
|
|
|
|
+ if (special.FlowDirection != null)
|
|
|
|
+ expiredTime = await _expireTime.CalcExpiredTime(DateTime.Now, special.FlowDirection.Value, order.Adapt<OrderTimeClacInfo>());
|
|
|
|
+ }
|
|
|
|
+ else {
|
|
|
|
+ expiredTime = await _expireTime.CalcEndTime(DateTime.Now, order.AcceptTypeCode);
|
|
|
|
+ }
|
|
//var processType = dto.FlowDirection == EFlowDirection.OrgToCenter || dto.FlowDirection == EFlowDirection.CenterToCenter ? EProcessType.Zhiban : EProcessType.Jiaoban;
|
|
//var processType = dto.FlowDirection == EFlowDirection.OrgToCenter || dto.FlowDirection == EFlowDirection.CenterToCenter ? EProcessType.Zhiban : EProcessType.Jiaoban;
|
|
var processType = special.FlowDirection is EFlowDirection.OrgToCenter or EFlowDirection.CenterToCenter or EFlowDirection.FiledToCenter
|
|
var processType = special.FlowDirection is EFlowDirection.OrgToCenter or EFlowDirection.CenterToCenter or EFlowDirection.FiledToCenter
|
|
? EProcessType.Zhiban
|
|
? EProcessType.Zhiban
|