qinchaoyue 8 months ago
parent
commit
d87667f651

+ 26 - 0
src/Hotline.Share/Enums/Snapshot/ERedPackAuditStatus.cs

@@ -0,0 +1,26 @@
+using System.ComponentModel;
+
+namespace Hotline.Share.Enums.Snapshot;
+/// <summary>
+/// 红包审核状态
+/// </summary>
+public enum ERedPackAuditStatus
+{
+    /// <summary>
+    /// 待审批
+    /// </summary>
+    [Description("待审批")]
+    Pending,
+
+    /// <summary>
+    /// 同意
+    /// </summary>
+    [Description("同意")]
+    Agree,
+
+    /// <summary>
+    /// 拒绝
+    /// </summary>
+    [Description("拒绝")]
+    Refuse,
+}

+ 7 - 6
src/Hotline/Snapshot/Industry.cs

@@ -12,6 +12,7 @@ public class Industry : CreationSoftDeleteEntity
 {
     /// <summary>
     /// 行业代码
+    /// 根行业Code长度3位, 每一级增加3位长度
     /// </summary>
     [SugarColumn(ColumnDescription = "Code")]
     public string Code { get; set; }
@@ -47,16 +48,16 @@ public class Industry : CreationSoftDeleteEntity
     public string? AcceptTypeCode { get; set; }
 
     /// <summary>
-    /// 市民发放红包金额
+    /// 市民发放红包金额(单位:分)
     /// </summary>
-    [SugarColumn(ColumnDescription = "市民发放红包金额")]
-    public decimal CitizenReadPackAmount { get; set; }
+    [SugarColumn(ColumnDescription = "市民发放红包金额(单位:分)")]
+    public int CitizenReadPackAmount { get; set; }
 
     /// <summary>
-    /// 网络员发放红包金额
+    /// 网络员发放红包金额(单位:分)
     /// </summary>
-    [SugarColumn(ColumnDescription = "网络员发放红包金额")]
-    public decimal NetworkerReadPackAmount { get; set; }
+    [SugarColumn(ColumnDescription = "网络员发放红包金额(单位:分)")]
+    public int NetworkerReadPackAmount { get; set; }
 
     /// <summary>
     /// 是否启用

+ 7 - 5
src/Hotline/Snapshot/OrderShapshot.cs

@@ -1,10 +1,5 @@
 using SqlSugar;
-using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using XF.Domain.Repository;
 
 namespace Hotline.Snapshot;
@@ -15,6 +10,13 @@ namespace Hotline.Snapshot;
 [Description("工单表扩展")]
 public class OrderShapshot : CreationSoftDeleteEntity
 {
+    /// <summary>
+    /// 关联工单编号
+    /// <inheritdoc cref="Order"/>表的Id字段
+    /// </summary>    
+    [SugarColumn(ColumnDescription = "关联工单编号")]
+    public string OrderId { get; set; }
+
     /// <summary>
     /// 行业Id
     /// <inheritdoc cref="Industry"/> 表的Id

+ 99 - 0
src/Hotline/Snapshot/RedPackAudit.cs

@@ -0,0 +1,99 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using XF.Domain.Repository;
+using Hotline.Orders;
+using Hotline.Share.Enums.Snapshot;
+
+namespace Hotline.Snapshot;
+
+/// <summary>
+/// 市民红包审核
+/// </summary>
+[Description("市民红包审核")]
+public class RedPackAudit : CreationSoftDeleteEntity
+{
+    /// <summary>
+    /// 关联工单编号
+    /// <inheritdoc cref="Order"/>表的Id字段
+    /// </summary>    
+    [SugarColumn(ColumnDescription = "关联工单编号")]
+    public string OrderId { get; set; }
+
+    /// <summary>
+    /// 审核状态
+    /// </summary>
+    [SugarColumn(ColumnDescription = "审核状态")]
+    public ERedPackAuditStatus Status { get; set; }
+
+    /// <summary>
+    /// 审批时间
+    /// </summary>
+    [SugarColumn(ColumnDescription = "审批时间")]
+    public DateTime? AuditTime { get; set; }
+
+    /// <summary>
+    /// 配置金额(分)
+    /// </summary>
+    [SugarColumn(ColumnDescription = "配置金额(分)")]
+    public int ShouldAmount { get; set; }
+
+    /// <summary>
+    /// 审批金额(分)
+    /// </summary>
+    [SugarColumn(ColumnDescription = "审批金额(分)")]
+    public int ApprovedAmount { get; set; }
+
+    /// <summary>
+    /// 实发金额(分)
+    /// </summary>
+    [SugarColumn(ColumnDescription = "实发金额(分)")]
+    public int AcutalAmount { get; set; }
+
+    /// <summary>
+    /// 市民奖励发放结果
+    /// </summary>
+    [SugarColumn(ColumnDescription = "市民奖励发放结果")]
+    public bool IsSend { get; set; }
+
+    /// <summary>
+    /// 市民奖励发放备注
+    /// </summary>
+    [SugarColumn(ColumnDescription = "市民奖励发放备注")]
+    public string SendRemarks { get; set; }
+
+    /// <summary>
+    /// 操作人
+    /// </summary>
+    [SugarColumn(ColumnDescription = "操作人")]
+    public string AuditId { get; set; }
+
+    /// <summary>
+    /// 操作人
+    /// </summary>
+    [SugarColumn(ColumnDescription = "操作人")]
+    public string AuditrName { get; set; }
+
+    /// <summary>
+    /// 审批部门
+    /// </summary>
+    [SugarColumn(ColumnDescription = "审批部门")]
+    public string AuditOrgId { get; set; }
+
+    /// <summary>
+    /// 审批部门名称
+    /// </summary>
+    [SugarColumn(ColumnDescription = "审批部门名称")]
+    public string AuditOrgName { get; set; }
+
+    /// <summary>
+    /// 审批意见
+    /// </summary>
+    [SugarColumn(ColumnDescription = "审批意见")]
+    public string AuditRemark { get; set; }
+
+}

+ 3 - 15
src/Hotline/Snapshot/RedPackRecord.cs

@@ -26,22 +26,10 @@ public class RedPackRecord : CreationSoftDeleteEntity
     public string WxOrderNo { get; set; }
 
     /// <summary>
-    /// 应发金额
+    /// 红包金额
     /// </summary>
-    [SugarColumn(ColumnDescription = "应发金额")]
-    public decimal ShouldAmount { get; set; }
-
-    /// <summary>
-    /// 审批金额
-    /// </summary>
-    [SugarColumn(ColumnDescription = "审批金额")]
-    public decimal ApprovedAmount {get;set;}
-
-    /// <summary>
-    /// 实发金额
-    /// </summary>
-    [SugarColumn(ColumnDescription = "实发金额")]
-    public decimal AcutalAmount {get;set;}
+    [SugarColumn(ColumnDescription = "红包金额")]
+    public int Amount {get;set;}
 
     /// <summary>
     /// 用户微信OpenId