feat: 完善开单欠款补缴记录功能

- 新增lq_kd_qkbj表相关实体和DTO文件 - 完善LqKdDeductinfoEntity字段同步 - 优化LqKdKdjlbService中的状态管理 - 使用StatusEnum统一状态值管理 - 修复SqlSugar更新语法问题 - 完善开单创建和作废逻辑

feat: 完善开单欠款补缴记录功能
- 新增lq_kd_qkbj表相关实体和DTO文件 - 完善LqKdDeductinfoEntity字段同步 - 优化LqKdKdjlbService中的状态管理 - 使用StatusEnum统一状态值管理 - 修复SqlSugar更新语法问题 - 完善开单创建和作废逻辑
“wangming”
1 parent e5e15bcb
Showing 23 changed files with 626 additions and 25 deletions
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoCrInput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoInfoOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoListOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoListQueryInput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbCrInput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbInfoOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdPxmx/LqKdPxmxCrInput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdPxmx/LqKdPxmxInfoOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjCrInput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjInfoOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjListOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjListQueryInput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjUpInput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/MemberRemainingItemsOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_deductinfo/LqKdDeductinfoEntity.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_kdjlb/LqKdKdjlbEntity.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_pxmx/LqKdPxmxEntity.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_qkbj/LqKdQkbjEntity.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Enum/StatusEnum.cs
netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs
@@ -17,10 +17,10 @@ namespace NCC.Extend.Entitys.Dto.LqKdDeductinfo
         /// 扣减类型
         /// </summary>
         [Required(ErrorMessage = "扣减类型不能为空")]
-        public int? DeductType { get; set; }
+        public string DeductType { get; set; }
  
         /// <summary>
-        /// 扣减关联ID
+        /// 扣减品项关联ID
         /// </summary>
         [Required(ErrorMessage = "扣减关联ID不能为空")]
         public string DeductId { get; set; }
@@ -28,7 +28,6 @@ namespace NCC.Extend.Entitys.Dto.LqKdDeductinfo
         /// <summary>
         /// 开单id
         /// </summary>
-        [Required(ErrorMessage = "开单id不能为空")]
         public string BillingId { get; set; }
  
         /// <summary>
@@ -37,5 +36,35 @@ namespace NCC.Extend.Entitys.Dto.LqKdDeductinfo
         [Required(ErrorMessage = "合计金额不能为空")]
         [Range(0.01, 999999.99, ErrorMessage = "合计金额必须在0.01到999999.99之间")]
         public decimal? Amount { get; set; }
+
+        /// <summary>
+        /// 是否有效
+        /// </summary>
+        public int? IsEffective { get; set; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal? UnitPrice { get; set; }
+
+        /// <summary>
+        /// 品项名称
+        /// </summary>
+        public string ItemName { get; set; }
+
+        /// <summary>
+        /// 品项id
+        /// </summary>
+        public string ItemId { get; set; }
+
+        /// <summary>
+        /// 品项次数
+        /// </summary>
+        public decimal? ProjectNumber { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreateTime { get; set; }
     }
 }
@@ -36,5 +36,30 @@ namespace NCC.Extend.Entitys.Dto.LqKdDeductinfo
         /// 合计金额
         /// </summary>
         public decimal? Amount { get; set; }
+
+        /// <summary>
+        /// 是否有效
+        /// </summary>
+        public int? IsEffective { get; set; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal? UnitPrice { get; set; }
+
+        /// <summary>
+        /// 品项名称
+        /// </summary>
+        public string ItemName { get; set; }
+
+        /// <summary>
+        /// 品项id
+        /// </summary>
+        public string ItemId { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreateTime { get; set; }
     }
 }
@@ -36,5 +36,30 @@ namespace NCC.Extend.Entitys.Dto.LqKdDeductinfo
         /// 合计金额
         /// </summary>
         public decimal? Amount { get; set; }
+
+        /// <summary>
+        /// 是否有效
+        /// </summary>
+        public int? IsEffective { get; set; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal? UnitPrice { get; set; }
+
+        /// <summary>
+        /// 品项名称
+        /// </summary>
+        public string ItemName { get; set; }
+
+        /// <summary>
+        /// 品项id
+        /// </summary>
+        public string ItemId { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreateTime { get; set; }
     }
 }
