|
@@ -4745,7 +4745,13 @@ public class OrderController : BaseController
|
|
if (_appOptions.Value.IsZiGong)
|
|
if (_appOptions.Value.IsZiGong)
|
|
{
|
|
{
|
|
if (special.FlowDirection != null)
|
|
if (special.FlowDirection != null)
|
|
|
|
+ {
|
|
expiredTime = await _expireTime.CalcExpiredTime(DateTime.Now, special.FlowDirection.Value, order.Adapt<OrderTimeClacInfo>());
|
|
expiredTime = await _expireTime.CalcExpiredTime(DateTime.Now, special.FlowDirection.Value, order.Adapt<OrderTimeClacInfo>());
|
|
|
|
+ }
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ expiredTime = await _expireTime.CalcEndTime(DateTime.Now, order.AcceptTypeCode);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
expiredTime = await _expireTime.CalcEndTime(DateTime.Now, order.AcceptTypeCode);
|
|
expiredTime = await _expireTime.CalcEndTime(DateTime.Now, order.AcceptTypeCode);
|