Merge branch 'release' of http://110.188.24.182:10023/Fengwo/hotline into release

src/Hotline.Api/Controllers/OrderController.cs

@@ -1746,7 +1746,12 @@ public class OrderController : BaseController
     [HttpPost("delay/calc-endtime")]
     public async Task<TimeResult?> DelayCalcEndTime([FromBody] DelayCalcEndTimeDto dto)
     {
-        return _timeLimitDomainService.CalcEndTime(dto.BeginTime, dto.DelayUnit, dto.DelayNum, 0, 0);
+        if (dto.BeginTime.HasValue)
+        {
+            return _timeLimitDomainService.CalcEndTime(dto.BeginTime.Value, dto.DelayUnit, dto.DelayNum, 0, 0);
+
+        }
+        return null;
     }
 
     /// <summary>

src/Hotline.Api/config/appsettings.Development.json

@@ -29,7 +29,7 @@
     }
   },
   "ConnectionStrings": {
-    "Hotline": "PORT=5432;DATABASE=hotline_dev;HOST=110.188.24.182;PASSWORD=fengwo11!!;USER ID=dev;"
+    "Hotline": "PORT=5432;DATABASE=hotline;HOST=110.188.24.182;PASSWORD=fengwo11!!;USER ID=dev;"
     //"Redis": "110.188.24.182:50179",
     //"MongoDB": "mongodb://192.168.100.121:27017",
     //"Wex": "server=222.212.82.225;Port=4509;Database=fs_kft;Uid=root;Pwd=Wex@12345;"
@@ -38,7 +38,7 @@
     "Host": "110.188.24.182",
     "Port": 50179,
     "Password": "fengwo123!$!$",
-    "Database": 5 //release:3, dev:5
+    "Database": 3 //release:3, dev:5
   },
   "Swagger": true,
   "Cors": {

src/Hotline.Application/Handlers/Order/OrderDelayWorkflowEndHandler.cs

@@ -1,34 +0,0 @@
-using Hotline.FlowEngine.Notifications;
-using MediatR;
-using Hotline.EventBus;
-using Microsoft.Extensions.Logging;
-
-namespace Hotline.Application.Handlers.Order
-{
-    [HandlerInject(AppScopes = EAppScope.LuZhou | EAppScope.YiBin)]
-    public class OrderDelayWorkflowEndHandler : INotificationHandler<EndWorkflowNotify>
-    {
-        private readonly ILogger<OrderDelayWorkflowEndHandler> _logger;
-
-        public OrderDelayWorkflowEndHandler(ILogger<OrderDelayWorkflowEndHandler> logger)
-        {
-            _logger = logger;
-        }
-
-        /// <summary>Handles a notification</summary>
-        /// <param name="notification">The notification</param>
-        /// <param name="cancellationToken">Cancellation token</param>
-        public async Task Handle(EndWorkflowNotify notification, CancellationToken cancellationToken)
-        {
-            try
-            {
-                throw new NotImplementedException();
-            }
-            catch (Exception e)
-            {
-                _logger.LogError(e.Message);
-                throw;
-            }
-        }
-    }
-}

src/Hotline.Share/Dtos/Order/QueryOrderDto.cs

@@ -419,7 +419,7 @@ namespace Hotline.Share.Dtos.Order
 
     public record DelayCalcEndTimeDto
     {
-        public DateTime BeginTime { get; set; }
+        public DateTime? BeginTime { get; set; }
 
         public int DelayNum { get; set; }