@@ -31,5 +31,40 @@ namespace NCC.Extend.Entitys.Dto.LqKdDeductinfo
         /// 最大金额
         /// </summary>
         public decimal? MaxAmount { get; set; }
+
+        /// <summary>
+        /// 是否有效
+        /// </summary>
+        public int? IsEffective { get; set; }
+
+        /// <summary>
+        /// 品项名称
+        /// </summary>
+        public string ItemName { get; set; }
+
+        /// <summary>
+        /// 品项id
+        /// </summary>
+        public string ItemId { get; set; }
+
+        /// <summary>
+        /// 最小单价
+        /// </summary>
+        public decimal? MinUnitPrice { get; set; }
+
+        /// <summary>
+        /// 最大单价
+        /// </summary>
+        public decimal? MaxUnitPrice { get; set; }
+
+        /// <summary>
+        /// 开始创建时间
+        /// </summary>
+        public DateTime? StartCreateTime { get; set; }
+
+        /// <summary>
+        /// 结束创建时间
+        /// </summary>
+        public DateTime? EndCreateTime { get; set; }
     }
 }
@@ -146,6 +146,16 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
         public string F_FIleUrl { get; set; }
  
         /// <summary>
+        /// 作废关联id
+        /// </summary>
+        public string cancelRefId { get; set; }
+
+        /// <summary>
+        /// 作废关联备注
+        /// </summary>
+        public string cancelRefRemarks { get; set; }
+
+        /// <summary>
         /// 扣款信息
         /// </summary>
         public List<LqKdDeductinfoCrInput> lqKdKdjlbDeductList { get; set; }
@@ -59,10 +59,11 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
         /// </summary>
         public string ckfs { get; set; }
  
+
         /// <summary>
-        /// 储扣明细
+        /// 储扣总金额
         /// </summary>
-        public string ckmx { get; set; }
+        public decimal deductAmount { get; set; }
  
         /// <summary>
         /// 付款方式
@@ -54,14 +54,14 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
         public decimal projectNumber { get; set; }
  
         /// <summary>
-        /// 是否有效
+        /// 来源类型
         /// </summary>
-        public int? isEnabled { get; set; } = 0;
+        public string sourceType { get; set; }
  
         /// <summary>
-        /// 来源类型
+        /// 备注
         /// </summary>
-        public string sourceType { get; set; }
+        public string remark { get; set; }
  
         /// <summary>
         /// 健康师业绩
