Browse Source

Merge branch 'feature/snapshot' into dev

qinchaoyue 4 tháng trước cách đây
mục cha
commit
147a4f709c

+ 8 - 0
src/Hotline.Api/Controllers/Snapshot/RedPackController.cs

@@ -43,6 +43,14 @@ public class RedPackController : BaseController
     public async Task<SnapshotOrderAuditDetailOutDto> GetRedPackAuditDetailAsync(string id)
         => await _redPackApplication.GetRedPackAuditDetailAsync(id);
 
+    /// <summary>
+    /// 添加备注
+    /// </summary>
+    /// <param name="dto"></param>
+    /// <returns></returns>
+    //[HttpPut("audit/remark")]
+    //public async Task
+
     /// <summary>
     /// 红包审核通过或拒绝
     /// </summary>

+ 2 - 1
src/Hotline.Application/Snapshot/RedPackApplication.cs

@@ -93,7 +93,8 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
         if (count != 0)
             outDto.RedPackTxt += $"今天审批【{count}】个";
 
-        outDto.AuditComBox = EnumExts.GetDescriptions<ERedPackAuditStatus>();
+        outDto.AuditComBox = EnumExts.GetDescriptions<ERedPackAuditStatus>()
+            .Where(m => m.Key.ToString() != "0").ToList();
         return outDto;
     }
 

+ 1 - 1
src/Hotline/Snapshot/RedPackRecord.cs

@@ -35,7 +35,7 @@ public class RedPackRecord : CreationSoftDeleteEntity
     /// 用户微信OpenId
     /// </summary>
     [SugarColumn(ColumnDescription = "用户微信OpenId")]
-    public string WXOpenId { get; set; }
+    public string? WXOpenId { get; set; }
 
     /// <summary>
     /// 红包领取人类型