diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoCrInput.cs index 9be1f65..61e1480 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoCrInput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoCrInput.cs @@ -17,10 +17,10 @@ namespace NCC.Extend.Entitys.Dto.LqKdDeductinfo /// 扣减类型 /// [Required(ErrorMessage = "扣减类型不能为空")] - public int? DeductType { get; set; } + public string DeductType { get; set; } /// - /// 扣减关联ID + /// 扣减品项关联ID /// [Required(ErrorMessage = "扣减关联ID不能为空")] public string DeductId { get; set; } @@ -28,7 +28,6 @@ namespace NCC.Extend.Entitys.Dto.LqKdDeductinfo /// /// 开单id /// - [Required(ErrorMessage = "开单id不能为空")] public string BillingId { get; set; } /// @@ -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; } + + /// + /// 是否有效 + /// + public int? IsEffective { get; set; } + + /// + /// 单价 + /// + public decimal? UnitPrice { get; set; } + + /// + /// 品项名称 + /// + public string ItemName { get; set; } + + /// + /// 品项id + /// + public string ItemId { get; set; } + + /// + /// 品项次数 + /// + public decimal? ProjectNumber { get; set; } + + /// + /// 创建时间 + /// + public DateTime? CreateTime { get; set; } } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoInfoOutput.cs index 29ef734..2caf217 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoInfoOutput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoInfoOutput.cs @@ -36,5 +36,30 @@ namespace NCC.Extend.Entitys.Dto.LqKdDeductinfo /// 合计金额 /// public decimal? Amount { get; set; } + + /// + /// 是否有效 + /// + public int? IsEffective { get; set; } + + /// + /// 单价 + /// + public decimal? UnitPrice { get; set; } + + /// + /// 品项名称 + /// + public string ItemName { get; set; } + + /// + /// 品项id + /// + public string ItemId { get; set; } + + /// + /// 创建时间 + /// + public DateTime? CreateTime { get; set; } } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoListOutput.cs index fcd8bcf..64e03c5 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoListOutput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoListOutput.cs @@ -36,5 +36,30 @@ namespace NCC.Extend.Entitys.Dto.LqKdDeductinfo /// 合计金额 /// public decimal? Amount { get; set; } + + /// + /// 是否有效 + /// + public int? IsEffective { get; set; } + + /// + /// 单价 + /// + public decimal? UnitPrice { get; set; } + + /// + /// 品项名称 + /// + public string ItemName { get; set; } + + /// + /// 品项id + /// + public string ItemId { get; set; } + + /// + /// 创建时间 + /// + public DateTime? CreateTime { get; set; } } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoListQueryInput.cs index 6565663..9126ec9 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoListQueryInput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoListQueryInput.cs @@ -31,5 +31,40 @@ namespace NCC.Extend.Entitys.Dto.LqKdDeductinfo /// 最大金额 /// public decimal? MaxAmount { get; set; } + + /// + /// 是否有效 + /// + public int? IsEffective { get; set; } + + /// + /// 品项名称 + /// + public string ItemName { get; set; } + + /// + /// 品项id + /// + public string ItemId { get; set; } + + /// + /// 最小单价 + /// + public decimal? MinUnitPrice { get; set; } + + /// + /// 最大单价 + /// + public decimal? MaxUnitPrice { get; set; } + + /// + /// 开始创建时间 + /// + public DateTime? StartCreateTime { get; set; } + + /// + /// 结束创建时间 + /// + public DateTime? EndCreateTime { get; set; } } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbCrInput.cs index d389f03..5f846b8 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbCrInput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbCrInput.cs @@ -146,6 +146,16 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb public string F_FIleUrl { get; set; } /// + /// 作废关联id + /// + public string cancelRefId { get; set; } + + /// + /// 作废关联备注 + /// + public string cancelRefRemarks { get; set; } + + /// /// 扣款信息 /// public List lqKdKdjlbDeductList { get; set; } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbInfoOutput.cs index 8a59841..7887b9b 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbInfoOutput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbInfoOutput.cs @@ -59,10 +59,11 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb /// public string ckfs { get; set; } + /// - /// 储扣明细 + /// 储扣总金额 /// - public string ckmx { get; set; } + public decimal deductAmount { get; set; } /// /// 付款方式 diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdPxmx/LqKdPxmxCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdPxmx/LqKdPxmxCrInput.cs index 8cf281d..ece452d 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdPxmx/LqKdPxmxCrInput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdPxmx/LqKdPxmxCrInput.cs @@ -54,14 +54,14 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb public decimal projectNumber { get; set; } /// - /// 是否有效 + /// 来源类型 /// - public int? isEnabled { get; set; } = 0; + public string sourceType { get; set; } /// - /// 来源类型 + /// 备注 /// - public string sourceType { get; set; } + public string remark { get; set; } /// /// 健康师业绩 diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdPxmx/LqKdPxmxInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdPxmx/LqKdPxmxInfoOutput.cs index a044f1d..ef17a42 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdPxmx/LqKdPxmxInfoOutput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdPxmx/LqKdPxmxInfoOutput.cs @@ -68,6 +68,12 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb /// public decimal actualPrice { get; set; } + + /// + /// 备注 + /// + public string remark { get; set; } + /// /// 健康师业绩列表 /// diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjCrInput.cs new file mode 100644 index 0000000..072114e --- /dev/null +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjCrInput.cs @@ -0,0 +1,57 @@ +using System; +using System.ComponentModel.DataAnnotations; + +namespace NCC.Extend.Entitys.Dto.LqKdQkbj +{ + /// + /// 开单欠款补缴记录创建输入 + /// + public class LqKdQkbjCrInput + { + /// + /// 开单ID + /// + [Required(ErrorMessage = "开单ID不能为空")] + public string BillingId { get; set; } + + /// + /// 补缴金额 + /// + [Required(ErrorMessage = "补缴金额不能为空")] + [Range(0.01, 999999.99, ErrorMessage = "补缴金额必须在0.01到999999.99之间")] + public decimal PaymentAmount { get; set; } + + /// + /// 补缴方式 + /// + [Required(ErrorMessage = "补缴方式不能为空")] + public string PaymentMethod { get; set; } + + /// + /// 补缴时间 + /// + [Required(ErrorMessage = "补缴时间不能为空")] + public DateTime PaymentTime { get; set; } + + /// + /// 补缴操作人 + /// + public string PaymentUser { get; set; } + + /// + /// 补缴账户 + /// + public string PaymentAccount { get; set; } + + /// + /// 补缴凭证号 + /// + public string PaymentReference { get; set; } + + /// + /// 补缴备注 + /// + [StringLength(500, ErrorMessage = "补缴备注不能超过500个字符")] + public string Remark { get; set; } + } +} diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjInfoOutput.cs new file mode 100644 index 0000000..3437564 --- /dev/null +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjInfoOutput.cs @@ -0,0 +1,80 @@ +using System; + +namespace NCC.Extend.Entitys.Dto.LqKdQkbj +{ + /// + /// 开单欠款补缴记录详情输出 + /// + public class LqKdQkbjInfoOutput + { + /// + /// 主键 + /// + public string Id { get; set; } + + /// + /// 开单ID + /// + public string BillingId { get; set; } + + /// + /// 补缴金额 + /// + public decimal PaymentAmount { get; set; } + + /// + /// 补缴方式 + /// + public string PaymentMethod { get; set; } + + /// + /// 补缴方式名称 + /// + public string PaymentMethodName { get; set; } + + /// + /// 补缴时间 + /// + public DateTime PaymentTime { get; set; } + + /// + /// 补缴操作人 + /// + public string PaymentUser { get; set; } + + /// + /// 补缴操作人姓名 + /// + public string PaymentUserName { get; set; } + + /// + /// 补缴账户 + /// + public string PaymentAccount { get; set; } + + /// + /// 补缴凭证号 + /// + public string PaymentReference { get; set; } + + /// + /// 补缴备注 + /// + public string Remark { get; set; } + + /// + /// 创建时间 + /// + public DateTime CreateTime { get; set; } + + /// + /// 更新时间 + /// + public DateTime UpdateTime { get; set; } + + /// + /// 是否有效 + /// + public int IsEffective { get; set; } + } +} diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjListOutput.cs new file mode 100644 index 0000000..0e6a76d --- /dev/null +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjListOutput.cs @@ -0,0 +1,75 @@ +using System; + +namespace NCC.Extend.Entitys.Dto.LqKdQkbj +{ + /// + /// 开单欠款补缴记录列表输出 + /// + public class LqKdQkbjListOutput + { + /// + /// 主键 + /// + public string Id { get; set; } + + /// + /// 开单ID + /// + public string BillingId { get; set; } + + /// + /// 补缴金额 + /// + public decimal PaymentAmount { get; set; } + + /// + /// 补缴方式 + /// + public string PaymentMethod { get; set; } + + /// + /// 补缴方式名称 + /// + public string PaymentMethodName { get; set; } + + /// + /// 补缴时间 + /// + public DateTime PaymentTime { get; set; } + + /// + /// 补缴操作人 + /// + public string PaymentUser { get; set; } + + /// + /// 补缴操作人姓名 + /// + public string PaymentUserName { get; set; } + + /// + /// 补缴账户 + /// + public string PaymentAccount { get; set; } + + /// + /// 补缴凭证号 + /// + public string PaymentReference { get; set; } + + /// + /// 补缴备注 + /// + public string Remark { get; set; } + + /// + /// 创建时间 + /// + public DateTime CreateTime { get; set; } + + /// + /// 是否有效 + /// + public int IsEffective { get; set; } + } +} diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjListQueryInput.cs new file mode 100644 index 0000000..8f45140 --- /dev/null +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjListQueryInput.cs @@ -0,0 +1,55 @@ +using System; + +namespace NCC.Extend.Entitys.Dto.LqKdQkbj +{ + /// + /// 开单欠款补缴记录列表查询输入 + /// + public class LqKdQkbjListQueryInput + { + /// + /// 开单ID + /// + public string BillingId { get; set; } + + /// + /// 补缴方式 + /// + public string PaymentMethod { get; set; } + + /// + /// 补缴操作人 + /// + public string PaymentUser { get; set; } + + /// + /// 最小补缴金额 + /// + public decimal? MinPaymentAmount { get; set; } + + /// + /// 最大补缴金额 + /// + public decimal? MaxPaymentAmount { get; set; } + + /// + /// 开始补缴时间 + /// + public DateTime? StartPaymentTime { get; set; } + + /// + /// 结束补缴时间 + /// + public DateTime? EndPaymentTime { get; set; } + + /// + /// 是否有效 + /// + public int? IsEffective { get; set; } + + /// + /// 补缴凭证号 + /// + public string PaymentReference { get; set; } + } +} diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjUpInput.cs new file mode 100644 index 0000000..1f35e7c --- /dev/null +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjUpInput.cs @@ -0,0 +1,17 @@ +using System; +using System.ComponentModel.DataAnnotations; + +namespace NCC.Extend.Entitys.Dto.LqKdQkbj +{ + /// + /// 开单欠款补缴记录更新输入 + /// + public class LqKdQkbjUpInput : LqKdQkbjCrInput + { + /// + /// 主键 + /// + [Required(ErrorMessage = "主键不能为空")] + public string Id { get; set; } + } +} diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/MemberRemainingItemsOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/MemberRemainingItemsOutput.cs index 83144e0..2ab5392 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/MemberRemainingItemsOutput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/MemberRemainingItemsOutput.cs @@ -92,6 +92,13 @@ namespace NCC.Extend.Entitys.Dto.LqXhHyhk public decimal RefundedCount { get; set; } /// + /// 已储扣数量 + /// + /// 该品项已储扣的次数 + /// 0 + public decimal DeductCount { get; set; } + + /// /// 剩余数量 /// /// 总购买数量减去已消费数量减去已退卡数量 diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_deductinfo/LqKdDeductinfoEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_deductinfo/LqKdDeductinfoEntity.cs index 79cedb8..3a94f44 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_deductinfo/LqKdDeductinfoEntity.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_deductinfo/LqKdDeductinfoEntity.cs @@ -20,7 +20,7 @@ namespace NCC.Extend.Entitys.lq_kd_deductinfo /// 扣减类型 /// [SugarColumn(ColumnName = "F_DeductType")] - public int? DeductType { get; set; } + public string DeductType { get; set; } /// /// 扣减关联ID @@ -46,5 +46,35 @@ namespace NCC.Extend.Entitys.lq_kd_deductinfo /// [SugarColumn(ColumnName = "F_IsEffective")] public int? IsEffective { get; set; } + + /// + /// 单价 + /// + [SugarColumn(ColumnName = "F_UnitPrice")] + public decimal? UnitPrice { get; set; } + + /// + /// 品项名称 + /// + [SugarColumn(ColumnName = "F_ItemName")] + public string ItemName { get; set; } + + /// + /// 品项id + /// + [SugarColumn(ColumnName = "F_ItemId")] + public string ItemId { get; set; } + + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "F_CreateTime")] + public DateTime? CreateTime { get; set; } + + /// + /// 项目数量 + /// + [SugarColumn(ColumnName = "F_ProjectNumber")] + public decimal? ProjectNumber { get; set; } } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_kdjlb/LqKdKdjlbEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_kdjlb/LqKdKdjlbEntity.cs index 309e905..a7e1062 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_kdjlb/LqKdKdjlbEntity.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_kdjlb/LqKdKdjlbEntity.cs @@ -204,5 +204,18 @@ namespace NCC.Extend.Entitys.lq_kd_kdjlb [SugarColumn(ColumnName = "F_IsEffective")] public int IsEffective { get; set; } = 1; + + /// + /// 作废关联id + /// + [SugarColumn(ColumnName = "F_CancelRefId")] + public string CancelRefId { get; set; } + + /// + /// 作废关联备注 + /// + [SugarColumn(ColumnName = "F_CancelRefRemarks")] + public string CancelRefRemarks { get; set; } + } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_pxmx/LqKdPxmxEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_pxmx/LqKdPxmxEntity.cs index 4877810..bc62ca2 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_pxmx/LqKdPxmxEntity.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_pxmx/LqKdPxmxEntity.cs @@ -60,9 +60,6 @@ namespace NCC.Extend.Entitys.lq_kd_pxmx [SugarColumn(ColumnName = "F_CreateTIme")] public DateTime? CreateTIme { get; set; } - - - /// /// 项目次数 /// @@ -98,5 +95,11 @@ namespace NCC.Extend.Entitys.lq_kd_pxmx /// [SugarColumn(ColumnName = "F_IsEffective")] public int IsEffective { get; set; } = 1; + + /// + /// 备注 + /// + [SugarColumn(ColumnName = "F_Remark")] + public string Remark { get; set; } } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_qkbj/LqKdQkbjEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_qkbj/LqKdQkbjEntity.cs new file mode 100644 index 0000000..952ddc8 --- /dev/null +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_qkbj/LqKdQkbjEntity.cs @@ -0,0 +1,86 @@ +using System; +using NCC.Common.Const; +using SqlSugar; + +namespace NCC.Extend.Entitys.lq_kd_qkbj +{ + /// + /// 开单欠款补缴记录表 + /// + [SugarTable("lq_kd_qkbj")] + [Tenant(ClaimConst.TENANT_ID)] + public class LqKdQkbjEntity + { + /// + /// 主键 + /// + [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)] + public string Id { get; set; } + + /// + /// 开单ID + /// + [SugarColumn(ColumnName = "F_BillingId")] + public string BillingId { get; set; } + + /// + /// 补缴金额 + /// + [SugarColumn(ColumnName = "F_PaymentAmount")] + public decimal PaymentAmount { get; set; } + + /// + /// 补缴方式 + /// + [SugarColumn(ColumnName = "F_PaymentMethod")] + public string PaymentMethod { get; set; } + + /// + /// 补缴时间 + /// + [SugarColumn(ColumnName = "F_PaymentTime")] + public DateTime PaymentTime { get; set; } + + /// + /// 补缴操作人 + /// + [SugarColumn(ColumnName = "F_PaymentUser")] + public string PaymentUser { get; set; } + + /// + /// 补缴账户 + /// + [SugarColumn(ColumnName = "F_PaymentAccount")] + public string PaymentAccount { get; set; } + + /// + /// 补缴凭证号 + /// + [SugarColumn(ColumnName = "F_PaymentReference")] + public string PaymentReference { get; set; } + + /// + /// 补缴备注 + /// + [SugarColumn(ColumnName = "F_Remark")] + public string Remark { get; set; } + + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "F_CreateTime")] + public DateTime CreateTime { get; set; } + + /// + /// 更新时间 + /// + [SugarColumn(ColumnName = "F_UpdateTime")] + public DateTime UpdateTime { get; set; } + + /// + /// 是否有效 + /// + [SugarColumn(ColumnName = "F_IsEffective")] + public int IsEffective { get; set; } = 1; + } +} diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Enum/StatusEnum.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Enum/StatusEnum.cs index c71b3da..b2b34c5 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Enum/StatusEnum.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Enum/StatusEnum.cs @@ -8,16 +8,16 @@ namespace NCC.Extend.Entitys.Enum public enum StatusEnum { /// - /// 有效 + /// 无效 /// - [Description("有效")] - 有效 = 0, + [Description("无效")] + 无效 = -1, /// - /// 无效 + /// 有效 /// - [Description("无效")] - 无效 = 1, + [Description("有效")] + 有效 = 1, /// /// 删除 diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs index 2281a66..5f9fa48 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs @@ -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().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().Where(p => p.Glkdbh == input.cancelRefId).UpdateColumns(p => new LqKdPxmxEntity { IsEffective = StatusEnum.无效.GetHashCode() }).ExecuteCommandAsync(); + //把健康师业绩表的IsEffective设置为0 + await _db.Updateable().Where(p => p.Glkdbh == input.cancelRefId).UpdateColumns(p => new LqKdJksyjEntity { IsEffective = StatusEnum.无效.GetHashCode() }).ExecuteCommandAsync(); + //把科技部老师业绩表的IsEffective设置为0 + await _db.Updateable().Where(p => p.Glkdbh == input.cancelRefId).UpdateColumns(p => new LqKdKjbsyjEntity { IsEffective = StatusEnum.无效.GetHashCode() }).ExecuteCommandAsync(); + //把扣款信息表的IsEffective设置为0 + await _db.Updateable().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().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}"); diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs index b37d91f..a30ca78 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs @@ -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() + .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 { diff --git a/netcore/src/Modularity/Extend/NCC.Extend/Utils/LqKdKdjlbStringGenerator.cs b/netcore/src/Modularity/Extend/NCC.Extend/Utils/LqKdKdjlbStringGenerator.cs index 39bb54f..c8a50cd 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/Utils/LqKdKdjlbStringGenerator.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/Utils/LqKdKdjlbStringGenerator.cs @@ -66,7 +66,7 @@ namespace NCC.Extend.Utils sb.AppendLine($"⏩欠款: {entity.qk}"); // 抵扣： - sb.AppendLine($"⏩抵扣：{entity.ckmx ?? "无"}"); + sb.AppendLine($"⏩抵扣：{entity.deductAmount}"); // 来源：售后 sb.AppendLine($"⏩来源：{entity.khly ?? "无"}"); diff --git a/netcore/src/Modularity/Extend/NCC.Extend/Utils/WeChatBotTestController.cs b/netcore/src/Modularity/Extend/NCC.Extend/Utils/WeChatBotTestController.cs index 3fc0d7e..f3630e1 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/Utils/WeChatBotTestController.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/Utils/WeChatBotTestController.cs @@ -78,7 +78,6 @@ namespace NCC.Extend.Utils zdyj = 1000, sfyj = 1000, qk = 0, - ckmx = "无", khly = "测试来源", sfskdd = "无", jj = "这是一条测试开单记录",