@@ -68,6 +68,12 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
         /// </summary>
         public decimal actualPrice { get; set; }
  
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string remark { get; set; }
+
         /// <summary>
         /// 健康师业绩列表
         /// </summary>
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace NCC.Extend.Entitys.Dto.LqKdQkbj
+{
+    /// <summary>
+    /// 开单欠款补缴记录创建输入
+    /// </summary>
+    public class LqKdQkbjCrInput
+    {
+        /// <summary>
+        /// 开单ID
+        /// </summary>
+        [Required(ErrorMessage = "开单ID不能为空")]
+        public string BillingId { get; set; }
+
+        /// <summary>
+        /// 补缴金额
+        /// </summary>
+        [Required(ErrorMessage = "补缴金额不能为空")]
+        [Range(0.01, 999999.99, ErrorMessage = "补缴金额必须在0.01到999999.99之间")]
+        public decimal PaymentAmount { get; set; }
+
+        /// <summary>
+        /// 补缴方式
+        /// </summary>
+        [Required(ErrorMessage = "补缴方式不能为空")]
+        public string PaymentMethod { get; set; }
+
+        /// <summary>
+        /// 补缴时间
+        /// </summary>
+        [Required(ErrorMessage = "补缴时间不能为空")]
+        public DateTime PaymentTime { get; set; }
+
+        /// <summary>
+        /// 补缴操作人
+        /// </summary>
+        public string PaymentUser { get; set; }
+
+        /// <summary>
+        /// 补缴账户
+        /// </summary>
+        public string PaymentAccount { get; set; }
+
+        /// <summary>
+        /// 补缴凭证号
+        /// </summary>
+        public string PaymentReference { get; set; }
+
+        /// <summary>
+        /// 补缴备注
+        /// </summary>
+        [StringLength(500, ErrorMessage = "补缴备注不能超过500个字符")]
+        public string Remark { get; set; }
+    }
+}
+using System;
+
+namespace NCC.Extend.Entitys.Dto.LqKdQkbj
+{
+    /// <summary>
+    /// 开单欠款补缴记录详情输出
+    /// </summary>
+    public class LqKdQkbjInfoOutput
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 开单ID
+        /// </summary>
+        public string BillingId { get; set; }
+
+        /// <summary>
+        /// 补缴金额
+        /// </summary>
+        public decimal PaymentAmount { get; set; }
+
+        /// <summary>
+        /// 补缴方式
+        /// </summary>
+        public string PaymentMethod { get; set; }
+
+        /// <summary>
+        /// 补缴方式名称
+        /// </summary>
+        public string PaymentMethodName { get; set; }
+
+        /// <summary>
+        /// 补缴时间
+        /// </summary>
+        public DateTime PaymentTime { get; set; }
+
+        /// <summary>
+        /// 补缴操作人
+        /// </summary>
+        public string PaymentUser { get; set; }
+
+        /// <summary>
+        /// 补缴操作人姓名
+        /// </summary>
+        public string PaymentUserName { get; set; }
+
+        /// <summary>
+        /// 补缴账户
+        /// </summary>
+        public string PaymentAccount { get; set; }
+
+        /// <summary>
+        /// 补缴凭证号
+        /// </summary>
+        public string PaymentReference { get; set; }
+
+        /// <summary>
+        /// 补缴备注
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        public DateTime UpdateTime { get; set; }
+
+        /// <summary>
+        /// 是否有效
+        /// </summary>
+        public int IsEffective { get; set; }
+    }
+}
+using System;
+
+namespace NCC.Extend.Entitys.Dto.LqKdQkbj
+{
+    /// <summary>
+    /// 开单欠款补缴记录列表输出
+    /// </summary>
+    public class LqKdQkbjListOutput
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 开单ID
+        /// </summary>
+        public string BillingId { get; set; }
+
+        /// <summary>
+        /// 补缴金额
+        /// </summary>
+        public decimal PaymentAmount { get; set; }
+
+        /// <summary>
+        /// 补缴方式
+        /// </summary>
+        public string PaymentMethod { get; set; }
+
+        /// <summary>
+        /// 补缴方式名称
+        /// </summary>
+        public string PaymentMethodName { get; set; }
+
+        /// <summary>
+        /// 补缴时间
+        /// </summary>
+        public DateTime PaymentTime { get; set; }
+
+        /// <summary>
+        /// 补缴操作人
+        /// </summary>
+        public string PaymentUser { get; set; }
+
+        /// <summary>
+        /// 补缴操作人姓名
+        /// </summary>
+        public string PaymentUserName { get; set; }
+
+        /// <summary>
+        /// 补缴账户
+        /// </summary>
+        public string PaymentAccount { get; set; }
+
+        /// <summary>
+        /// 补缴凭证号
+        /// </summary>
+        public string PaymentReference { get; set; }
+
+        /// <summary>
+        /// 补缴备注
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+
+        /// <summary>
+        /// 是否有效
+        /// </summary>
+        public int IsEffective { get; set; }
+    }
+}
+using System;
+
+namespace NCC.Extend.Entitys.Dto.LqKdQkbj
+{
+    /// <summary>
+    /// 开单欠款补缴记录列表查询输入
+    /// </summary>
+    public class LqKdQkbjListQueryInput
+    {
+        /// <summary>
+        /// 开单ID
+        /// </summary>
+        public string BillingId { get; set; }
+
+        /// <summary>
+        /// 补缴方式
+        /// </summary>
+        public string PaymentMethod { get; set; }
+
+        /// <summary>
+        /// 补缴操作人
+        /// </summary>
+        public string PaymentUser { get; set; }
+
+        /// <summary>
+        /// 最小补缴金额
+        /// </summary>
+        public decimal? MinPaymentAmount { get; set; }
+
+        /// <summary>
+        /// 最大补缴金额
+        /// </summary>
+        public decimal? MaxPaymentAmount { get; set; }
+
+        /// <summary>
+        /// 开始补缴时间
+        /// </summary>
+        public DateTime? StartPaymentTime { get; set; }
+
+        /// <summary>
+        /// 结束补缴时间
+        /// </summary>
+        public DateTime? EndPaymentTime { get; set; }
+
+        /// <summary>
+        /// 是否有效
+        /// </summary>
+        public int? IsEffective { get; set; }
+
+        /// <summary>
+        /// 补缴凭证号
+        /// </summary>
+        public string PaymentReference { get; set; }
+    }
+}
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace NCC.Extend.Entitys.Dto.LqKdQkbj
+{
+    /// <summary>
+    /// 开单欠款补缴记录更新输入
+    /// </summary>
+    public class LqKdQkbjUpInput : LqKdQkbjCrInput
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [Required(ErrorMessage = "主键不能为空")]
+        public string Id { get; set; }
+    }
+}
@@ -92,6 +92,13 @@ namespace NCC.Extend.Entitys.Dto.LqXhHyhk
         public decimal RefundedCount { get; set; }
  
         /// <summary>
