Selaa lähdekoodia

修复自贡 中心到中心不重新计算期满时间

qinchaoyue 7 kuukautta sitten
vanhempi
commit
e693b816fd
1 muutettua tiedostoa jossa 14 lisäystä ja 8 poistoa
  1. 14 8
      src/Hotline.Api/Controllers/OrderController.cs

+ 14 - 8
src/Hotline.Api/Controllers/OrderController.cs

@@ -3322,16 +3322,22 @@ public class OrderController : BaseController
         }
         else if (dto.FlowDirection is EFlowDirection.CenterToCenter)
         {
-            // expiredTimeConfig = _timeLimitDomainService.CalcExpiredTime(DateTime.Now, EFlowDirection.CenterToCenter, order.AcceptTypeCode);
-            expiredTimeConfig = await _expireTime.CalcExpiredTime(DateTime.Now, EFlowDirection.CenterToCenter, order.Adapt<OrderTimeClacInfo>());
-            order.CenterToCenter(expiredTimeConfig.TimeText, expiredTimeConfig.Count,
-                expiredTimeConfig.TimeType, expiredTimeConfig.ExpiredTime, expiredTimeConfig.NearlyExpiredTime, expiredTimeConfig.NearlyExpiredTimeOne);
-            //TODO发送短信即将超期
-            //_capPublisher.PublishDelay(expiredTimeConfig.NearlyExpiredTime - DateTime.Now, EventNames.HotlineOrderNearlyExpiredTimeSms, new PublishNearlyExpiredTimeSmsDto() { OrderId = order.Id });
+            if (_appOptions.Value.IsZiGong == false)
+            {
+                // expiredTimeConfig = _timeLimitDomainService.CalcExpiredTime(DateTime.Now, EFlowDirection.CenterToCenter, order.AcceptTypeCode);
+                expiredTimeConfig = await _expireTime.CalcExpiredTime(DateTime.Now, EFlowDirection.CenterToCenter, order.Adapt<OrderTimeClacInfo>());
+                order.CenterToCenter(expiredTimeConfig.TimeText, expiredTimeConfig.Count,
+                    expiredTimeConfig.TimeType, expiredTimeConfig.ExpiredTime, expiredTimeConfig.NearlyExpiredTime, expiredTimeConfig.NearlyExpiredTimeOne);
+                //TODO发送短信即将超期
+                //_capPublisher.PublishDelay(expiredTimeConfig.NearlyExpiredTime - DateTime.Now, EventNames.HotlineOrderNearlyExpiredTimeSms, new PublishNearlyExpiredTimeSmsDto() { OrderId = order.Id });
+            }
         }
 
-        _mapper.Map(expiredTimeConfig, order);
-        await _orderRepository.UpdateAsync(order, HttpContext.RequestAborted);
+        if (expiredTimeConfig is not null)
+        {
+            _mapper.Map(expiredTimeConfig, order);
+            await _orderRepository.UpdateAsync(order, HttpContext.RequestAborted);
+        }
         //1.是否是判断节点  2.是否存在历史派单节点  3.存在获取上个派单节点  4.不存在走平均派单
         if (dto.BusinessType == EBusinessType.Send)
         {