Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

src/Hotline.Application.Tests/Application/RedPackApplicationTest.cs

@@ -41,7 +41,7 @@ public class RedPackApplicationTest : TestBase
     {
         var items = await _redPackApplication.GetRedPackAuditItemsAsync(new SnapshotOrderAuditItemsInDto(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, 0)).ToListAsync();
         var audit = items.First();
-        var smsTemplate = await _redPackApplication.GetRedPackAuditSMSTemplateAsync(new GetRedPackAuditSMSTemplateInDto(audit.OrderId, ERedPackAuditStatus.Agree));
+        var smsTemplate = await _redPackApplication.GetRedPackAuditSMSTemplateAsync(new GetRedPackAuditSMSTemplateInDto(audit.OrderId, ESnapshotSMSStatus.Agree));
         var inDto = new UpdateRedPackAuditInDto
         {
             Status = ERedPackAuditStatus.Agree,

src/Hotline.Application/Snapshot/IndustryApplication.cs

@@ -225,7 +225,10 @@ public class IndustryApplication : IIndustryApplication, IScopeDependency
         return await _snapshotSMSTemplateRepository.Queryable()
             .LeftJoin<Industry>((s, i) => s.IndustryId == i.Id)
             .Where((s, i) => s.Id == id)
-            .Select<SnapshotSMSTemplateItemsOutDto>()
+            .Select((s, i) => new SnapshotSMSTemplateItemsOutDto
+            { 
+                Status = s.Status
+            }, true)
             .FirstAsync();
     }
 

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

@@ -642,7 +642,7 @@ public class GetRedPackAuditSMSTemplateInDto
 
     }
 
-    public GetRedPackAuditSMSTemplateInDto(string id, ERedPackAuditStatus status)
+    public GetRedPackAuditSMSTemplateInDto(string id, ESnapshotSMSStatus status)
     {
         OrderId = id;
         Status = status;
@@ -656,7 +656,7 @@ public class GetRedPackAuditSMSTemplateInDto
     /// <summary>
     /// 状态
     /// </summary>
-    public ERedPackAuditStatus Status { get; set; }
+    public ESnapshotSMSStatus Status { get; set; }
 }
 
 public class SnapshotOrderAuditDetailOutDto

src/Hotline/Snapshot/SnapshotMessageTemplate.cs

@@ -6,44 +6,44 @@ using Hotline.Share.Enums.Snapshot;
 
 namespace Hotline.Snapshot;
 
-[Description("随手拍短信模板设置")]
-public class SnapshotMessageTemplate : CreationSoftDeleteEntity
-{
-    /// <summary>
-    /// 短信模板代码
-    /// 表<inheritdoc cref="MessageTemplate"/>中的Code字段
-    /// </summary>
-    [SugarColumn(ColumnDescription = "MessageTemplateCode")]
-    public string MessageTemplateCode { get; set; }
+//[Description("随手拍短信模板设置")]
+//public class SnapshotMessageTemplate : CreationSoftDeleteEntity
+//{
+//    /// <summary>
+//    /// 短信模板代码
+//    /// 表<inheritdoc cref="MessageTemplate"/>中的Code字段
+//    /// </summary>
+//    [SugarColumn(ColumnDescription = "MessageTemplateCode")]
+//    public string MessageTemplateCode { get; set; }
 
-    /// <summary>
-    /// 行业页面Id
-    /// </summary>
-    [SugarColumn(ColumnDescription = "行业页面Id")]
-    public string IndustrPageId { get; set; }
+//    /// <summary>
+//    /// 行业页面Id
+//    /// </summary>
+//    [SugarColumn(ColumnDescription = "行业页面Id")]
+//    public string IndustrPageId { get; set; }
 
-    /// <summary>
-    /// 审批类型
-    /// </summary>
-    [SugarColumn(ColumnDescription = "审批类型")]
-    public ESnapshopApproveType ApproveType { get; set; }
+//    /// <summary>
+//    /// 审批类型
+//    /// </summary>
+//    [SugarColumn(ColumnDescription = "审批类型")]
+//    public ESnapshopApproveType ApproveType { get; set; }
 
-    /// <summary>
-    /// 是否启用
-    /// </summary>
-    [SugarColumn(ColumnDescription = "是否启用")]
-    public bool IsEnable { get; set; }
+//    /// <summary>
+//    /// 是否启用
+//    /// </summary>
+//    [SugarColumn(ColumnDescription = "是否启用")]
+//    public bool IsEnable { get; set; }
 
-    /// <summary>
-    /// 是否公用
-    /// 公用后不受行业页面限制
-    /// </summary>
-    [SugarColumn(ColumnDescription = "是否公用")]
-    public bool IsPublic { get; set; }
+//    /// <summary>
+//    /// 是否公用
+//    /// 公用后不受行业页面限制
+//    /// </summary>
+//    [SugarColumn(ColumnDescription = "是否公用")]
+//    public bool IsPublic { get; set; }
 
-    /// <summary>
-    /// 排序
-    /// </summary>
-    [SugarColumn(ColumnDescription = "排序")]
-    public int DisplayOrder { get; set; }
-}
+//    /// <summary>
+//    /// 排序
+//    /// </summary>
+//    [SugarColumn(ColumnDescription = "排序")]
+//    public int DisplayOrder { get; set; }
+//}

src/Hotline/Snapshot/SnapshotSMSTemplate.cs

@@ -26,7 +26,7 @@ public class SnapshotSMSTemplate : FullStateEntity
     /// 审核状态
     /// </summary>
     [SugarColumn(ColumnDescription = "审核状态")]
-    public ERedPackAuditStatus Status { get; set; }
+    public ESnapshotSMSStatus Status { get; set; }
 
     /// <summary>
     /// 是否启用