+        /// 已储扣数量
+        /// </summary>
+        /// <remarks>该品项已储扣的次数</remarks>
+        /// <example>0</example>
+        public decimal DeductCount { get; set; }
+
+        /// <summary>
         /// 剩余数量
         /// </summary>
         /// <remarks>总购买数量减去已消费数量减去已退卡数量</remarks>
@@ -20,7 +20,7 @@ namespace NCC.Extend.Entitys.lq_kd_deductinfo
         /// 扣减类型
         /// </summary>
         [SugarColumn(ColumnName = "F_DeductType")]
-        public int? DeductType { get; set; }
+        public string DeductType { get; set; }
  
         /// <summary>
         /// 扣减关联ID
@@ -46,5 +46,35 @@ namespace NCC.Extend.Entitys.lq_kd_deductinfo
         /// </summary>
         [SugarColumn(ColumnName = "F_IsEffective")]
         public int? IsEffective { get; set; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        [SugarColumn(ColumnName = "F_UnitPrice")]
+        public decimal? UnitPrice { get; set; }
+
+        /// <summary>
+        /// 品项名称
+        /// </summary>
+        [SugarColumn(ColumnName = "F_ItemName")]
+        public string ItemName { get; set; }
+
+        /// <summary>
+        /// 品项id
+        /// </summary>
+        [SugarColumn(ColumnName = "F_ItemId")]
+        public string ItemId { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [SugarColumn(ColumnName = "F_CreateTime")]
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// 项目数量
+        /// </summary>
+        [SugarColumn(ColumnName = "F_ProjectNumber")]
+        public decimal? ProjectNumber { get; set; }
     }
 }
@@ -204,5 +204,18 @@ namespace NCC.Extend.Entitys.lq_kd_kdjlb
         [SugarColumn(ColumnName = "F_IsEffective")]
         public int IsEffective { get; set; } = 1;
  
+
+        /// <summary>
+        ///  作废关联id
+        /// </summary>
+        [SugarColumn(ColumnName = "F_CancelRefId")]
+        public string CancelRefId { get; set; }
+
+        /// <summary>
+        /// 作废关联备注
+        /// </summary>
+        [SugarColumn(ColumnName = "F_CancelRefRemarks")]
+        public string CancelRefRemarks { get; set; }
+
     }
 }
@@ -60,9 +60,6 @@ namespace NCC.Extend.Entitys.lq_kd_pxmx
         [SugarColumn(ColumnName = "F_CreateTIme")]
         public DateTime? CreateTIme { get; set; }
  
-
-
-
         /// <summary>
         /// 项目次数
         /// </summary>
