新增获取特提基础信息

src/Hotline.Api/Controllers/OrderController.cs

@@ -146,6 +146,7 @@ public class OrderController : BaseController
     private readonly IOrderTerminateRepository _orderTerminateRepository;
     private readonly ISystemLogApplication _systemLogApplication;
     private readonly IOrderSnapshotRepository _orderSnapshotRepository;
+    private readonly IIndustryRepository _industryRepository;
 
     public OrderController(
         IOrderDomainService orderDomainService,
@@ -213,7 +214,8 @@ public class OrderController : BaseController
         IOrderTerminateRepository orderTerminateRepository,
         ITypedCache<string> typeCache,
         ISystemLogApplication systemLogApplication,
-        IOrderSnapshotRepository orderSnapshotRepository)
+        IOrderSnapshotRepository orderSnapshotRepository,
+        IIndustryRepository industryRepository)
     {
         _orderDomainService = orderDomainService;
         _orderRepository = orderRepository;
@@ -281,6 +283,7 @@ public class OrderController : BaseController
         _baseDataApplication = baseDataApplication;
         _systemLogApplication = systemLogApplication;
         _orderSnapshotRepository = orderSnapshotRepository;
+        _industryRepository = industryRepository;
     }
 
     #endregion
@@ -4259,8 +4262,12 @@ public class OrderController : BaseController
         ////todo 自贡add 4
         //FocusOnEvents.Add(new Kv { Key = "4", Value = "24小时办结" });
 
+        var industryItems = await _industryRepository.Queryable()
+            .Select(d => new { d.Id, d.Name, })
+            .ToListAsync();
         var rsp = new
         {
+            Industry = industryItems,
             TranspondCity = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.TranspondCity),
             ChannelOptions = _sysDicDataCacheManager.GetSysDicDataCache(TimeLimitBaseDataConsts.SourceChannel),
             AcceptTypeOptions = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.AcceptType),

src/Hotline.Api/Controllers/Snapshot/RedPackController.cs

@@ -45,6 +45,10 @@ public class RedPackController : BaseController
     public async Task<SnapshotOrderAuditDetailOutDto> GetRedPackAuditDetailAsync(string id)
         => await _redPackApplication.GetRedPackAuditDetailAsync(id);
 
+    [HttpGet("audit/back/{id}")]
+    public async Task<GetAuditBackBaseDataOutDto> GetAuditBackBaseDataAsync(string id)
+        => await _redPackApplication.GetAuditBackBaseDataAsync(id);
+
     /// <summary>
     /// 添加备注
     /// </summary>
@@ -143,5 +147,16 @@ public class RedPackController : BaseController
     [HttpGet("record")]
     public async Task<PagedDto<SnapshotRedPackRecordItemsOutDto>> GetRedPackRecordItemsAsync([FromQuery] SnapshotRedPackRecordItemsInDto dto)
         => (await _redPackApplication.GetRedPackRecordItemsAsync(dto).ToPagedListAsync(dto)).ToPaged();
+
+    /// <summary>
+    /// 批量发送红包
+    /// </summary>
+    /// <param name="ids"></param>
+    /// <returns></returns>
+    [HttpPut("record/send_bath")]
+    public async Task<string> BathSendRedPackAsync([FromBody] List<string> ids)
+    {
+        return "ok";
+    }
     #endregion
 }

src/Hotline.Application.Tests/Application/SnapshotApplicationTest.cs

@@ -118,6 +118,7 @@ public class SnapshotApplicationTest : TestBase
 
     /// <summary>
     /// 获取公开工单集合
+    /// 获取特提参数
     /// </summary>
     /// <returns></returns>
     [Fact]

src/Hotline.Application/Snapshot/IRedPackApplication.cs

@@ -15,6 +15,13 @@ public interface IRedPackApplication
     /// <param name="dto"></param>
     /// <returns></returns>
     Task AuditRedPackAuditAsync(UpdateRedPackAuditInDto dto);
+    
+    /// <summary>
+    /// 获取特提参数
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    Task<GetAuditBackBaseDataOutDto> GetAuditBackBaseDataAsync(string id);
 
     /// <summary>
     /// 获取审核详情

src/Hotline.Application/Snapshot/RedPackApplication.cs

@@ -11,6 +11,7 @@ using SqlSugar;
 using SqlSugar.Extensions;
 using XF.Domain.Dependency;
 using XF.Domain.Exceptions;
+using XF.Domain.Repository;
 using XF.Utility.EnumExtensions;
 
 namespace Hotline.Application.Snapshot;
@@ -22,8 +23,9 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
     private readonly IIndustryRepository _industryRepository;
     private readonly IRedPackAuditRepository _redPackAuditRepository;
     private readonly IRedPackRecordRepository _redPackRecordRepository;
