Merge branch 'feature/snapshot' into dev

src/Hotline.Application/Snapshot/RedPackApplication.cs

@@ -80,7 +80,7 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
                 WXOpenId = third?.OpenId,
                 No = order.No,
                 PickupStatus = ERedPackPickupStatus.Unreceived,
-                DistributionState = EReadPackSendStatus.Unsend,
+                DistributionState = EReadPackSendStatus.Successful,
             };
             if (redPackAudit.ApprovedAmount.HasValue)
                 entity.Amount = redPackAudit.ApprovedAmount.Value;
@@ -122,7 +122,7 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
                     PhoneNumber = order.FromPhone,
                     No = order.No,
                     PickupStatus = ERedPackPickupStatus.Unreceived,
-                    DistributionState = EReadPackSendStatus.Unsend,
+                    DistributionState = EReadPackSendStatus.Successful,
                 };
                 if (redPackAudit.ApprovedAmount.HasValue)
                     entity.Amount = redPackAudit.ApprovedAmount.Value;
@@ -481,6 +481,7 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
             .WhereIF(dto.No.NotNullOrEmpty(), m => m.No.Contains(dto.No))
             .WhereIF(dto.PhoneNumber.NotNullOrEmpty(), m => m.PhoneNumber.Contains(dto.PhoneNumber))
             .WhereIF(dto.Name.NotNullOrEmpty(), m => m.Name.Contains(dto.Name))
+            .OrderByDescending(m => m.CreationTime)
             .Select<SnapshotRedPackRecordItemsGuiderOutDto>();
 
         if (dto.Status == 3)
@@ -512,10 +513,11 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
             .WhereIF(dto.IsReceive.HasValue && dto.IsReceive == true, m => m.PickupStatus == ERedPackPickupStatus.Received)
             .WhereIF(dto.IsReceive.HasValue && dto.IsReceive == false, m => m.PickupStatus == ERedPackPickupStatus.Unreceived)
             .WhereIF(dto.BeginCreationTime.HasValue && dto.EndCreationTime.HasValue, m => m.CreationTime >= dto.BeginCreationTime && m.CreationTime <= dto.EndCreationTime)
-            .Select(m => new SnapshotRedPackRecordSendOutDto
+            .Select((m, snapshot, order) => new SnapshotRedPackRecordSendOutDto
             { 
                 OrderId = m.OrderId,
-                UserType = m.PeopleType
+                UserType = m.PeopleType,
+                IndustryName = snapshot.IndustryName
             }, true);
         return query;
     }

src/Hotline.Share/Enums/Snapshot/EReadPackSendStatus.cs

@@ -12,12 +12,21 @@ namespace Hotline.Share.Enums.Snapshot;
 /// </summary>
 public enum EReadPackSendStatus
 {
+    /// <summary>
+    /// 发送成功
+    /// </summary>
     [Description("发放成功")]
     Successful = 0,
 
+    /// <summary>
+    /// 发送失败
+    /// </summary>
     [Description("发放失败")]
     Fail = 1,
 
+    /// <summary>
+    /// 未发放
+    /// </summary>
     [Description("未发放")]
     Unsend = 2
 }

test/Hotline.Tests/Application/OrderSnapshotApplicationTest.cs

@@ -35,7 +35,9 @@ public class OrderSnapshotApplicationTest : TestBase
     private readonly ICommunityInfoRepository _communityInfoRepository;
     private readonly IRedPackAuditRepository _redPackAuditRepository;
     private readonly IRedPackRecordRepository _redPackRecordRepository;
-    public OrderSnapshotApplicationTest(IAccountRepository accountRepository, IRepository<Role> roleRepository, UserController userController, IServiceScopeFactory scopeFactory, IRepository<User> userRepository, IHttpContextAccessor httpContextAccessor, IThirdIdentiyService thirdIdentiyService, IThirdAccountRepository thirdAccountRepository, OrderServiceMock orderServiceMock, ISystemDicDataCacheManager systemDicDataCacheManager, IOrderSnapshotRepository orderSnapshotRepository, IOrderSnapshotApplication orderSnapshotApplication, ISnapshotApplication snapshotApplication, IIndustryLogRepository industryLogRepository, ICommunityInfoRepository communityInfoRepository, IRedPackAuditRepository redPackAuditRepository, IRedPackRecordRepository redPackRecordRepository) : base(accountRepository, roleRepository, userController, scopeFactory, userRepository, httpContextAccessor, thirdIdentiyService, thirdAccountRepository)
+    private readonly ISnapshotLabelLogRepository _snapshotLabelLogRepository;
+
+    public OrderSnapshotApplicationTest(IAccountRepository accountRepository, IRepository<Role> roleRepository, UserController userController, IServiceScopeFactory scopeFactory, IRepository<User> userRepository, IHttpContextAccessor httpContextAccessor, IThirdIdentiyService thirdIdentiyService, IThirdAccountRepository thirdAccountRepository, OrderServiceMock orderServiceMock, ISystemDicDataCacheManager systemDicDataCacheManager, IOrderSnapshotRepository orderSnapshotRepository, IOrderSnapshotApplication orderSnapshotApplication, ISnapshotApplication snapshotApplication, IIndustryLogRepository industryLogRepository, ICommunityInfoRepository communityInfoRepository, IRedPackAuditRepository redPackAuditRepository, IRedPackRecordRepository redPackRecordRepository, ISnapshotLabelLogRepository snapshotLabelLogRepository) : base(accountRepository, roleRepository, userController, scopeFactory, userRepository, httpContextAccessor, thirdIdentiyService, thirdAccountRepository)
     {
         _orderServiceMock = orderServiceMock;
         _systemDicDataCacheManager = systemDicDataCacheManager;
@@ -46,6 +48,7 @@ public class OrderSnapshotApplicationTest : TestBase
         _communityInfoRepository = communityInfoRepository;
         _redPackAuditRepository = redPackAuditRepository;
         _redPackRecordRepository = redPackRecordRepository;
+        _snapshotLabelLogRepository = snapshotLabelLogRepository;
     }
 
     /// <summary>
@@ -116,6 +119,12 @@ public class OrderSnapshotApplicationTest : TestBase
             .办理到一级部门(SetPaiDanYuan)
             .办理到归档(Set一级部门)
             .发布工单(SetZuoXi, inputLable.Select(m => new Kv(m.DicDataName, m.DicDataName)).ToList())
+            .StepHandle(async order => {
+                    var log = _snapshotLabelLogRepository.Queryable().Where(m => m.OrderId == order.Id).First();
+                    log.ShouldNotBeNull();
+                    var snapshot = _orderSnapshotRepository.Get(order.Id);
+                    snapshot.LabelName.ShouldBe(string.Join(',', inputLable.Select(m => m.DicDataName)),"label异常");
+                    })
             .部门审核网格员红包(Set政法委)
             .部门审核网格员红包(Set应急管理局)
             .StepHandle(async order =>