@@ -98,5 +95,11 @@ namespace NCC.Extend.Entitys.lq_kd_pxmx
         /// </summary>
         [SugarColumn(ColumnName = "F_IsEffective")]
         public int IsEffective { get; set; } = 1;
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [SugarColumn(ColumnName = "F_Remark")]
+        public string Remark { get; set; }
     }
 }
+using System;
+using NCC.Common.Const;
+using SqlSugar;
+
+namespace NCC.Extend.Entitys.lq_kd_qkbj
+{
+    /// <summary>
+    /// 开单欠款补缴记录表
+    /// </summary>
+    [SugarTable("lq_kd_qkbj")]
+    [Tenant(ClaimConst.TENANT_ID)]
+    public class LqKdQkbjEntity
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)]
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 开单ID
+        /// </summary>
+        [SugarColumn(ColumnName = "F_BillingId")]
+        public string BillingId { get; set; }
+
+        /// <summary>
+        /// 补缴金额
+        /// </summary>
+        [SugarColumn(ColumnName = "F_PaymentAmount")]
+        public decimal PaymentAmount { get; set; }
+
+        /// <summary>
+        /// 补缴方式
+        /// </summary>
+        [SugarColumn(ColumnName = "F_PaymentMethod")]
+        public string PaymentMethod { get; set; }
+
+        /// <summary>
+        /// 补缴时间
+        /// </summary>
+        [SugarColumn(ColumnName = "F_PaymentTime")]
+        public DateTime PaymentTime { get; set; }
+
+        /// <summary>
+        /// 补缴操作人
+        /// </summary>
+        [SugarColumn(ColumnName = "F_PaymentUser")]
+        public string PaymentUser { get; set; }
+
+        /// <summary>
+        /// 补缴账户
+        /// </summary>
+        [SugarColumn(ColumnName = "F_PaymentAccount")]
+        public string PaymentAccount { get; set; }
+
+        /// <summary>
+        /// 补缴凭证号
+        /// </summary>
+        [SugarColumn(ColumnName = "F_PaymentReference")]
+        public string PaymentReference { get; set; }
+
+        /// <summary>
+        /// 补缴备注
+        /// </summary>
+        [SugarColumn(ColumnName = "F_Remark")]
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [SugarColumn(ColumnName = "F_CreateTime")]
+        public DateTime CreateTime { get; set; }
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        [SugarColumn(ColumnName = "F_UpdateTime")]
+        public DateTime UpdateTime { get; set; }
+
+        /// <summary>
+        /// 是否有效
+        /// </summary>
+        [SugarColumn(ColumnName = "F_IsEffective")]
+        public int IsEffective { get; set; } = 1;
+    }
+}
@@ -8,16 +8,16 @@ namespace NCC.Extend.Entitys.Enum
     public enum StatusEnum
     {
         /// <summary>
-        /// 有效
+        /// 无效
         /// </summary>
-        [Description("有效")]
-        有效 = 0,
+        [Description("无效")]
+        无效 = -1,
  
         /// <summary>
-        /// 无效
+        /// 有效
         /// </summary>
-        [Description("无效")]
-        无效 = 1,
+        [Description("有效")]
+        有效 = 1,
  
         /// <summary>
         /// 删除
@@ -136,6 +136,7 @@ namespace NCC.Extend.LqKdKdjlb
                         createTime = pxmx.CreateTIme,
                         totalPrice = pxmx.TotalPrice,
                         actualPrice = pxmx.ActualPrice,
+                        remark = pxmx.Remark,
                     };
  
                     // 关联该品项的健康师业绩
@@ -258,10 +259,33 @@ namespace NCC.Extend.LqKdKdjlb
             entity.Id = YitIdHelper.NextId().ToString();
             entity.CreateTime = DateTime.Now;
             entity.UpdateTime = DateTime.Now;