+    private readonly IRepository<OrderSpecial> _orderSpecialRepository;
 
-    public RedPackApplication(IOrderSnapshotRepository orderSnapshotRepository, ISnapshotSMSTemplateRepository snapshotSMSTemplateRepository, IOrderRepository orderRepository, IIndustryRepository industryRepository, IRedPackAuditRepository redPackAuditRepository, IRedPackRecordRepository redPackRecordRepository)
+    public RedPackApplication(IOrderSnapshotRepository orderSnapshotRepository, ISnapshotSMSTemplateRepository snapshotSMSTemplateRepository, IOrderRepository orderRepository, IIndustryRepository industryRepository, IRedPackAuditRepository redPackAuditRepository, IRedPackRecordRepository redPackRecordRepository, IRepository<OrderSpecial> orderSpecialRepository)
     {
         _orderSnapshotRepository = orderSnapshotRepository;
         _snapshotSMSTemplateRepository = snapshotSMSTemplateRepository;
@@ -31,6 +33,7 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
         _industryRepository = industryRepository;
         _redPackAuditRepository = redPackAuditRepository;
         _redPackRecordRepository = redPackRecordRepository;
+        _orderSpecialRepository = orderSpecialRepository;
     }
 
     /// <summary>
@@ -165,7 +168,6 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
                 BankCardNo = record.BankCardNo,
                 OpenBank = record.OpenBank,
                 AuditStatus = redPackAudit.Status,
-                WorkflowId = order.WorkflowId
             });
         return query;
     }
@@ -256,5 +258,22 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
         return query;
     }
 
+    /// <summary>
+    /// 获取特提参数
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public async Task<GetAuditBackBaseDataOutDto> GetAuditBackBaseDataAsync(string id)
+    {
+        var order = await _orderRepository.Queryable()
+            .Where(m => m.Id == id)
+            .Select<GetAuditBackBaseDataOutDto>()
+            .FirstAsync()
+            ?? throw UserFriendlyException.SameMessage("工单不存在");
+
+        order.SpecialNum = await _orderSpecialRepository.CountAsync(x => x.OrderId == id);
+        return order;
+    }
+
     #endregion
 }

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

@@ -439,11 +439,6 @@ public class SnapshotOrderAuditItemsOutDto
     /// 红包审核状态
     /// </summary>
     public string AuditStatusTxt => AuditStatus.GetDescription();
-
-    /// <summary>
-    /// 流程Id
-    /// </summary>
-    public string WorkflowId { get; set; }
 }
 
 public class GetRedPackAuditSMSTemplateOutDto
@@ -651,3 +646,31 @@ public class UpdateRedPackAuditInDto
     /// </summary>
     public bool IsSendSms { get; set; }
 }
+
+public class GetAuditBackBaseDataOutDto
+{
+    /// <summary>
+    /// 流程Id
+    /// </summary>
+    public string WorkflowId { get; set; }
+
+    /// <summary>
+    /// 特提次数
+    /// </summary>
+    public int SpecialNum { get; set; }
+
+    /// <summary>
+    /// 实际办理节点code（会签状态此字段保存最外层会签发起节点code）
+    /// </summary>
+    public string ActualHandleStepCode { get; set; }
+
+    /// <summary>
+    /// 实际办理节点名称（会签状态此字段保存最外层会签发起节点名称）
+    /// </summary>
+    public string ActualHandleStepName { get; set; }
+
+    /// <summary>
+    /// 受理类型代码
+    /// </summary>
+    public string AcceptTypeCode { get; set; }
+}

src/Hotline.Share/Dtos/Snapshot/RedPackDto.cs

@@ -134,5 +134,15 @@ public class UpdateRedPackRecordInDto
     /// 发送短信
     /// </summary>
     public bool IsSendSMS { get; set; }
+
+    /// <summary>
+    /// 补充发放类型
+    /// </summary>
+    public string ReplenishType { get; set; }
+
+    /// <summary>
+    /// 补充发放类型Id
+    /// </summary>
+    public string ReplenishTypeId { get; set; }
 }
 

src/Hotline/Snapshot/RedPackAudit.cs

@@ -79,6 +79,18 @@ public class RedPackAudit : CreationSoftDeleteEntity
     [SugarColumn(ColumnDescription = "补充发放备注")]
     public string? ReplenishRemark { get; set; }
 
+    /// <summary>
+    /// 补充发放类型
+    /// </summary>
+    [SugarColumn(ColumnDescription = "补充发放类型")]
+    public string? ReplenishType { get; set; }
+
+    /// <summary>
+    /// 补充发放类型Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "补充发放类型Id")]
+    public string? ReplenishTypeId { get; set; }
+
     /// <summary>
     /// 市民奖励发放结果
     /// </summary>