src/Hotline.Api/Controllers/OrderController.cs

@@ -261,16 +261,4 @@ public class OrderController : BaseController
         return rsp;
     }
 
-    /// <summary>
-    /// 获取热点
-    /// </summary>
-    /// <param name="parentId">父级ID</param>
-    /// <returns></returns>
-    [HttpGet("hotspottype-list-parent")]
-    [Obsolete]
-    public async Task<List<HotSpotType>> GetHotSpotType(string? parentId)
-    {
-        return await _hotspotTypeRepository.Queryable().Where(x => x.ParentId == parentId).ToListAsync();
-    }
-
 }

src/Hotline.Repository.SqlSugar/Extensions/SqlSugarStartupExtensions.cs

@@ -3,6 +3,8 @@ using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Linq.Dynamic.Core;
 using System.Linq.Expressions;
+using Hotline.FlowEngine.Workflows;
+using Hotline.Orders;
 using Hotline.Users;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -114,8 +116,9 @@ namespace Hotline.Repository.SqlSugar.Extensions
             var dbOptions = configuration.GetSection("DatabaseConfiguration").Get<DatabaseOptions>() ?? new DatabaseOptions();
             if (dbOptions.ApplyDbMigrations)
             {
+                var nonTableTypes = new[] { typeof(OrderExtensionEntity), typeof(StepBasicEntity) };
                 var types = typeof(User).Assembly.GetTypes()
-                    .Where(d => d.GetInterfaces().Any(x => x == typeof(ITable)))
+                    .Where(d => d.GetInterfaces().Any(x => x == typeof(ITable) && !nonTableTypes.Contains(x)))
                     .Distinct()
                     .ToArray();
 

src/Hotline.Repository.SqlSugar/Orders/OrderRepository.cs

@@ -28,18 +28,18 @@ namespace Hotline.Repository.SqlSugar.Orders
             {
                 if (order.AcceptType == EAcceptType.Complain)
                 {
-                    if (order.OrderComplain == null)
-                        throw UserFriendlyException.SameMessage("非法投诉参数");
                     order.OrderComplain.InitDatePermission(_dataPermissionFilterBuilder.DataPermissionManager);
                     await AddNav(order).Include(d => d.OrderComplain).ExecuteCommandAsync();
                 }
                 else if (order.AcceptType == EAcceptType.Report)
                 {
-                    if (order.OrderReport == null)
-                        throw UserFriendlyException.SameMessage("非法举报参数");
                     order.OrderReport.InitDatePermission(_dataPermissionFilterBuilder.DataPermissionManager);
                     await AddNav(order).Include(d=>d.OrderReport).ExecuteCommandAsync();
                 }
+                else
+                {
+                    throw UserFriendlyException.SameMessage("12315工单不支持该受理类型");
+                }
             }
             else
             {

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

@@ -244,11 +244,11 @@ namespace Hotline.Share.Dtos.Order
         /// <summary>
         /// 投诉
         /// </summary>
-        public OrderComplainDto OrderComplain { get; set; }
+        public OrderComplainDto OrderComplain { get; set; } = new();
 
         /// <summary>
         /// 举报
         /// </summary>
-        public OrderReportDto OrderReport { get; set; }
+        public OrderReportDto OrderReport { get; set; } = new();
     }
 }

src/Hotline.Share/Enums/Order/EOrderTarget.cs

@@ -1,20 +0,0 @@
-//using System.ComponentModel;
-
-//namespace Hotline.Share.Enums.Order;
-
-//public enum EOrderTarget //todo c
-//{
-//    //平台、入驻商家
-
-//    /// <summary>
-//    /// 平台
-//    /// </summary>
-//    [Description("平台")]
-//    Platform = 0,
-
-//    /// <summary>
-//    /// 入驻商家
-//    /// </summary>
-//    [Description("入驻商家")]
-//    Merchant
-//}

src/Hotline.Share/Enums/Order/EPushType.cs

@@ -1,31 +0,0 @@
-//using System.ComponentModel;
-
-//namespace Hotline.Share.Enums.Order;
-
-///// <summary>
-///// 推送分类
-///// </summary>
-//public enum EPushType //todo c
-//{
-//    //人力资源社会保障厅、交通运输厅、文旅和旅游厅、中小企业款项支付“指引诉求”、中小企业款项支付“跟办诉求”、中小企业款项支付“咨询诉求”、110
-//    [Description("人力资源社会保障厅")]
-//    Rlzyshbzt = 0,
-
-//    [Description("交通运输厅")]
-//    Jtyst = 1,
-
-//    [Description("文旅和旅游厅")]
-//    Wlt = 2,
-
-//    [Description("中小企业款项支付“指引诉求”")]
-//    ZxqyZysq = 3,
-
-//    [Description("中小企业款项支付“跟办诉求”")]
-//    ZxqyGbsq = 4,
-
-//    [Description("中小企业款项支付“咨询诉求”")]
-//    ZxqyZxsq = 5,
-
-//    [Description("110")]
-//    GongAn110 = 6,
-//}

src/Hotline/FileStorage/File.cs

@@ -7,7 +7,7 @@ using XF.Domain.Repository;
 
 namespace Hotline.FileStorage
 {
-    public class File : FullStateEntity
+    public class File //: FullStateEntity
     {
         public EFileSType FileSType { get; set; }   
     }

src/Hotline/Orders/OrderDomainService.cs

@@ -28,9 +28,13 @@ public class OrderDomainService : IOrderDomainService, IScopeDependency
 
     public async Task<string> AddAsync(Order order, CancellationToken cancellationToken)
     {
+        if (order.AcceptType == EAcceptType.Complain && order.OrderComplain == null)
+            throw UserFriendlyException.SameMessage("非法投诉参数");
+        if (order.AcceptType == EAcceptType.Complain && order.OrderReport == null)
+            throw UserFriendlyException.SameMessage("非法举报参数");
+
         order.Init(_sessionContext.RequiredUserId);
         order.No = GenerateNewOrderNo();
-        //order.ExpiredTime = Calculate();//todo 根据配置获取办理时长再计算过期时间
 
         return await _orderRepository.AddOrderNavAsync(order, cancellationToken);
     }