+            entity.IsEffective = StatusEnum.有效.GetHashCode();
             try
             {
                 //开启事务
                 _db.BeginTran();
+                //判断是否有作废关联id
+                if (!string.IsNullOrEmpty(input.cancelRefId))
+                {
+                    //查询作废关联id
+                    var cancelRefEntity = await _db.Queryable<LqKdKdjlbEntity>().FirstAsync(p => p.Id == input.cancelRefId);
+                    if (cancelRefEntity == null)
+                    {
+                        throw NCCException.Oh("作废关联id不存在");
+                    }
+                    //将作废关联id的IsEffective设置为0
+                    cancelRefEntity.IsEffective = StatusEnum.无效.GetHashCode();
+                    await _db.Updateable(cancelRefEntity).ExecuteCommandAsync();
+                    //把品项明细表的IsEffective设置为0
+                    await _db.Updateable<LqKdPxmxEntity>().Where(p => p.Glkdbh == input.cancelRefId).UpdateColumns(p => new LqKdPxmxEntity { IsEffective = StatusEnum.无效.GetHashCode() }).ExecuteCommandAsync();
+                    //把健康师业绩表的IsEffective设置为0
+                    await _db.Updateable<LqKdJksyjEntity>().Where(p => p.Glkdbh == input.cancelRefId).UpdateColumns(p => new LqKdJksyjEntity { IsEffective = StatusEnum.无效.GetHashCode() }).ExecuteCommandAsync();
+                    //把科技部老师业绩表的IsEffective设置为0
+                    await _db.Updateable<LqKdKjbsyjEntity>().Where(p => p.Glkdbh == input.cancelRefId).UpdateColumns(p => new LqKdKjbsyjEntity { IsEffective = StatusEnum.无效.GetHashCode() }).ExecuteCommandAsync();
+                    //把扣款信息表的IsEffective设置为0
+                    await _db.Updateable<LqKdDeductinfoEntity>().Where(p => p.BillingId == input.cancelRefId).UpdateColumns(p => new LqKdDeductinfoEntity { IsEffective = StatusEnum.无效.GetHashCode() }).ExecuteCommandAsync();
+                }
+
                 //新增开单记录表记录
                 entity.CreateUser = userInfo.userId;
                 entity.DeductAmount = input.lqKdKdjlbDeductList.Sum(x => x.Amount ?? 0);//计算储扣总金额
@@ -282,6 +306,12 @@ namespace NCC.Extend.LqKdKdjlb
                         DeductId = item.DeductId,
                         DeductType = item.DeductType,
                         Amount = item.Amount,
+                        ProjectNumber = item.ProjectNumber,
+                        UnitPrice = item.UnitPrice,
+                        ItemName = item.ItemName,
+                        ItemId = item.ItemId,
+                        IsEffective = StatusEnum.有效.GetHashCode(), // 设置为有效
+                        CreateTime = DateTime.Now, // 设置创建时间
                     };
                     allDeductEntities.Add(lqKdDeductEntity);
                 }
@@ -296,7 +326,7 @@ namespace NCC.Extend.LqKdKdjlb
                         Yjsj = input.kdrq,
                         CreateTIme = DateTime.Now,
                         MemberId = entity.Kdhy,
-                        IsEnabled = 0,
+                        IsEnabled = StatusEnum.有效.GetHashCode(),
                         ProjectNumber = item.projectNumber,
                         TotalPrice = (decimal)(item.pxjg * item.projectNumber),
                         Px = item.px,
@@ -304,6 +334,8 @@ namespace NCC.Extend.LqKdKdjlb
                         Pxjg = item.pxjg,
                         SourceType = item.sourceType,
                         ActualPrice = item.actualPrice,
+                        Remark = item.remark,
+                        IsEffective = StatusEnum.有效.GetHashCode(),
                     };
                     allPxmxEntities.Add(lqKdPxmxEntity);
  
@@ -325,6 +357,7 @@ namespace NCC.Extend.LqKdKdjlb
                                 Yjsj = input.kdrq,
                                 Jsj_id = ijks_tem.jsj_id,
                                 Kdpxid = lqKdPxmxEntity.Id,
+                                IsEffective = StatusEnum.有效.GetHashCode(),
                             });
                         }
                     }
