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

src/Hotline.Api/Controllers/OrderController.cs

@@ -2899,31 +2899,35 @@ public class OrderController : BaseController
 	public async Task OrderDelayAutomatic() {
 
         await _orderApplication.OrderDelayAutomatic();
-	}
 
-	/// <summary>
-	/// 延期短信执行
-	/// </summary>
-	/// <param name="type"></param>
-	/// <returns></returns>
-	[HttpPost("delay/automatic/handle/sms")]
-	[AllowAnonymous]
-	public async Task OrderDelayAutomaticHandleSms()
-	{
-		await _orderApplication.OrderDelayAutomaticHandle(EOrderDelayAutomaticType.Sms);
-	}
-	/// <summary>
-	/// 自动延期执行
-	/// </summary>
-	/// <param name="type"></param>
-	/// <returns></returns>
-	[HttpPost("delay/automatic/handle")]
-	[AllowAnonymous]
-	public async Task OrderDelayAutomaticHandleAutomatic()
-	{
 		await _orderApplication.OrderDelayAutomaticHandle(EOrderDelayAutomaticType.Automatic);
+
+		await _orderApplication.OrderDelayAutomaticHandle(EOrderDelayAutomaticType.Sms);
 	}
 
+	///// <summary>
+	///// 延期短信执行
+	///// </summary>
+	///// <param name="type"></param>
+	///// <returns></returns>
+	//[HttpPost("delay/automatic/handle/sms")]
+	//[AllowAnonymous]
+	//public async Task OrderDelayAutomaticHandleSms()
+	//{
+	//	await _orderApplication.OrderDelayAutomaticHandle(EOrderDelayAutomaticType.Sms);
+	//}
+	///// <summary>
+	///// 自动延期执行
+	///// </summary>
+	///// <param name="type"></param>
+	///// <returns></returns>
+	//[HttpPost("delay/automatic/handle")]
+	//[AllowAnonymous]
+	//public async Task OrderDelayAutomaticHandleAutomatic()
+	//{
+	//	await _orderApplication.OrderDelayAutomaticHandle(EOrderDelayAutomaticType.Automatic);
+	//}
+
 
 	#endregion
 

src/Hotline.Api/Controllers/WebPortalController.cs

@@ -9,6 +9,7 @@ using Hotline.Orders;
 using Hotline.Push.Notifies;
 using Hotline.Repository.SqlSugar.Extensions;
 using Hotline.Repository.SqlSugar.Knowledge;
+using Hotline.SeedData;
 using Hotline.Settings;
 using Hotline.Settings.Hotspots;
 using Hotline.Share.Dtos;
@@ -1989,6 +1990,12 @@ namespace Hotline.Api.Controllers
                     orderDetail.FirstVisitResult = data.FirstVisitResult;
                 }
 
+                // 工单流转到部门才允许显示办理内容
+                if (data.ActualHandleOrgCode == OrgSeedData.CenterId)
+                {
+                    orderDetail.FlowContent = "信件正在办理中...";
+                }
+
                 //能否进行评价
                 var orderVisit = await _orderVisitRepository.GetAsync(p => p.OrderId == data.Id && p.VisitState != EVisitState.None, HttpContext.RequestAborted);
                 if (orderVisit == null)
@@ -2003,6 +2010,9 @@ namespace Hotline.Api.Controllers
                         _ => "0",
                     };
                 }
+
+
+
             }
             //List<OrderDetail> dataDto = new() { orderDetail };
             //return OpenResponse.Ok(WebPortalDeResponse<IReadOnlyList<OrderDetail>>.Success(dataDto));

src/Hotline.Application/OrderApp/OrderApplication.cs

@@ -6957,7 +6957,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
 			data.AddRange(automatic);
 		}
 		var automaticSMS = await _orderRepository.Queryable()
-			.Where(x => x.Status < EOrderStatus.Filed && x.ExpiredTime <= DateTime.Now.AddHours(2) && x.ExpiredTime >= DateTime.Now.AddHours(1) && x.ExpiredTime >= DateTime.Now)
+			.Where(x => x.Status < EOrderStatus.Filed && x.ExpiredTime <= DateTime.Now.AddHours(2) && x.ExpiredTime > DateTime.Now.AddHours(1) && x.ExpiredTime >= DateTime.Now)
 			.Where(x => SqlFunc.Subqueryable<OrderDelay>().Where(od => od.OrderId == x.Id && od.DelayState == EDelayState.Examining).NotAny())
 			.Where(x => SqlFunc.Subqueryable<OrderDelayAutomatic>().Where(oda => oda.OrderId == x.Id && oda.Status == EOrderDelayAutomaticStatus.Pending && oda.Type == EOrderDelayAutomaticType.Sms).NotAny())
 			.Select(x => new OrderDelayAutomatic