Merge branch 'feature/snapshot' into dev

src/Hotline.Application/Snapshot/RedPackApplication.cs

@@ -71,6 +71,7 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
             .WhereIF(dto.Title.NotNullOrEmpty(), (redPackAudit, order, snapshot, record, industry) => order.Title.Contains(dto.Title))
             .WhereIF(dto.FromPhone.NotNullOrEmpty(), (redPackAudit, order, snapshot, record, industry) => order.FromPhone.Contains(dto.FromPhone))
             .WhereIF(dto.BeginCreationTime.HasValue && dto.EndCreationTime.HasValue, (redPackAudit, order, snapshot, record, industry) => order.CreationTime <= dto.EndCreationTime && order.CreationTime >= dto.BeginCreationTime)
+            .WhereIF(dto.BeginFiledTime.HasValue && dto.EndFiledTime.HasValue, (redPackAudit, order, snapshot, record, industry) => order.FiledTime <= dto.EndFiledTime && order.FiledTime >= dto.BeginFiledTime)
             .WhereIF(dto.IsDeal.HasValue, (redPackAudit, order, snapshot, record, industry) => snapshot.IsDeal == dto.IsDeal)
             .WhereIF(dto.IsTruth.HasValue, (redPackAudit, order, snapshot, record, industry) => snapshot.IsTruth == dto.IsTruth)
             .WhereIF(dto.IsTruthDepartment.HasValue, (redPackAudit, order, snapshot, record, industry) => snapshot.IsTruthDepartment == dto.IsTruthDepartment)
@@ -119,6 +120,7 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
                 AuditRemark = redPackAudit.AuditRemark,
                 BankCardNo = record.BankCardNo,
                 OpenBank = record.OpenBank,
+                AuditStatus = redPackAudit.Status
             });
         return query;
     }

src/Hotline.Application/Snapshot/SnapshotApplicationBase.cs

@@ -784,7 +784,7 @@ public abstract class SnapshotApplicationBase
     {
         var order = await _orderRepository.Queryable()
             .Where(m => m.Id == orderId)
-            .Select(m => new { m.Id, m.Status, m.No })
+            .Select(m => new { m.Id, m.Status, m.No , m.FromPhone})
             .FirstAsync(cancellationToken) ?? throw new UserFriendlyException($"{orderId} 工单不存在");
         var snapshot = await _orderSnapshotRepository.GetAsync(orderId) ?? throw new UserFriendlyException("工单不存在");
         if (order.Status != EOrderStatus.Filed) return $"{order.No} 工单状态非 {EOrderStatus.Filed} 不处理;";
@@ -798,6 +798,7 @@ public abstract class SnapshotApplicationBase
             OrderId = order.Id,
             Status = ERedPackAuditStatus.Pending,
             ShouldAmount = industry.CitizenReadPackAmount,
+            PhoneNumber = order.FromPhone,
             IsSend = false,
         };
         await _redPackAuditRepository.AddAsync(entity, cancellationToken);

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

@@ -198,6 +198,8 @@ public class AddSnapshotOrderInDto : Position
 /// <param name="IsTruthDepartment">部门是否属实</param>
 /// <param name="BeginAuditTime">审批开始时间</param>
 /// <param name="EndAuditTime">审批结束时间</param>
+/// <param name="BeginFiledTime">办结开始时间</param>
+/// <param name="EndFiledTime">办结结束时间</param>
 /// <param name="IsIssued">是否发放红包</param>
 /// <param name="IndustryId">行业Id</param>
 /// <param name="ConfigAmount">配置金额</param>
@@ -214,6 +216,8 @@ public record SnapshotOrderAuditItemsInDto(string? No, string? Title,
     bool? IsTruthDepartment,
     DateTime? BeginAuditTime,
     DateTime? EndAuditTime,
+    DateTime? BeginFiledTime,
+    DateTime? EndFiledTime,
     bool? IsIssued,
     string? IndustryId,
     double? ConfigAmount,
@@ -426,6 +430,16 @@ public class SnapshotOrderAuditItemsOutDto
     /// 开户行
     /// </summary>
     public string? OpenBank { get; set; }
+
+    /// <summary>
+    /// 红包审核状态
+    /// </summary>
+    public ERedPackAuditStatus AuditStatus { get; set; }
+
+    /// <summary>
+    /// 红包审核状态
+    /// </summary>
+    public string AuditStatusTxt => AuditStatus.GetDescription();
 }
 
 public class GetRedPackAuditSMSTemplateOutDto

src/Hotline/Snapshot/RedPackAudit.cs

@@ -29,7 +29,7 @@ public class RedPackAudit : CreationSoftDeleteEntity
     /// 领取手机号码
     /// </summary>
     [SugarColumn(ColumnDescription = "领取红包手机号码")]
-    public string PhoneNumber { get; set; }
+    public string? PhoneNumber { get; set; }
 
     /// <summary>
     /// 审核状态