@@ -345,6 +378,7 @@ namespace NCC.Extend.LqKdKdjlb
                                     Kjblsyj = ikjbs_tem.kjblsyj,
                                     Yjsj = input.kdrq,
                                     Kdpxid = lqKdPxmxEntity.Id,
+                                    IsEffective = StatusEnum.有效.GetHashCode(),
                                 }
                             );
                         }
@@ -352,6 +386,7 @@ namespace NCC.Extend.LqKdKdjlb
                 }
  
  
+
                 //通过会员id查询会员信息
                 var memberInfo = await _db.Queryable<LqKhxxEntity>().Where(u => u.Id == entity.Kdhy).FirstAsync();
                 //通过开单记录表查询这个会员开单金额
@@ -1263,7 +1298,7 @@ namespace NCC.Extend.LqKdKdjlb
                 //关闭事务
                 _db.CommitTran();
             }
-            catch (Exception ex) when (!(ex is NCCException))
+            catch (Exception)
             {
                 //回滚事务
                 _db.RollbackTran();
@@ -1440,7 +1475,7 @@ namespace NCC.Extend.LqKdKdjlb
                     importTime = DateTime.Now
                 };
             }
-            catch (Exception ex) when (!(ex is NCCException))
+            catch (Exception ex)
             {
                 _db.RollbackTran();
                 throw NCCException.Oh($"导入历史会员权益数据失败: {ex.Message}");
@@ -34,6 +34,7 @@ using NCC.FriendlyException;
 using NCC.JsonSerialization;
 using SqlSugar;
 using Yitter.IdGenerator;
+using NCC.Extend.Entitys.lq_kd_deductinfo;
  
 namespace NCC.Extend.LqKhxx
 {
@@ -578,6 +579,17 @@ namespace NCC.Extend.LqKhxx
                     })
                     .ToListAsync();
  
+                //查询储扣数据
+                var deductData = await _db.Queryable<LqKdDeductinfoEntity>()
+                    .Where(x => baseItems.Select(b => b.Id).Contains(x.DeductId))
+                    .GroupBy(x => x.DeductId)
+                    .Select(x => new
+                    {
+                        BillingItemId = x.DeductId,
+                        TotalDeduct = SqlFunc.AggregateSum(x.Amount)
+                    })
+                    .ToListAsync();
+
                 // 组装结果
                 var remainingItems = baseItems.Select(item => new RemainingItemInfo
                 {
@@ -589,12 +601,13 @@ namespace NCC.Extend.LqKhxx
                     TotalPurchased = item.ProjectNumber,
                     ConsumedCount = consumedData.FirstOrDefault(c => c.BillingItemId == item.Id)?.TotalConsumed ?? 0,
                     RefundedCount = refundedData.FirstOrDefault(r => r.BillingItemId == item.Id)?.TotalRefunded ?? 0,
+                    DeductCount = deductData.FirstOrDefault(d => d.BillingItemId == item.Id)?.TotalDeduct ?? 0,
                 }).ToList();
  
                 // 计算剩余数量
                 foreach (var item in remainingItems)
                 {
-                    item.RemainingCount = item.TotalPurchased - item.ConsumedCount - item.RefundedCount;
+                    item.RemainingCount = item.TotalPurchased - item.ConsumedCount - item.RefundedCount - item.DeductCount;
                 }
                 return new MemberRemainingItemsOutput
                 {
@@ -66,7 +66,7 @@ namespace NCC.Extend.Utils
             sb.AppendLine($"⏩欠款: {entity.qk}");
  
             // 抵扣：
-            sb.AppendLine($"⏩抵扣：{entity.ckmx ?? "无"}");
+            sb.AppendLine($"⏩抵扣：{entity.deductAmount}");
  
             // 来源：售后
             sb.AppendLine($"⏩来源：{entity.khly ?? "无"}");
@@ -78,7 +78,6 @@ namespace NCC.Extend.Utils
                 zdyj = 1000,
                 sfyj = 1000,
                 qk = 0,
-                ckmx = "无",
                 khly = "测试来源",
                 sfskdd = "无",
                 jj = "这是一条测试开单记录",