qinchaoyue 2 mesiacov pred
rodič
commit
07b518f668

+ 4 - 3
src/Hotline.Application/Snapshot/RedPackApplication.cs

@@ -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;
@@ -513,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;
     }

+ 9 - 0
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
 }