From 2164125ca88bd48c26099c2f46b189fa230ae737 Mon Sep 17 00:00:00 2001 From: “wangming” <“wangming@antissoft.com”> Date: Tue, 14 Oct 2025 18:02:33 +0800 Subject: [PATCH] feat: 删除LqXhmxb相关代码并优化LqXhHyhkService --- antis-ncc-admin/src/views/lqXhmxb/ExportBox.vue | 66 ------------------------------------------------------------------ antis-ncc-admin/src/views/lqXhmxb/Form.vue | 197 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- antis-ncc-admin/src/views/lqXhmxb/index.vue | 319 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoInfoOutput.cs | 27 ++++++++++++++++----------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/DebtPaymentQueryInput.cs | 36 ------------------------------------ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/DebtPaymentRecordOutput.cs | 59 ----------------------------------------------------------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/DebtRecordQueryInput.cs | 18 ++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbCrInput.cs | 10 ++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbInfoOutput.cs | 21 +++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbListOutput.cs | 5 +++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/PayDebtInput.cs | 50 -------------------------------------------------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdPxmx/LqKdPxmxInfoOutput.cs | 2 +- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjCrInput.cs | 57 --------------------------------------------------------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjInfoOutput.cs | 80 -------------------------------------------------------------------------------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjListOutput.cs | 75 --------------------------------------------------------------------------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjListQueryInput.cs | 55 ------------------------------------------------------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjUpInput.cs | 17 ----------------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbInfoOutput.cs | 5 +++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbListOutput.cs | 5 +++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkMemberCardUsageOutput.cs | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkMemberCardUsageQueryInput.cs | 32 ++++++++++++++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhJksyjQueryInput.cs | 36 ++++++++++++++++++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhJksyj/LqXhJksyjInfoOutput.cs | 26 +++++++++++++++++++++----- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbCrInput.cs | 82 ---------------------------------------------------------------------------------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbInfoOutput.cs | 82 ---------------------------------------------------------------------------------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbListOutput.cs | 81 --------------------------------------------------------------------------------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbListQueryInput.cs | 93 --------------------------------------------------------------------------------------------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbUpInput.cs | 17 ----------------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_hytk/LqHytkHytkEntity.cs | 8 -------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_jksyj/LqHytkJksyjEntity.cs | 8 +------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_kjbsyj/LqHytkKjbsyjEntity.cs | 7 +------ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_mx/LqHytkMxEntity.cs | 14 +------------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_kdjlb/LqKdKdjlbEntity.cs | 12 ++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_qkbj/LqKdQkbjEntity.cs | 74 -------------------------------------------------------------------------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_khxx/LqKhxxEntity.cs | 7 +++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_tkjlb/LqTkjlbEntity.cs | 3 +++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_hyhk/LqXhHyhkEntity.cs | 3 ++- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xhmxb/LqXhmxbEntity.cs | 99 --------------------------------------------------------------------------------------------------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Mapper/LqXhmxbMapper.cs | 14 -------------- netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqXhmxbService.cs | 6 ------ netcore/src/Modularity/Extend/NCC.Extend/LqHytkHytkService.cs | 47 ++++++++++++++++++++++++++++------------------- netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs | 227 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------- netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs | 6 ++++-- netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs | 6 +++++- netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs | 277 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------- netcore/src/Modularity/Extend/NCC.Extend/LqXhmxbService.cs | 273 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- netcore/src/Modularity/Extend/NCC.Extend/Utils/LqKdKdjlbStringGenerator.cs | 5 +++-- 47 files changed, 653 insertions(+), 2103 deletions(-) delete mode 100644 antis-ncc-admin/src/views/lqXhmxb/ExportBox.vue delete mode 100644 antis-ncc-admin/src/views/lqXhmxb/Form.vue delete mode 100644 antis-ncc-admin/src/views/lqXhmxb/index.vue delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/DebtPaymentQueryInput.cs delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/DebtPaymentRecordOutput.cs create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/DebtRecordQueryInput.cs delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/PayDebtInput.cs delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjCrInput.cs delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjInfoOutput.cs delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjListOutput.cs delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjListQueryInput.cs delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjUpInput.cs create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkMemberCardUsageOutput.cs create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkMemberCardUsageQueryInput.cs create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhJksyjQueryInput.cs delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbCrInput.cs delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbInfoOutput.cs delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbListOutput.cs delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbListQueryInput.cs delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbUpInput.cs delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_qkbj/LqKdQkbjEntity.cs delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xhmxb/LqXhmxbEntity.cs delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Mapper/LqXhmxbMapper.cs delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqXhmxbService.cs delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend/LqXhmxbService.cs diff --git a/antis-ncc-admin/src/views/lqXhmxb/ExportBox.vue b/antis-ncc-admin/src/views/lqXhmxb/ExportBox.vue deleted file mode 100644 index 4fc5c07..0000000 --- a/antis-ncc-admin/src/views/lqXhmxb/ExportBox.vue +++ /dev/null @@ -1,66 +0,0 @@ - - - - \ No newline at end of file diff --git a/antis-ncc-admin/src/views/lqXhmxb/Form.vue b/antis-ncc-admin/src/views/lqXhmxb/Form.vue deleted file mode 100644 index 83c9ce4..0000000 --- a/antis-ncc-admin/src/views/lqXhmxb/Form.vue +++ /dev/null @@ -1,197 +0,0 @@ - - diff --git a/antis-ncc-admin/src/views/lqXhmxb/index.vue b/antis-ncc-admin/src/views/lqXhmxb/index.vue deleted file mode 100644 index c1d73d9..0000000 --- a/antis-ncc-admin/src/views/lqXhmxb/index.vue +++ /dev/null @@ -1,319 +0,0 @@ - - \ No newline at end of file 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 3d9d336..f527054 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 @@ -10,57 +10,62 @@ namespace NCC.Extend.Entitys.Dto.LqKdDeductinfo /// /// 主键 /// - public string Id { get; set; } + public string id { get; set; } /// /// 扣减类型 /// - public string DeductType { get; set; } + public string deductType { get; set; } /// /// 扣减类型名称 /// - public string DeductTypeName { get; set; } + public string deductTypeName { get; set; } /// /// 扣减关联ID /// - public string DeductId { get; set; } + public string deductId { get; set; } /// /// 开单id /// - public string BillingId { get; set; } + public string billingId { get; set; } /// /// 合计金额 /// - public decimal? Amount { get; set; } + public decimal? amount { get; set; } /// /// 是否有效 /// - public int? IsEffective { get; set; } + public int? isEffective { get; set; } /// /// 单价 /// - public decimal? UnitPrice { get; set; } + public decimal? unitPrice { get; set; } /// /// 品项名称 /// - public string ItemName { get; set; } + public string itemName { get; set; } /// /// 品项id /// - public string ItemId { get; set; } + public string itemId { get; set; } + + /// + /// 项目数量 + /// + public decimal? projectNumber { get; set; } /// /// 创建时间 /// - public DateTime? CreateTime { get; set; } + public DateTime? createTime { get; set; } } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/DebtPaymentQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/DebtPaymentQueryInput.cs deleted file mode 100644 index 6e7096a..0000000 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/DebtPaymentQueryInput.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations; -using NCC.Common.Filter; - -namespace NCC.Extend.Entitys.Dto.LqKdKdjlb -{ - /// - /// 补缴欠款记录查询输入 - /// - public class DebtPaymentQueryInput : PageInputBase - { - /// - /// 开单记录ID - /// - [Display(Name = "开单记录ID", Description = "开单记录ID")] - public string BillingId { get; set; } - - /// - /// 付款日期开始 - /// - [Display(Name = "付款日期开始", Description = "付款日期范围开始")] - public DateTime? PaymentDateStart { get; set; } - - /// - /// 付款日期结束 - /// - [Display(Name = "付款日期结束", Description = "付款日期范围结束")] - public DateTime? PaymentDateEnd { get; set; } - - /// - /// 收款人员 - /// - [Display(Name = "收款人员", Description = "收款人员")] - public string PaymentUser { get; set; } - } -} diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/DebtPaymentRecordOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/DebtPaymentRecordOutput.cs deleted file mode 100644 index 269f281..0000000 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/DebtPaymentRecordOutput.cs +++ /dev/null @@ -1,59 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations; - -namespace NCC.Extend.Entitys.Dto.LqKdKdjlb -{ - /// - /// 补缴欠款记录输出 - /// - public class DebtPaymentRecordOutput - { - /// - /// 补缴记录ID - /// - [Display(Name = "补缴记录ID", Description = "补缴欠款记录的唯一标识")] - public string Id { get; set; } - - /// - /// 开单记录ID - /// - [Display(Name = "开单记录ID", Description = "关联的开单记录ID")] - public string BillingId { get; set; } - - /// - /// 补缴金额 - /// - [Display(Name = "补缴金额", Description = "客户补缴的欠款金额")] - public decimal PaymentAmount { get; set; } - - /// - /// 付款方式 - /// - [Display(Name = "付款方式", Description = "客户付款的方式")] - public string PaymentMethod { get; set; } - - /// - /// 付款日期 - /// - [Display(Name = "付款日期", Description = "客户实际付款的日期")] - public DateTime PaymentDate { get; set; } - - /// - /// 收款人员 - /// - [Display(Name = "收款人员", Description = "负责收款的工作人员")] - public string PaymentUser { get; set; } - - /// - /// 备注 - /// - [Display(Name = "备注", Description = "补缴欠款的备注信息")] - public string Remarks { get; set; } - - /// - /// 创建时间 - /// - [Display(Name = "创建时间", Description = "补缴记录的创建时间")] - public DateTime CreateTime { get; set; } - } -} diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/DebtRecordQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/DebtRecordQueryInput.cs new file mode 100644 index 0000000..71c1066 --- /dev/null +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/DebtRecordQueryInput.cs @@ -0,0 +1,18 @@ +using System.ComponentModel.DataAnnotations; +using NCC.Common.Filter; + +namespace NCC.Extend.Entitys.Dto.LqKdKdjlb +{ + /// + /// 门店欠款记录查询输入 + /// + public class DebtRecordQueryInput : PageInputBase + { + /// + /// 门店ID + /// + [Required(ErrorMessage = "门店ID不能为空")] + [Display(Name = "门店ID", Description = "查询欠款记录的门店ID")] + public string StoreId { 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 b0c537c..507cf03 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 @@ -161,6 +161,16 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb public string cancelRefRemarks { get; set; } /// + /// 补缴开单ID + /// + public string supplementBillingId { get; set; } + + /// + /// 补缴金额 + /// + public decimal supplementAmount { 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 eb0f078..f3c8a38 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 @@ -157,6 +157,27 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb public int IsEffective { get; set; } /// + /// 补缴开单ID + /// + public string SupplementBillingId { get; set; } + + /// + /// 补缴金额 + /// + public decimal SupplementAmount { get; set; } + + /// + /// 已缴欠款 + /// + public decimal PaidDebt { get; set; } + + + /// + /// 作废关联备注 + /// + public string CancelRefRemarks { get; set; } + + /// /// 健康师业绩 /// public List lqKdJksyjList { get; set; } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbListOutput.cs index 7b41111..bce8df5 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbListOutput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbListOutput.cs @@ -53,6 +53,11 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb public decimal qk { get; set; } /// + /// 已缴欠款 + /// + public decimal PaidDebt { get; set; } + + /// /// 储扣方式 /// public string ckfs { get; set; } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/PayDebtInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/PayDebtInput.cs deleted file mode 100644 index 9ed5b6d..0000000 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/PayDebtInput.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations; - -namespace NCC.Extend.Entitys.Dto.LqKdKdjlb -{ - /// - /// 补缴欠款输入 - /// - public class PayDebtInput - { - /// - /// 开单记录ID - /// - [Required(ErrorMessage = "开单记录ID不能为空")] - [Display(Name = "开单记录ID", Description = "需要补缴欠款的开单记录ID")] - public string BillingId { get; set; } - - /// - /// 补缴金额 - /// - [Required(ErrorMessage = "补缴金额不能为空")] - [Range(0.01, double.MaxValue, ErrorMessage = "补缴金额必须大于0")] - [Display(Name = "补缴金额", Description = "客户补缴的欠款金额")] - public decimal PaymentAmount { get; set; } - - /// - /// 付款方式 - /// - [Display(Name = "付款方式", Description = "客户付款的方式（现金、刷卡、转账等）")] - public string PaymentMethod { get; set; } - - /// - /// 付款日期 - /// - [Display(Name = "付款日期", Description = "客户实际付款的日期")] - public DateTime? PaymentDate { get; set; } - - /// - /// 收款人员 - /// - [Display(Name = "收款人员", Description = "负责收款的工作人员")] - public string PaymentUser { get; set; } - - /// - /// 备注 - /// - [Display(Name = "备注", Description = "补缴欠款的备注信息")] - public string Remarks { 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 63f11d7..b35ae72 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 @@ -78,7 +78,7 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb /// /// 是否有效 /// - public int IsEffective { get; set; } + public int isEffective { 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 deleted file mode 100644 index 072114e..0000000 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjCrInput.cs +++ /dev/null @@ -1,57 +0,0 @@ -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 deleted file mode 100644 index 3437564..0000000 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjInfoOutput.cs +++ /dev/null @@ -1,80 +0,0 @@ -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 deleted file mode 100644 index 0e6a76d..0000000 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjListOutput.cs +++ /dev/null @@ -1,75 +0,0 @@ -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 deleted file mode 100644 index 8f45140..0000000 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjListQueryInput.cs +++ /dev/null @@ -1,55 +0,0 @@ -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 deleted file mode 100644 index 1f35e7c..0000000 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjUpInput.cs +++ /dev/null @@ -1,17 +0,0 @@ -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/LqTkjlb/LqTkjlbInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbInfoOutput.cs index cf9527e..9bc591e 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbInfoOutput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbInfoOutput.cs @@ -82,5 +82,10 @@ namespace NCC.Extend.Entitys.Dto.LqTkjlb /// 拓客活动名称 /// public string eventName { get; set; } + + /// + /// 是否有效 + /// + public int isEffective { get; set; } } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbListOutput.cs index 3d2a112..762f432 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbListOutput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbListOutput.cs @@ -92,5 +92,10 @@ namespace NCC.Extend.Entitys.Dto.LqTkjlb /// 拓客活动名称 /// public string eventName { get; set; } + + /// + /// 是否有效 + /// + public int isEffective { get; set; } } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkMemberCardUsageOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkMemberCardUsageOutput.cs new file mode 100644 index 0000000..8b2a0f4 --- /dev/null +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkMemberCardUsageOutput.cs @@ -0,0 +1,107 @@ +using System; +using System.Collections.Generic; + +namespace NCC.Extend.Entitys.Dto.LqXhHyhk +{ + /// + /// 会员耗卡记录输出 + /// + public class LqXhHyhkMemberCardUsageOutput + { + /// + /// 耗卡记录ID + /// + public string Id { get; set; } + + /// + /// 会员ID + /// + public string MemberId { get; set; } + + /// + /// 会员姓名 + /// + public string MemberName { get; set; } + + /// + /// 门店ID + /// + public string StoreId { get; set; } + + /// + /// 门店名称 + /// + public string StoreName { get; set; } + + /// + /// 耗卡时间 + /// + public DateTime? UsageDate { get; set; } + + /// + /// 消费金额 + /// + public decimal? TotalAmount { get; set; } + + /// + /// 备注 + /// + public string Remarks { get; set; } + + /// + /// 创建时间 + /// + public DateTime? CreateTime { get; set; } + + /// + /// 品项明细列表 + /// + public List ItemDetails { get; set; } = new List(); + } + + /// + /// 会员耗卡记录品项明细 + /// + public class LqXhHyhkMemberCardUsageItemDetail + { + /// + /// 明细ID + /// + public string Id { get; set; } + + /// + /// 品项ID + /// + public string ItemId { get; set; } + + /// + /// 品项名称 + /// + public string ItemName { get; set; } + + /// + /// 单价 + /// + public decimal? UnitPrice { get; set; } + + /// + /// 项目次数 + /// + public int? ProjectNumber { get; set; } + + /// + /// 合计金额 + /// + public decimal? TotalPrice { get; set; } + + /// + /// 来源类型 + /// + public string SourceType { get; set; } + + /// + /// 创建时间 + /// + public DateTime? CreateTime { get; set; } + } +} diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkMemberCardUsageQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkMemberCardUsageQueryInput.cs new file mode 100644 index 0000000..5de9d47 --- /dev/null +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkMemberCardUsageQueryInput.cs @@ -0,0 +1,32 @@ +using NCC.Common.Filter; +using System.ComponentModel.DataAnnotations; + +namespace NCC.Extend.Entitys.Dto.LqXhHyhk +{ + /// + /// 会员耗卡记录查询输入 + /// + public class LqXhHyhkMemberCardUsageQueryInput : PageInputBase + { + /// + /// 会员ID + /// + [Required(ErrorMessage = "会员ID不能为空")] + public string MemberId { get; set; } + + /// + /// 门店ID + /// + public string StoreId { get; set; } + + /// + /// 开始时间 + /// + public System.DateTime? StartTime { get; set; } + + /// + /// 结束时间 + /// + public System.DateTime? EndTime { get; set; } + } +} diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhJksyjQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhJksyjQueryInput.cs new file mode 100644 index 0000000..659c006 --- /dev/null +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhJksyjQueryInput.cs @@ -0,0 +1,36 @@ +using System; +using System.ComponentModel.DataAnnotations; +using NCC.Common.Filter; + +namespace NCC.Extend.Entitys.Dto.LqXhHyhk +{ + /// + /// 健康师业绩查询输入 + /// + public class LqXhJksyjQueryInput : PageInputBase + { + /// + /// 开单记录ID + /// + [Display(Name = "开单记录ID", Description = "关联的开单记录ID")] + public string Glkdbh { get; set; } + + /// + /// 健康师ID + /// + [Display(Name = "健康师ID", Description = "健康师用户ID，可选")] + public string JksId { get; set; } + + /// + /// 开始时间 + /// + [Display(Name = "开始时间", Description = "查询开始时间")] + public DateTime? StartTime { get; set; } + + /// + /// 结束时间 + /// + [Display(Name = "结束时间", Description = "查询结束时间")] + public DateTime? EndTime { get; set; } + } +} diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhJksyj/LqXhJksyjInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhJksyj/LqXhJksyjInfoOutput.cs index 0e73104..c696d88 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhJksyj/LqXhJksyjInfoOutput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhJksyj/LqXhJksyjInfoOutput.cs @@ -11,27 +11,27 @@ namespace NCC.Extend.Entitys.Dto.LqXhJksyj /// 业绩编号 /// public string id { get; set; } - + /// /// 关联开单编号 /// public string glkdbh { get; set; } - + /// /// 健康师 /// public string jks { get; set; } - + /// /// 健康师姓名 /// public string jksxm { get; set; } - + /// /// 健康师账号 /// public string jkszh { get; set; } - + /// /// 健康师业绩 /// @@ -43,6 +43,11 @@ namespace NCC.Extend.Entitys.Dto.LqXhJksyj public DateTime? yjsj { get; set; } /// + /// 门店 + /// + public string storeName { get; set; } + + /// /// 金三角id /// public string jsjId { get; set; } @@ -61,5 +66,16 @@ namespace NCC.Extend.Entitys.Dto.LqXhJksyj /// 耗卡品项次数 /// public decimal? kdpxNumber { get; set; } + + /// + /// 会员id + /// + public string memberId { get; set; } + + + /// + /// 会员名称 + /// + public string memberName { get; set; } } } \ No newline at end of file diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbCrInput.cs deleted file mode 100644 index f1979ed..0000000 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbCrInput.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace NCC.Extend.Entitys.Dto.LqXhmxb -{ - /// - /// 消耗明细表修改输入参数 - /// - public class LqXhmxbCrInput - { - /// - /// 消耗编号 - /// - public string id { get; set; } - - /// - /// 门店编号 - /// - public string mdbh { get; set; } - - /// - /// 门店名称 - /// - public string mdmc { get; set; } - - /// - /// 部门编号 - /// - public string bmbh { get; set; } - - /// - /// 部门名称 - /// - public string bmmc { get; set; } - - /// - /// 员工编号 - /// - public string ygbh { get; set; } - - /// - /// 员工名称 - /// - public string ygmc { get; set; } - - /// - /// 项目数 - /// - public string xms { get; set; } - - /// - /// 消耗 - /// - public string xh { get; set; } - - /// - /// 手工 - /// - public string sg { get; set; } - - /// - /// 其它手工1 - /// - public string qtsg1 { get; set; } - - /// - /// 其它手工2 - /// - public string qtsg2 { get; set; } - - /// - /// 其它手工3 - /// - public string qtsg3 { get; set; } - - /// - /// 手工合计 - /// - public string sghj { get; set; } - - } -} diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbInfoOutput.cs deleted file mode 100644 index 40e5812..0000000 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbInfoOutput.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace NCC.Extend.Entitys.Dto.LqXhmxb -{ - /// - /// 消耗明细表输出参数 - /// - public class LqXhmxbInfoOutput - { - /// - /// 消耗编号 - /// - public string id { get; set; } - - /// - /// 门店编号 - /// - public string mdbh { get; set; } - - /// - /// 门店名称 - /// - public string mdmc { get; set; } - - /// - /// 部门编号 - /// - public string bmbh { get; set; } - - /// - /// 部门名称 - /// - public string bmmc { get; set; } - - /// - /// 员工编号 - /// - public string ygbh { get; set; } - - /// - /// 员工名称 - /// - public string ygmc { get; set; } - - /// - /// 项目数 - /// - public string xms { get; set; } - - /// - /// 消耗 - /// - public string xh { get; set; } - - /// - /// 手工 - /// - public string sg { get; set; } - - /// - /// 其它手工1 - /// - public string qtsg1 { get; set; } - - /// - /// 其它手工2 - /// - public string qtsg2 { get; set; } - - /// - /// 其它手工3 - /// - public string qtsg3 { get; set; } - - /// - /// 手工合计 - /// - public string sghj { get; set; } - - } -} diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbListOutput.cs deleted file mode 100644 index 76da088..0000000 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbListOutput.cs +++ /dev/null @@ -1,81 +0,0 @@ -using System; - -namespace NCC.Extend.Entitys.Dto.LqXhmxb -{ - /// - /// 消耗明细表输入参数 - /// - public class LqXhmxbListOutput - { - /// - /// 消耗编号 - /// - public string id { get; set; } - - /// - /// 门店编号 - /// - public string mdbh { get; set; } - - /// - /// 门店名称 - /// - public string mdmc { get; set; } - - /// - /// 部门编号 - /// - public string bmbh { get; set; } - - /// - /// 部门名称 - /// - public string bmmc { get; set; } - - /// - /// 员工编号 - /// - public string ygbh { get; set; } - - /// - /// 员工名称 - /// - public string ygmc { get; set; } - - /// - /// 项目数 - /// - public string xms { get; set; } - - /// - /// 消耗 - /// - public string xh { get; set; } - - /// - /// 手工 - /// - public string sg { get; set; } - - /// - /// 其它手工1 - /// - public string qtsg1 { get; set; } - - /// - /// 其它手工2 - /// - public string qtsg2 { get; set; } - - /// - /// 其它手工3 - /// - public string qtsg3 { get; set; } - - /// - /// 手工合计 - /// - public string sghj { get; set; } - - } -} diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbListQueryInput.cs deleted file mode 100644 index e59cc72..0000000 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbListQueryInput.cs +++ /dev/null @@ -1,93 +0,0 @@ -using NCC.Common.Filter; -using System.Collections.Generic; - -namespace NCC.Extend.Entitys.Dto.LqXhmxb -{ - /// - /// 消耗明细表列表查询输入 - /// - public class LqXhmxbListQueryInput : PageInputBase - { - /// - /// 选择导出数据key - /// - public string selectKey { get; set; } - - /// - /// - /// - public int dataType { get; set; } - - - /// - /// 消耗编号 - /// - public string id { get; set; } - - /// - /// 门店编号 - /// - public string mdbh { get; set; } - - /// - /// 门店名称 - /// - public string mdmc { get; set; } - - /// - /// 部门编号 - /// - public string bmbh { get; set; } - - /// - /// 部门名称 - /// - public string bmmc { get; set; } - - /// - /// 员工编号 - /// - public string ygbh { get; set; } - - /// - /// 员工名称 - /// - public string ygmc { get; set; } - - /// - /// 项目数 - /// - public string xms { get; set; } - - /// - /// 消耗 - /// - public string xh { get; set; } - - /// - /// 手工 - /// - public string sg { get; set; } - - /// - /// 其它手工1 - /// - public string qtsg1 { get; set; } - - /// - /// 其它手工2 - /// - public string qtsg2 { get; set; } - - /// - /// 其它手工3 - /// - public string qtsg3 { get; set; } - - /// - /// 手工合计 - /// - public string sghj { get; set; } - - } -} diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbUpInput.cs deleted file mode 100644 index 987c911..0000000 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbUpInput.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace NCC.Extend.Entitys.Dto.LqXhmxb -{ - /// - /// 消耗明细表更新输入参数 - /// - public class LqXhmxbUpInput : LqXhmxbCrInput - { - /// - /// 消耗编号 - /// - public string id { get; set; } - - } -} diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_hytk/LqHytkHytkEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_hytk/LqHytkHytkEntity.cs index fd352f4..6734291 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_hytk/LqHytkHytkEntity.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_hytk/LqHytkHytkEntity.cs @@ -102,7 +102,6 @@ namespace NCC.Extend.Entitys.lq_hytk_hytk [SugarColumn(ColumnName = "tkyy")] public string Tkyy { get; set; } - /// /// 退卡附件 /// @@ -134,16 +133,9 @@ namespace NCC.Extend.Entitys.lq_hytk_hytk public string F_ModifyUser { get; set; } /// - /// 删除标记 - /// - [SugarColumn(ColumnName = "F_DeleteMark")] - public int? F_DeleteMark { get; set; } - - /// /// 是否有效 /// [SugarColumn(ColumnName = "F_IsEffective")] public int IsEffective { get; set; } = StatusEnum.有效.GetHashCode(); - } } \ No newline at end of file diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_jksyj/LqHytkJksyjEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_jksyj/LqHytkJksyjEntity.cs index 411e1bf..8f8bfc7 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_jksyj/LqHytkJksyjEntity.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_jksyj/LqHytkJksyjEntity.cs @@ -103,13 +103,7 @@ namespace NCC.Extend.Entitys.lq_hytk_jksyj public string F_ModifyUser { get; set; } /// - /// 删除标记 - /// - [SugarColumn(ColumnName = "F_DeleteMark")] - public int? F_DeleteMark { get; set; } - - /// - /// 退卡品项明细id + /// 退卡品相表id /// [SugarColumn(ColumnName = "F_CardReturn")] public string CardReturn { get; set; } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_kjbsyj/LqHytkKjbsyjEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_kjbsyj/LqHytkKjbsyjEntity.cs index 62d7953..d5b6a6a 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_kjbsyj/LqHytkKjbsyjEntity.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_kjbsyj/LqHytkKjbsyjEntity.cs @@ -96,14 +96,9 @@ namespace NCC.Extend.Entitys.lq_hytk_kjbsyj [SugarColumn(ColumnName = "F_ModifyUser")] public string F_ModifyUser { get; set; } - /// - /// 删除标记 - /// - [SugarColumn(ColumnName = "F_DeleteMark")] - public int? F_DeleteMark { get; set; } /// - /// 退卡品项明细id + /// 退卡品项明细ID /// [SugarColumn(ColumnName = "F_CardReturn")] public string CardReturn { get; set; } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_mx/LqHytkMxEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_mx/LqHytkMxEntity.cs index 94d9a1d..051cc2b 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_mx/LqHytkMxEntity.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_mx/LqHytkMxEntity.cs @@ -25,7 +25,7 @@ namespace NCC.Extend.Entitys.lq_hytk_mx public string RefundInfoId { get; set; } /// - /// 退卡记录Id + /// 开单品项明细表id /// [SugarColumn(ColumnName = "F_BillingItemId")] public string BillingItemId { get; set; } @@ -68,12 +68,6 @@ namespace NCC.Extend.Entitys.lq_hytk_mx public int ProjectNumber { get; set; } /// - /// 是否有效 - /// - [SugarColumn(ColumnName = "F_IsEnabled")] - public int IsEnabled { get; set; } = StatusEnum.有效.GetHashCode(); - - /// /// 来源类型 /// [SugarColumn(ColumnName = "F_SourceType")] @@ -110,12 +104,6 @@ namespace NCC.Extend.Entitys.lq_hytk_mx public string ModifyUser { get; set; } /// - /// 删除标记 - /// - [SugarColumn(ColumnName = "F_DeleteMark")] - public int? DeleteMark { get; set; } - - /// /// 是否有效 /// [SugarColumn(ColumnName = "F_IsEffective")] 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 ceb6983..fe97609 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 @@ -229,5 +229,17 @@ namespace NCC.Extend.Entitys.lq_kd_kdjlb /// [SugarColumn(ColumnName = "F_PaidDebt")] public decimal PaidDebt { get; set; } + + /// + /// 补缴开单ID + /// + [SugarColumn(ColumnName = "F_SupplementBillingId")] + public string SupplementBillingId { get; set; } + + /// + /// 补缴金额 + /// + [SugarColumn(ColumnName = "F_SupplementAmount")] + public decimal SupplementAmount { 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 deleted file mode 100644 index c17bb5a..0000000 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_qkbj/LqKdQkbjEntity.cs +++ /dev/null @@ -1,74 +0,0 @@ -using NCC.Common.Const; -using SqlSugar; -using System; - -namespace NCC.Extend.Entitys.lq_kd_qkbj -{ - /// - /// 开单欠款补缴记录表 - /// - [SugarTable("lq_kd_qkbj")] - [Tenant(ClaimConst.TENANT_ID)] - public class LqKdQkbjEntity - { - /// - /// 补缴记录ID - /// - [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_PaymentDate")] - public DateTime PaymentDate { get; set; } - - /// - /// 收款人员 - /// - [SugarColumn(ColumnName = "F_PaymentUser")] - public string PaymentUser { get; set; } - - /// - /// 备注 - /// - [SugarColumn(ColumnName = "F_Remarks")] - public string Remarks { 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; - } -} \ No newline at end of file diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_khxx/LqKhxxEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_khxx/LqKhxxEntity.cs index b6427f1..dd4f453 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_khxx/LqKhxxEntity.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_khxx/LqKhxxEntity.cs @@ -1,5 +1,6 @@ using System; using NCC.Common.Const; +using NCC.Extend.Entitys.Enum; using SqlSugar; namespace NCC.Extend.Entitys.lq_khxx @@ -140,5 +141,11 @@ namespace NCC.Extend.Entitys.lq_khxx [SugarColumn(ColumnName = "F_SubHealthUser")] public string SubHealthUser { get; set; } + /// + /// 是否有效 + /// + [SugarColumn(ColumnName = "F_IsEffective")] + public int IsEffective { get; set; } = StatusEnum.有效.GetHashCode(); + } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_tkjlb/LqTkjlbEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_tkjlb/LqTkjlbEntity.cs index e668938..76f24c6 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_tkjlb/LqTkjlbEntity.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_tkjlb/LqTkjlbEntity.cs @@ -1,4 +1,6 @@ using System; +using NCC.Common.Enum; +using NCC.Extend.Entitys.Enum; using SqlSugar; namespace NCC.Extend.Entitys.lq_tkjlb @@ -92,5 +94,6 @@ namespace NCC.Extend.Entitys.lq_tkjlb /// [SugarColumn(ColumnName = "F_CreateTime")] public DateTime CreateTime { get; set; } = DateTime.Now; + } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_hyhk/LqXhHyhkEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_hyhk/LqXhHyhkEntity.cs index 10d6ef8..6ed3e3c 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_hyhk/LqXhHyhkEntity.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_hyhk/LqXhHyhkEntity.cs @@ -1,5 +1,6 @@ using System; using NCC.Common.Const; +using NCC.Extend.Entitys.Enum; using SqlSugar; namespace NCC.Extend.Entitys.lq_xh_hyhk @@ -118,6 +119,6 @@ namespace NCC.Extend.Entitys.lq_xh_hyhk /// 是否有效 /// [SugarColumn(ColumnName = "F_IsEffective")] - public int? IsEffective { get; set; } = 1; + public int IsEffective { get; set; } = StatusEnum.有效.GetHashCode(); } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xhmxb/LqXhmxbEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xhmxb/LqXhmxbEntity.cs deleted file mode 100644 index 565fafa..0000000 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xhmxb/LqXhmxbEntity.cs +++ /dev/null @@ -1,99 +0,0 @@ -using NCC.Common.Const; -using SqlSugar; -using System; - -namespace NCC.Extend.Entitys.lq_xhmxb -{ - /// - /// 消耗明细表 - /// - [SugarTable("lq_xhmxb")] - [Tenant(ClaimConst.TENANT_ID)] - public class LqXhmxbEntity - { - /// - /// 消耗编号 - /// - [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)] - public string Id { get; set; } - - /// - /// 门店编号 - /// - [SugarColumn(ColumnName = "mdbh")] - public string Mdbh { get; set; } - - /// - /// 门店名称 - /// - [SugarColumn(ColumnName = "mdmc")] - public string Mdmc { get; set; } - - /// - /// 部门编号 - /// - [SugarColumn(ColumnName = "bmbh")] - public string Bmbh { get; set; } - - /// - /// 部门名称 - /// - [SugarColumn(ColumnName = "bmmc")] - public string Bmmc { get; set; } - - /// - /// 员工编号 - /// - [SugarColumn(ColumnName = "ygbh")] - public string Ygbh { get; set; } - - /// - /// 员工名称 - /// - [SugarColumn(ColumnName = "ygmc")] - public string Ygmc { get; set; } - - /// - /// 项目数 - /// - [SugarColumn(ColumnName = "xms")] - public string Xms { get; set; } - - /// - /// 消耗 - /// - [SugarColumn(ColumnName = "xh")] - public string Xh { get; set; } - - /// - /// 手工 - /// - [SugarColumn(ColumnName = "sg")] - public string Sg { get; set; } - - /// - /// 其它手工1 - /// - [SugarColumn(ColumnName = "qtsg1")] - public string Qtsg1 { get; set; } - - /// - /// 其它手工2 - /// - [SugarColumn(ColumnName = "qtsg2")] - public string Qtsg2 { get; set; } - - /// - /// 其它手工3 - /// - [SugarColumn(ColumnName = "qtsg3")] - public string Qtsg3 { get; set; } - - /// - /// 手工合计 - /// - [SugarColumn(ColumnName = "sghj")] - public string Sghj { get; set; } - - } -} \ No newline at end of file diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Mapper/LqXhmxbMapper.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Mapper/LqXhmxbMapper.cs deleted file mode 100644 index c4d624a..0000000 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Mapper/LqXhmxbMapper.cs +++ /dev/null @@ -1,14 +0,0 @@ -using NCC.Common.Helper; -using NCC.Extend.Entitys.Dto.LqXhmxb; -using Mapster; -using System.Collections.Generic; - -namespace NCC.Extend.Entitys.Mapper.LqXhmxb -{ - public class Mapper : IRegister - { - public void Register(TypeAdapterConfig config) - { - } - } -} diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqXhmxbService.cs b/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqXhmxbService.cs deleted file mode 100644 index 85b079f..0000000 --- a/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqXhmxbService.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace NCC.Extend.Interfaces.LqXhmxb -{ - public interface ILqXhmxbService - { - } -} \ No newline at end of file diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqHytkHytkService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqHytkHytkService.cs index 6666674..245b345 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqHytkHytkService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqHytkHytkService.cs @@ -200,7 +200,6 @@ namespace NCC.Extend.LqHytkHytk entity.Id = YitIdHelper.NextId().ToString(); entity.F_CreateTime = DateTime.Now; entity.F_CreateUser = userInfo.userId; - entity.F_DeleteMark = 0; entity.IsEffective = StatusEnum.有效.GetHashCode(); entity.Czry = userInfo.userId; @@ -230,13 +229,11 @@ namespace NCC.Extend.LqHytkHytk BillingItemId = item.billingItemId, CreateTime = DateTime.Now, CreateUser = userInfo.userId, - DeleteMark = 0, Px = item.px, Pxmc = item.pxmc, Pxjg = item.pxjg, Tkje = item.tkje, ProjectNumber = item.F_ProjectNumber ?? 1, - IsEnabled = item.F_IsEnabled ?? 1, SourceType = item.F_SourceType, TotalPrice = item.F_TotalPrice ?? (item.pxjg * (item.F_ProjectNumber ?? 1)), IsEffective = StatusEnum.有效.GetHashCode(), @@ -263,7 +260,6 @@ namespace NCC.Extend.LqHytkHytk F_tkpxNumber = ijks_tem.F_tkpxNumber, F_CreateTime = DateTime.Now, F_CreateUser = userInfo.userId, - F_DeleteMark = 0, CardReturn = lqHytkMxEntity.Id, IsEffective = StatusEnum.有效.GetHashCode(), } @@ -291,7 +287,6 @@ namespace NCC.Extend.LqHytkHytk F_tkpxNumber = ikjbs_tem.F_tkpxNumber, F_CreateTime = DateTime.Now, F_CreateUser = userInfo.userId, - F_DeleteMark = 0, CardReturn = lqHytkMxEntity.Id, IsEffective = StatusEnum.有效.GetHashCode(), } @@ -385,13 +380,11 @@ namespace NCC.Extend.LqHytkHytk CreateTime = DateTime.Now, CreateUser = userInfo.userId, Tksj = input.tksj, - DeleteMark = 0, Px = item.px, Pxmc = item.pxmc, Pxjg = item.pxjg, Tkje = item.tkje, ProjectNumber = item.F_ProjectNumber ?? 1, - IsEnabled = item.F_IsEnabled ?? 1, SourceType = item.F_SourceType, TotalPrice = item.F_TotalPrice ?? (item.pxjg * (item.F_ProjectNumber ?? 1)), }; @@ -418,7 +411,6 @@ namespace NCC.Extend.LqHytkHytk F_tkpxNumber = ijks_tem.F_tkpxNumber, F_CreateTime = DateTime.Now, F_CreateUser = userInfo.userId, - F_DeleteMark = 0, } ); } @@ -444,7 +436,6 @@ namespace NCC.Extend.LqHytkHytk F_tkpxNumber = ikjbs_tem.F_tkpxNumber, F_CreateTime = DateTime.Now, F_CreateUser = userInfo.userId, - F_DeleteMark = 0, } ); } @@ -479,23 +470,42 @@ namespace NCC.Extend.LqHytkHytk } #endregion - #region 标记退卡信息为无效 + #region 作废退卡信息 /// - /// 删除退卡信息（逻辑删除） + /// 作废退卡信息 /// /// 主键 /// - [HttpDelete("{id}")] - public async Task Delete(string id) + [HttpPut("VoidRefundCardInfo/{id}")] + public async Task VoidRefundCardInfo(string id) { - var entity = await _db.Queryable().FirstAsync(p => p.Id == id); - if (entity != null) + try { + var entity = await _db.Queryable().FirstAsync(p => p.Id == id && p.IsEffective == StatusEnum.有效.GetHashCode()); + if (entity == null) + { + throw NCCException.Oh("退卡信息不存在或已被作废"); + } + // 开启事务 + _db.BeginTran(); + // 更新主表 entity.IsEffective = StatusEnum.无效.GetHashCode(); - await _lqHytkHytkRepository.UpdateAsync(entity); + entity.F_ModifyTime = DateTime.Now; + await _db.Updateable(entity).ExecuteCommandAsync(); + // 更新明细表 await _db.Updateable().SetColumns(it => new LqHytkMxEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(w => w.RefundInfoId == id).ExecuteCommandAsync(); + // 更新健康师业绩表 await _db.Updateable().SetColumns(it => new LqHytkJksyjEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(w => w.Gltkbh == id).ExecuteCommandAsync(); + // 更新科技部业绩表 await _db.Updateable().SetColumns(it => new LqHytkKjbsyjEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(w => w.Gltkbh == id).ExecuteCommandAsync(); + // 提交事务 + _db.CommitTran(); + return entity; + } + catch (Exception ex) + { + _db.RollbackTran(); + throw NCCException.Oh($"删除退卡信息失败: {ex.Message}"); } } #endregion @@ -598,10 +608,10 @@ namespace NCC.Extend.LqHytkHytk try { // 1. 查询主表信息 - var entity = await _db.Queryable().FirstAsync(p => p.Id == id); + var entity = await _db.Queryable().Where(p => p.Id == id && p.IsEffective == StatusEnum.有效.GetHashCode()).FirstAsync(); if (entity == null) { - throw NCCException.Oh(ErrorCode.COM1005, "退卡记录不存在"); + throw NCCException.Oh(ErrorCode.COM1005, "退卡记录不存在或已作废"); } var output = entity.Adapt(); @@ -629,7 +639,6 @@ namespace NCC.Extend.LqHytkHytk pxjg = mx.Pxjg, tkje = mx.Tkje, projectNumber = mx.ProjectNumber, - isEnabled = mx.IsEnabled, sourceType = mx.SourceType, totalPrice = mx.TotalPrice, }; diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs index 743394b..73c1f35 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs @@ -27,7 +27,6 @@ using NCC.Extend.Entitys.lq_kd_jksyj; using NCC.Extend.Entitys.lq_kd_kdjlb; using NCC.Extend.Entitys.lq_kd_kjbsyj; using NCC.Extend.Entitys.lq_kd_pxmx; -using NCC.Extend.Entitys.lq_kd_qkbj; using NCC.Extend.Entitys.lq_khxx; using NCC.Extend.Entitys.lq_xh_pxmx; using NCC.Extend.Entitys.lq_xmzl; @@ -144,7 +143,7 @@ namespace NCC.Extend.LqKdKdjlb totalPrice = pxmx.TotalPrice, actualPrice = pxmx.ActualPrice, remark = pxmx.Remark, - IsEffective = pxmx.IsEffective, + isEffective = pxmx.IsEffective, }; // 关联该品项的健康师业绩 @@ -309,6 +308,22 @@ namespace NCC.Extend.LqKdKdjlb // await _db.Updateable().Where(p => p.BillingId == input.cancelRefId).UpdateColumns(p => new LqKdDeductinfoEntity { IsEffective = StatusEnum.无效.GetHashCode() }).ExecuteCommandAsync(); // } + //判断是否有补缴开单ID + if (!string.IsNullOrEmpty(input.supplementBillingId)) + { + //查询补缴开单ID + var supplementBillingEntity = await _db.Queryable().FirstAsync(p => p.Id == input.supplementBillingId); + if (supplementBillingEntity == null || supplementBillingEntity.IsEffective == StatusEnum.无效.GetHashCode()) + { + throw NCCException.Oh("补缴开单记录不存在或已作废"); + } + //然后对之前的开单表的补缴金额进行累加 + //需要判断补缴金额是否超过欠款金额，只记录应缴金额 + var supplementAmount = supplementBillingEntity.Qk - supplementBillingEntity.PaidDebt; + entity.PaidDebt += input.supplementAmount > supplementAmount ? supplementAmount : input.supplementAmount; + await _db.Updateable(entity).ExecuteCommandAsync(); + } + //新增开单记录表记录 entity.CreateUser = userInfo.userId; entity.DeductAmount = input.lqKdKdjlbDeductList.Sum(x => x.Amount ?? 0);//计算储扣总金额 @@ -1548,158 +1563,96 @@ namespace NCC.Extend.LqKdKdjlb } #endregion - #region 补缴欠款 + #region 根据门店获取该门店的欠款记录 /// - /// 补缴欠款 + /// 根据门店获取该门店的欠款记录 /// - /// 补缴欠款输入 - /// 补缴记录ID + /// 查询参数 + /// 分页的欠款记录 /// - /// 为客户补缴欠款，记录补缴信息并更新开单记录的已缴欠款金额 + /// 获取指定门店的欠款记录，考虑已缴欠款情况，支持分页 /// /// 示例请求： /// ```json /// { - /// "billingId": "123456789", - /// "paymentAmount": 1000.00, - /// "paymentMethod": "现金", - /// "paymentDate": "2025-01-15T10:30:00", - /// "paymentUser": "收款员", - /// "remarks": "客户补缴欠款" + /// "storeId": "门店ID", + /// "currentPage": 1, + /// "pageSize": 10, + /// "sidx": "Kdrq", + /// "sort": "desc" /// } /// ``` /// /// 参数说明： - /// - billingId: 开单记录ID（必填） - /// - paymentAmount: 补缴金额（必填） - /// - paymentMethod: 付款方式 - /// - paymentDate: 付款日期 - /// - paymentUser: 收款人员 - /// - remarks: 备注信息 + /// - storeId: 门店ID，必填 + /// - currentPage: 当前页码 + /// - pageSize: 每页大小 + /// - sidx: 排序字段，默认按开单日期 + /// - sort: 排序方式，默认降序 + /// + /// 返回说明： + /// - 只返回仍有欠款的记录（总欠款 > 已缴欠款） + /// - 包含开单编号、客户信息、欠款金额、已缴金额等 /// - /// 补缴成功，返回补缴记录ID - /// 请求参数错误 - /// 开单记录不存在 - /// 服务器内部错误 - [HttpPost("PayDebtAsync")] - public async Task PayDebtAsync(PayDebtInput input) + /// 成功返回分页的欠款记录列表 + /// 门店ID不能为空 + /// 服务器错误 + [HttpGet("GetDebtRecordByStoreId")] + public async Task GetDebtRecordByStoreId([FromQuery] DebtRecordQueryInput input) { try { - // 验证补缴金额 - if (input.PaymentAmount <= 0) - { - throw NCCException.Oh("补缴金额必须大于0"); - } - - // 检查开单记录是否存在 - var billingRecord = await _db.Queryable().Where(w => w.Id == input.BillingId).FirstAsync(); - if (billingRecord == null || billingRecord.IsEffective == StatusEnum.无效.GetHashCode()) - { - throw NCCException.Oh("开单记录不存在或已作废"); - } - // 检查补缴金额是否超过欠款金额 - var remainingDebt = billingRecord.Qk - billingRecord.PaidDebt; - if (input.PaymentAmount > remainingDebt) - { - throw NCCException.Oh($"补缴金额({input.PaymentAmount})不能超过剩余欠款金额({remainingDebt})"); - } - // 开始事务 - _db.BeginTran(); - try - { - // 创建补缴记录 - var paymentRecord = new LqKdQkbjEntity - { - Id = YitIdHelper.NextId().ToString(), - BillingId = input.BillingId, - PaymentAmount = input.PaymentAmount, - PaymentMethod = input.PaymentMethod, - PaymentDate = input.PaymentDate ?? DateTime.Now, - PaymentUser = input.PaymentUser ?? _userManager.UserId, - Remarks = input.Remarks, - CreateTime = DateTime.Now, - UpdateTime = DateTime.Now, - IsEffective = StatusEnum.有效.GetHashCode() - }; - // 保存补缴记录 - await _db.Insertable(paymentRecord).ExecuteCommandAsync(); - - // 更新开单记录的已缴欠款金额 - await _db.Updateable() - .SetColumns(it => new LqKdKdjlbEntity - { - PaidDebt = it.PaidDebt + input.PaymentAmount, - UpdateTime = DateTime.Now - }) - .Where(w => w.Id == input.BillingId) - .ExecuteCommandAsync(); - - // 提交事务 - _db.CommitTran(); - return new - { - success = true, - message = "补缴成功", - data = paymentRecord.Id - }; - } - catch + if (string.IsNullOrEmpty(input.StoreId)) { - // 回滚事务 - _db.RollbackTran(); - throw; + throw NCCException.Oh("门店ID不能为空"); } - } - catch (Exception ex) - { - throw NCCException.Oh($"补缴欠款失败: {ex.Message}"); - } - } - - - #endregion - - #region 补缴欠款查询 - /// - /// 获取补缴欠款记录列表 - /// - /// 查询输入 - /// 补缴记录列表 - /// - /// 获取指定开单记录的补缴欠款历史记录 - /// - /// 成功获取补缴记录列表 - /// 请求参数错误 - /// 服务器内部错误 - [HttpGet("GetDebtPaymentRecordsAsync")] - public async Task GetDebtPaymentRecordsAsync([FromQuery] DebtPaymentQueryInput input) - { - try - { - var sidx = input.sidx == null ? "PaymentDate" : input.sidx; - var data = await _db.Queryable() - .WhereIF(!string.IsNullOrEmpty(input.BillingId), w => w.BillingId == input.BillingId) - .WhereIF(input.PaymentDateStart.HasValue, w => w.PaymentDate >= input.PaymentDateStart.Value) - .WhereIF(input.PaymentDateEnd.HasValue, w => w.PaymentDate <= input.PaymentDateEnd.Value) - .WhereIF(!string.IsNullOrEmpty(input.PaymentUser), w => w.PaymentUser.Contains(input.PaymentUser)) - .Select(it => new DebtPaymentRecordOutput + var sidx = string.IsNullOrEmpty(input.sidx) ? "Kdrq" : input.sidx; + var sort = string.IsNullOrEmpty(input.sort) ? "desc" : input.sort; + // 获取该门店的欠款记录，考虑已缴欠款情况 + // 只返回仍有欠款的记录：总欠款 > 已缴欠款 + var debtRecords = await _db.Queryable() + .Where(p => p.Djmd == input.StoreId && p.Qk > p.PaidDebt && p.IsEffective == StatusEnum.有效.GetHashCode()) + .Select(it => new LqKdKdjlbListOutput { - Id = it.Id, - BillingId = it.BillingId, - PaymentAmount = it.PaymentAmount, - PaymentMethod = it.PaymentMethod, - PaymentDate = it.PaymentDate, - PaymentUser = it.PaymentUser, - Remarks = it.Remarks, - CreateTime = it.CreateTime - }).MergeTable().OrderBy(sidx + " " + input.sort).ToPagedListAsync(input.currentPage, input.pageSize); - - return PageResult.SqlSugarPageResult(data); + id = it.Id, + djmd = it.Djmd, + jsj = it.Jsj, + kdrq = it.Kdrq, + gjlx = it.Gjlx, + hgjg = it.Hgjg, + zdyj = it.Zdyj, + sfyj = it.Sfyj, + qk = it.Qk, + ckfs = it.Ckfs, + PaidDebt = it.PaidDebt, + fkfs = it.Fkfs, + fkyy = it.Fkyy, + fkpd = it.Fkpd, + khly = it.Khly, + tjr = it.Tjr, + deductAmount = it.DeductAmount, + sfskdd = it.Sfskdd, + jj = it.Jj, + bz = it.Bz, + kdhy = it.Kdhy, + kdhyc = it.Kdhyc, + kdhysjh = it.Kdhysjh, + jksyj = it.Jksyj, + kjblsyj = it.Kjblsyj, + pxxx = it.Pxxx, + IsEffective = it.IsEffective, + CreateUser = it.CreateUser, + CreateUserName = SqlFunc.Subqueryable().Where(x => x.Id == it.CreateUser).Select(x => x.RealName), + }) + .MergeTable() + .OrderBy(sidx + " " + sort) + .ToPagedListAsync(input.currentPage, input.pageSize); + + return PageResult.SqlSugarPageResult(debtRecords); } catch (Exception ex) { - throw NCCException.Oh($"获取补缴记录失败: {ex.Message}"); + throw NCCException.Oh($"获取门店欠款记录失败: {ex.Message}"); } } #endregion @@ -1725,14 +1678,14 @@ namespace NCC.Extend.LqKdKdjlb { return (false, "该开单记录已经作废"); } - // 查询开单记录下的品项明细ID列表 - var pxmxIdList = await _db.Queryable().Where(p => p.Glkdbh == billingId).Select(p => p.Id).Distinct().ToListAsync(); - //判断是否有对应的补缴记录 - var qkbjList = await _db.Queryable().Where(p => p.BillingId == billingId).ToListAsync(); + // 判断是否有对应的补缴记录 + var qkbjList = await _db.Queryable().Where(p => p.SupplementBillingId == billingId).ToListAsync(); if (qkbjList.Any()) { return (false, "该开单记录有对应的补缴记录，不能进行操作"); } + // 查询开单记录下的品项明细ID列表 + var pxmxIdList = await _db.Queryable().Where(p => p.Glkdbh == billingId).Select(p => p.Id).Distinct().ToListAsync(); // 判断是否有对应的消耗记录 var xhPxmxList = await _db.Queryable().Where(p => pxmxIdList.Contains(p.BillingItemId)).ToListAsync(); if (xhPxmxList.Any()) diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs index 42e174e..9cbab3b 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs @@ -352,7 +352,7 @@ namespace NCC.Extend.LqKhxx throw NCCException.Oh("客户不存在"); } // 查询开单记录数量 - var orderCount = await _db.Queryable().Where(o => o.Kdhy == customerId && o.IsEffective == StatusEnum.有效.GetHashCode()).CountAsync(); + var orderCount = await _db.Queryable().Where(o => o.Kdhy == customerId && o.IsEffective == StatusEnum.有效.GetHashCode() && o.Sfyj > 0).CountAsync(); var hasOrderRecord = orderCount > 0; var orderType = hasOrderRecord ? "repeat_order" : "first_order"; return new LqKhxxOrderTypeOutput @@ -569,7 +569,7 @@ namespace NCC.Extend.LqKhxx // 查询退卡数据 var refundedData = await _db.Queryable() .Where(x => baseItems.Select(b => b.Id).Contains(x.BillingItemId)) - // .Where(x => x.IsEffective == StatusEnum.有效.GetHashCode()) + .Where(x => x.IsEffective == StatusEnum.有效.GetHashCode()) .GroupBy(x => x.BillingItemId) .Select(x => new { @@ -609,6 +609,8 @@ namespace NCC.Extend.LqKhxx { item.RemainingCount = item.TotalPurchased - item.ConsumedCount - item.RefundedCount - item.DeductCount; } + //过滤剩余数量为0的品项,先暂时为不等于 0 ，因为现在有问题，会出现负数，后面再修改 + remainingItems = remainingItems.Where(item => item.RemainingCount != 0).ToList(); return new MemberRemainingItemsOutput { MemberId = memberId, diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs index bd6bdf8..21c6d61 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs @@ -19,6 +19,7 @@ using NCC.Extend.Entitys.Dto.LqTkjlb; using NCC.Extend.Entitys.Enum; using NCC.Extend.Entitys.lq_event; using NCC.Extend.Entitys.lq_eventuser; +using NCC.Extend.Entitys.lq_kd_kdjlb; using NCC.Extend.Entitys.lq_khxx; using NCC.Extend.Entitys.lq_mdxx; using NCC.Extend.Entitys.lq_tkjlb; @@ -80,7 +81,7 @@ namespace NCC.Extend.LqTkjlb teamName = p.TeamName, eventId = p.EventId, eventName = SqlFunc.Subqueryable().Where(e => e.Id == p.EventId).Select(e => e.EventName), - storeName = SqlFunc.Subqueryable().Where(u => u.Id == p.StoreId).Select(u => u.Dm), + storeName = SqlFunc.Subqueryable().Where(u => u.Id == p.StoreId).Select(u => u.Dm) }) .FirstAsync(); @@ -187,6 +188,7 @@ namespace NCC.Extend.LqTkjlb MemberInfo.Khlx = MemberTypeEnum.线索.GetHashCode().ToString(); MemberInfo.Dah = "GK" + DateTime.Now.ToString("yyyyMMddHHmmssfff"); MemberInfo.Jdqd = "19.9卡"; + //找到input.expansionUserId的用户信息 var userInfo = await _db.Queryable().Where(u => u.Id == input.expansionUserId).FirstAsync(); //判断 岗位是否为健康师，如果是健康师，则设置拓客人员是健康师 @@ -523,5 +525,7 @@ namespace NCC.Extend.LqTkjlb return result.OrderByDescending(t => t.totalCount).ToList(); } #endregion + + } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs index 79439e8..e738f67 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs @@ -20,6 +20,7 @@ using NCC.Extend.Entitys.Dto.LqXhHyhk; using NCC.Extend.Entitys.Dto.LqXhJksyj; using NCC.Extend.Entitys.Dto.LqXhKjbsyj; using NCC.Extend.Entitys.Dto.LqXhPxmx; +using NCC.Extend.Entitys.Enum; using NCC.Extend.Entitys.lq_kd_kdjlb; using NCC.Extend.Entitys.lq_kd_pxmx; using NCC.Extend.Entitys.lq_khxx; @@ -521,6 +522,12 @@ namespace NCC.Extend.LqXhHyhk { //开启事务 _db.BeginTran(); + //查询记录 + var LqXhHyhkInfo = await _db.Queryable().Where(p => p.Id == id && p.IsEffective == StatusEnum.有效.GetHashCode()).FirstAsync(); + if (LqXhHyhkInfo == null) + { + throw NCCException.Oh(ErrorCode.COM1005, "耗卡记录不存在或已作废"); + } entity.UpdateTime = DateTime.Now; //更新会员耗卡记录 await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); @@ -528,57 +535,31 @@ namespace NCC.Extend.LqXhHyhk //清空原有数据 await _db.Deleteable().Where(u => u.Glkdbh == id).ExecuteCommandAsync(); await _db.Deleteable().Where(u => u.Glkdbh == id).ExecuteCommandAsync(); - - // 注意：品项明细表不做删除操作，只更新或新增 - // await _db.Deleteable().Where(u => u.ConsumeInfoId == id).ExecuteCommandAsync(); - + await _db.Deleteable().Where(u => u.ConsumeInfoId == id).ExecuteCommandAsync(); // 收集所有需要插入的实体，然后批量插入 var allPxmxEntities = new List(); var allJksyjEntities = new List(); var allKjbsyjEntities = new List(); - // 处理品项明细列表 if (input.lqXhPxmxList != null && input.lqXhPxmxList.Any()) { foreach (var item in input.lqXhPxmxList) { - // 检查品项明细是否已存在 - var existingPxmx = await _db.Queryable() - .Where(p => p.Id == item.id) - .FirstAsync(); - - LqXhPxmxEntity lqXhPxmxEntity; - if (existingPxmx != null) - { - // 更新现有记录 - lqXhPxmxEntity = existingPxmx; - // 注意：LqXhPxmxEntity 没有 UpdateTime 字段 - lqXhPxmxEntity.MemberId = entity.Hy; - lqXhPxmxEntity.ProjectNumber = item.projectNumber ?? 1; - lqXhPxmxEntity.TotalPrice = (decimal)(item.pxjg * (item.projectNumber ?? 1)); - lqXhPxmxEntity.Px = item.px; - lqXhPxmxEntity.Pxmc = item.pxmc; - lqXhPxmxEntity.Pxjg = item.pxjg; - lqXhPxmxEntity.SourceType = item.sourceType; - } - else + // 创建品项明细实体 + var lqXhPxmxEntity = new LqXhPxmxEntity { - // 创建新记录 - lqXhPxmxEntity = new LqXhPxmxEntity - { - Id = YitIdHelper.NextId().ToString(), - ConsumeInfoId = entity.Id, - BillingItemId = item.billingItemId, - CreateTIme = DateTime.Now, - MemberId = entity.Hy, - ProjectNumber = item.projectNumber ?? 1, - TotalPrice = (decimal)(item.pxjg * (item.projectNumber ?? 1)), - Px = item.px, - Pxmc = item.pxmc, - Pxjg = item.pxjg, - SourceType = item.sourceType, - }; - } + Id = YitIdHelper.NextId().ToString(), + ConsumeInfoId = input.id, + BillingItemId = item.billingItemId, + CreateTIme = DateTime.Now, + MemberId = entity.Hy, + ProjectNumber = item.projectNumber ?? 1, + TotalPrice = (decimal)(item.pxjg * (item.projectNumber ?? 1)), + Px = item.px, + Pxmc = item.pxmc, + Pxjg = item.pxjg, + SourceType = item.sourceType, + }; allPxmxEntities.Add(lqXhPxmxEntity); // 收集该品项关联的健康师业绩 @@ -590,7 +571,7 @@ namespace NCC.Extend.LqXhHyhk new LqXhJksyjEntity { Id = YitIdHelper.NextId().ToString(), - Glkdbh = entity.Id, + Glkdbh = input.id, Jks = ijks_tem.jks, Jksxm = ijks_tem.jksxm, Jkszh = ijks_tem.jkszh, @@ -614,7 +595,7 @@ namespace NCC.Extend.LqXhHyhk new LqXhKjbsyjEntity { Id = YitIdHelper.NextId().ToString(), - Glkdbh = entity.Id, + Glkdbh = input.id, Kjbls = ikjbs_tem.kjbls, Kjblsxm = ikjbs_tem.kjblsxm, Kjblszh = ikjbs_tem.kjblszh, @@ -629,22 +610,10 @@ namespace NCC.Extend.LqXhHyhk } } } - // 批量插入品项明细 if (allPxmxEntities.Any()) { - // 分别处理插入和更新 - var existingEntities = allPxmxEntities.Where(e => !string.IsNullOrEmpty(e.Id)).ToList(); - var newEntities = allPxmxEntities.Where(e => string.IsNullOrEmpty(e.Id)).ToList(); - - if (existingEntities.Any()) - { - await _db.Updateable(existingEntities).ExecuteCommandAsync(); - } - if (newEntities.Any()) - { - await _db.Insertable(newEntities).ExecuteCommandAsync(); - } + await _db.Insertable(allPxmxEntities).ExecuteCommandAsync(); } // 批量插入健康师业绩 if (allJksyjEntities.Any()) @@ -656,8 +625,7 @@ namespace NCC.Extend.LqXhHyhk { await _db.Insertable(allKjbsyjEntities).ExecuteCommandAsync(); } - - //关闭事务 + // 提交事务 _db.CommitTran(); } catch (Exception) @@ -707,5 +675,198 @@ namespace NCC.Extend.LqXhHyhk } } #endregion + + #region 查询健康师消耗业绩列表 + /// + /// 查询健康师业绩列表 + /// + /// 查询参数 + /// 分页的健康师业绩列表 + /// + /// 查询健康师业绩记录，支持分页和时间筛选 + /// + /// 示例请求： + /// ```json + /// { + /// "glkdbh": "123456789", + /// "jksId": "健康师ID", + /// "startTime": "2025-01-01T00:00:00", + /// "endTime": "2025-01-31T23:59:59", + /// "currentPage": 1, + /// "pageSize": 10, + /// "sidx": "yjsj", + /// "sort": "desc" + /// } + /// ``` + /// + /// 参数说明： + /// - glkdbh: 开单记录ID（可选） + /// - jksId: 健康师ID（可选） + /// - startTime: 查询开始时间（可选） + /// - endTime: 查询结束时间（可选） + /// - currentPage: 当前页码 + /// - pageSize: 每页大小 + /// + /// 成功获取健康师业绩列表 + /// 请求参数错误 + /// 服务器内部错误 + [HttpGet("GetJksyjList")] + public async Task GetJksyjList([FromQuery] LqXhJksyjQueryInput input) + { + try + { + var sidx = string.IsNullOrEmpty(input.sidx) ? "yjsj" : input.sidx; + var sort = string.IsNullOrEmpty(input.sort) ? "desc" : input.sort; + var data = await _db.Queryable() + .WhereIF(!string.IsNullOrEmpty(input.Glkdbh), w => w.Glkdbh == input.Glkdbh) + .WhereIF(!string.IsNullOrEmpty(input.JksId), w => w.Jks == input.JksId) + .WhereIF(input.StartTime.HasValue, w => w.Yjsj >= input.StartTime.Value) + .WhereIF(input.EndTime.HasValue, w => w.Yjsj <= input.EndTime.Value) + .Where(w => w.IsEffective == StatusEnum.有效.GetHashCode()) + .Select(it => new LqXhJksyjInfoOutput + { + id = it.Id, + glkdbh = it.Glkdbh, + jks = it.Jks, + jksxm = it.Jksxm, + jkszh = it.Jkszh, + jksyj = it.Jksyj.ToString(), + yjsj = it.Yjsj, + jsjId = it.JsjId, + kdpxid = it.Kdpxid, + laborCost = it.LaborCost, + kdpxNumber = it.KdpxNumber, + storeName = SqlFunc.Subqueryable().Where(w => w.Id == it.Glkdbh).Select(w => w.Mdmc), + memberId = SqlFunc.Subqueryable().Where(w => w.Id == it.Glkdbh).Select(w => w.Hy), + memberName = SqlFunc.Subqueryable().Where(w => w.Id == it.Glkdbh).Select(w => w.Hymc), + }) + .MergeTable() + .OrderBy(sidx + " " + sort) + .ToPagedListAsync(input.currentPage, input.pageSize); + + return PageResult.SqlSugarPageResult(data); + } + catch (Exception ex) + { + throw NCCException.Oh($"获取健康师业绩列表失败: {ex.Message}"); + } + } + #endregion + + #region 耗卡记录作废 + /// + /// 耗卡记录作废 + /// + /// 耗卡记录ID + /// + [HttpPut("CancelCardUsageRecord/{id}")] + public async Task CancelCardUsageRecord(string id) + { + try + { + //开启事务 + _db.BeginTran(); + //查询消耗记录表信息 + var LqhyhkInfo = await _db.Queryable().Where(p => p.Id == id && p.IsEffective == StatusEnum.有效.GetHashCode()).FirstAsync(); + if (LqhyhkInfo == null) + { + throw NCCException.Oh(ErrorCode.COM1005, "耗卡记录不存在或已作废"); + } + //更新耗卡记录状态 + LqhyhkInfo.IsEffective = StatusEnum.无效.GetHashCode(); + await _db.Updateable(LqhyhkInfo).ExecuteCommandAsync(); + //更新品项明细表状态 + await _db.Updateable().SetColumns(it => new LqXhPxmxEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(w => w.ConsumeInfoId == id).ExecuteCommandAsync(); + //更新健康师业绩表状态 + await _db.Updateable().SetColumns(it => new LqXhJksyjEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(w => w.Glkdbh == id).ExecuteCommandAsync(); + //更新科技部老师业绩表状态 + await _db.Updateable().SetColumns(it => new LqXhKjbsyjEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(w => w.Glkdbh == id).ExecuteCommandAsync(); + //关闭事务 + _db.CommitTran(); + return LqhyhkInfo; + } + catch (Exception) + { + //回滚事务 + _db.RollbackTran(); + throw NCCException.Oh(ErrorCode.COM1001); + } + } + #endregion + + #region 获取某个会员的耗卡记录 + /// + /// 获取某个会员的耗卡记录（分页） + /// + /// 查询参数 + /// + [HttpGet("GetMemberCardUsageRecord")] + public async Task GetMemberCardUsageRecord([FromQuery] LqXhHyhkMemberCardUsageQueryInput input) + { + try + { + // 参数验证 + if (string.IsNullOrEmpty(input.MemberId)) + { + throw NCCException.Oh("会员ID不能为空"); + } + // 分页查询会员耗卡记录 + var data = await _db.Queryable() + .Where(p => p.Hy == input.MemberId && p.IsEffective == StatusEnum.有效.GetHashCode()) + .WhereIF(!string.IsNullOrEmpty(input.StoreId), p => p.Md == input.StoreId) + .WhereIF(input.StartTime.HasValue, p => p.Hksj >= input.StartTime.Value) + .WhereIF(input.EndTime.HasValue, p => p.Hksj <= input.EndTime.Value) + .Select(it => new LqXhHyhkMemberCardUsageOutput + { + Id = it.Id, + MemberId = it.Hy, + MemberName = it.Hymc, + StoreId = it.Md, + StoreName = it.Mdmc, + UsageDate = it.Hksj, + TotalAmount = it.Xfje, + Remarks = it.SignatureFile, + CreateTime = it.CreateTime + }) + .MergeTable() + .OrderBy((input.sidx == null ? "UsageDate" : input.sidx) + " " + (input.sort ?? "desc")) + .ToPagedListAsync(input.currentPage, input.pageSize); + + // 获取当前页耗卡记录ID，直接查询对应的品项明细 + if (data.list.Any()) + { + var recordIds = data.list.Select(r => r.Id).ToList(); + // 批量查询当前页记录的所有品项明细 + var itemDetails = await _db.Queryable().Where(w => recordIds.Contains(w.ConsumeInfoId) && w.IsEffective == StatusEnum.有效.GetHashCode()).ToListAsync(); + // 按耗卡记录ID分组明细 + var detailsGrouped = itemDetails.GroupBy(d => d.ConsumeInfoId).ToDictionary(g => g.Key, g => g.ToList()); + // 为每个记录添加品项明细 + foreach (var record in data.list) + { + if (detailsGrouped.ContainsKey(record.Id)) + { + record.ItemDetails = detailsGrouped[record.Id].Select(detail => new LqXhHyhkMemberCardUsageItemDetail + { + Id = detail.Id, + ItemId = detail.Px, + ItemName = detail.Pxmc, + UnitPrice = detail.Pxjg, + ProjectNumber = detail.ProjectNumber, + TotalPrice = detail.TotalPrice, + SourceType = detail.SourceType, + CreateTime = detail.CreateTIme + }).ToList(); + } + } + } + return PageResult.SqlSugarPageResult(data); + } + catch (Exception ex) + { + throw NCCException.Oh($"获取会员耗卡记录失败: {ex.Message}"); + } + } + #endregion + } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqXhmxbService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqXhmxbService.cs deleted file mode 100644 index 02af8f3..0000000 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqXhmxbService.cs +++ /dev/null @@ -1,273 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Mapster; -using Microsoft.AspNetCore.Mvc; -using NCC.ClayObject; -using NCC.Common.Configuration; -using NCC.Common.Core.Manager; -using NCC.Common.Enum; -using NCC.Common.Extension; -using NCC.Common.Filter; -using NCC.Common.Helper; -using NCC.Common.Model.NPOI; -using NCC.DataEncryption; -using NCC.Dependency; -using NCC.DynamicApiController; -using NCC.Extend.Entitys.Dto.LqXhmxb; -using NCC.Extend.Entitys.lq_xhmxb; -using NCC.Extend.Interfaces.LqXhmxb; -using NCC.FriendlyException; -using NCC.JsonSerialization; -using SqlSugar; -using Yitter.IdGenerator; - -namespace NCC.Extend.LqXhmxb -{ - /// - /// 消耗明细表服务 - /// - [ApiDescriptionSettings(Tag = "Extend", Name = "LqXhmxb", Order = 200)] - [Route("api/Extend/[controller]")] - public class LqXhmxbService : ILqXhmxbService, IDynamicApiController, ITransient - { - private readonly ISqlSugarRepository _lqXhmxbRepository; - private readonly SqlSugarScope _db; - private readonly IUserManager _userManager; - - /// - /// 初始化一个类型的新实例 - /// - public LqXhmxbService(ISqlSugarRepository lqXhmxbRepository, IUserManager userManager) - { - _lqXhmxbRepository = lqXhmxbRepository; - _db = _lqXhmxbRepository.Context; - _userManager = userManager; - } - - /// - /// 获取消耗明细表 - /// - /// 参数 - /// - [HttpGet("{id}")] - public async Task GetInfo(string id) - { - var entity = await _db.Queryable().FirstAsync(p => p.Id == id); - var output = entity.Adapt(); - return output; - } - - /// - /// 获取消耗明细表列表 - /// - /// 请求参数 - /// - [HttpGet("")] - public async Task GetList([FromQuery] LqXhmxbListQueryInput input) - { - var sidx = input.sidx == null ? "id" : input.sidx; - var data = await _db.Queryable() - .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id)) - .WhereIF(!string.IsNullOrEmpty(input.mdbh), p => p.Mdbh.Contains(input.mdbh)) - .WhereIF(!string.IsNullOrEmpty(input.mdmc), p => p.Mdmc.Contains(input.mdmc)) - .WhereIF(!string.IsNullOrEmpty(input.bmbh), p => p.Bmbh.Contains(input.bmbh)) - .WhereIF(!string.IsNullOrEmpty(input.bmmc), p => p.Bmmc.Contains(input.bmmc)) - .WhereIF(!string.IsNullOrEmpty(input.ygbh), p => p.Ygbh.Contains(input.ygbh)) - .WhereIF(!string.IsNullOrEmpty(input.ygmc), p => p.Ygmc.Contains(input.ygmc)) - .WhereIF(!string.IsNullOrEmpty(input.xms), p => p.Xms.Contains(input.xms)) - .WhereIF(!string.IsNullOrEmpty(input.xh), p => p.Xh.Contains(input.xh)) - .WhereIF(!string.IsNullOrEmpty(input.sg), p => p.Sg.Contains(input.sg)) - .WhereIF(!string.IsNullOrEmpty(input.qtsg1), p => p.Qtsg1.Contains(input.qtsg1)) - .WhereIF(!string.IsNullOrEmpty(input.qtsg2), p => p.Qtsg2.Contains(input.qtsg2)) - .WhereIF(!string.IsNullOrEmpty(input.qtsg3), p => p.Qtsg3.Contains(input.qtsg3)) - .WhereIF(!string.IsNullOrEmpty(input.sghj), p => p.Sghj.Contains(input.sghj)) - .Select(it => new LqXhmxbListOutput - { - id = it.Id, - mdbh = it.Mdbh, - mdmc = it.Mdmc, - bmbh = it.Bmbh, - bmmc = it.Bmmc, - ygbh = it.Ygbh, - ygmc = it.Ygmc, - xms = it.Xms, - xh = it.Xh, - sg = it.Sg, - qtsg1 = it.Qtsg1, - qtsg2 = it.Qtsg2, - qtsg3 = it.Qtsg3, - sghj = it.Sghj, - }) - .MergeTable() - .OrderBy(sidx + " " + input.sort) - .ToPagedListAsync(input.currentPage, input.pageSize); - return PageResult.SqlSugarPageResult(data); - } - - /// - /// 新建消耗明细表 - /// - /// 参数 - /// - [HttpPost("")] - public async Task Create([FromBody] LqXhmxbCrInput input) - { - var userInfo = await _userManager.GetUserInfo(); - var entity = input.Adapt(); - entity.Id = YitIdHelper.NextId().ToString(); - var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync(); - if (!(isOk > 0)) - throw NCCException.Oh(ErrorCode.COM1000); - } - - /// - /// 获取消耗明细表无分页列表 - /// - /// 请求参数 - /// - [NonAction] - public async Task GetNoPagingList([FromQuery] LqXhmxbListQueryInput input) - { - var sidx = input.sidx == null ? "id" : input.sidx; - var data = await _db.Queryable() - .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id)) - .WhereIF(!string.IsNullOrEmpty(input.mdbh), p => p.Mdbh.Contains(input.mdbh)) - .WhereIF(!string.IsNullOrEmpty(input.mdmc), p => p.Mdmc.Contains(input.mdmc)) - .WhereIF(!string.IsNullOrEmpty(input.bmbh), p => p.Bmbh.Contains(input.bmbh)) - .WhereIF(!string.IsNullOrEmpty(input.bmmc), p => p.Bmmc.Contains(input.bmmc)) - .WhereIF(!string.IsNullOrEmpty(input.ygbh), p => p.Ygbh.Contains(input.ygbh)) - .WhereIF(!string.IsNullOrEmpty(input.ygmc), p => p.Ygmc.Contains(input.ygmc)) - .WhereIF(!string.IsNullOrEmpty(input.xms), p => p.Xms.Contains(input.xms)) - .WhereIF(!string.IsNullOrEmpty(input.xh), p => p.Xh.Contains(input.xh)) - .WhereIF(!string.IsNullOrEmpty(input.sg), p => p.Sg.Contains(input.sg)) - .WhereIF(!string.IsNullOrEmpty(input.qtsg1), p => p.Qtsg1.Contains(input.qtsg1)) - .WhereIF(!string.IsNullOrEmpty(input.qtsg2), p => p.Qtsg2.Contains(input.qtsg2)) - .WhereIF(!string.IsNullOrEmpty(input.qtsg3), p => p.Qtsg3.Contains(input.qtsg3)) - .WhereIF(!string.IsNullOrEmpty(input.sghj), p => p.Sghj.Contains(input.sghj)) - .Select(it => new LqXhmxbListOutput - { - id = it.Id, - mdbh = it.Mdbh, - mdmc = it.Mdmc, - bmbh = it.Bmbh, - bmmc = it.Bmmc, - ygbh = it.Ygbh, - ygmc = it.Ygmc, - xms = it.Xms, - xh = it.Xh, - sg = it.Sg, - qtsg1 = it.Qtsg1, - qtsg2 = it.Qtsg2, - qtsg3 = it.Qtsg3, - sghj = it.Sghj, - }) - .MergeTable() - .OrderBy(sidx + " " + input.sort) - .ToListAsync(); - return data; - } - - /// - /// 导出消耗明细表 - /// - /// 请求参数 - /// - [HttpGet("Actions/Export")] - public async Task Export([FromQuery] LqXhmxbListQueryInput input) - { - var userInfo = await _userManager.GetUserInfo(); - var exportData = new List(); - if (input.dataType == 0) - { - var data = Clay.Object(await this.GetList(input)); - exportData = data.Solidify>().list; - } - else - { - exportData = await this.GetNoPagingList(input); - } - List paramList = - "[{\"value\":\"消耗编号\",\"field\":\"id\"},{\"value\":\"门店编号\",\"field\":\"mdbh\"},{\"value\":\"门店名称\",\"field\":\"mdmc\"},{\"value\":\"部门编号\",\"field\":\"bmbh\"},{\"value\":\"部门名称\",\"field\":\"bmmc\"},{\"value\":\"员工编号\",\"field\":\"ygbh\"},{\"value\":\"员工名称\",\"field\":\"ygmc\"},{\"value\":\"项目数\",\"field\":\"xms\"},{\"value\":\"消耗\",\"field\":\"xh\"},{\"value\":\"手工\",\"field\":\"sg\"},{\"value\":\"其它手工1\",\"field\":\"qtsg1\"},{\"value\":\"其它手工2\",\"field\":\"qtsg2\"},{\"value\":\"其它手工3\",\"field\":\"qtsg3\"},{\"value\":\"手工合计\",\"field\":\"sghj\"},]".ToList(); - ExcelConfig excelconfig = new ExcelConfig(); - excelconfig.FileName = "消耗明细表.xls"; - excelconfig.HeadFont = "微软雅黑"; - excelconfig.HeadPoint = 10; - excelconfig.IsAllSizeColumn = true; - excelconfig.ColumnModel = new List(); - List selectKeyList = input.selectKey.Split(',').ToList(); - foreach (var item in selectKeyList) - { - var isExist = paramList.Find(p => p.field == item); - if (isExist != null) - { - excelconfig.ColumnModel.Add(new ExcelColumnModel() { Column = isExist.field, ExcelColumn = isExist.value }); - } - } - var addPath = FileVariable.TemporaryFilePath + excelconfig.FileName; - ExcelExportHelper.Export(exportData, excelconfig, addPath); - var fileName = _userManager.UserId + "|" + addPath + "|xls"; - var output = new { name = excelconfig.FileName, url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC") }; - return output; - } - - /// - /// 批量删除消耗明细表 - /// - /// 主键数组 - /// - [HttpPost("batchRemove")] - public async Task BatchRemove([FromBody] List ids) - { - var entitys = await _db.Queryable().In(it => it.Id, ids).ToListAsync(); - if (entitys.Count > 0) - { - try - { - //开启事务 - _db.BeginTran(); - //批量删除消耗明细表 - await _db.Deleteable().In(d => d.Id, ids).ExecuteCommandAsync(); - //关闭事务 - _db.CommitTran(); - } - catch (Exception) - { - //回滚事务 - _db.RollbackTran(); - throw NCCException.Oh(ErrorCode.COM1002); - } - } - } - - /// - /// 更新消耗明细表 - /// - /// 主键 - /// 参数 - /// - [HttpPut("{id}")] - public async Task Update(string id, [FromBody] LqXhmxbUpInput input) - { - var entity = input.Adapt(); - var isOk = await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); - if (!(isOk > 0)) - throw NCCException.Oh(ErrorCode.COM1001); - } - - /// - /// 删除消耗明细表 - /// - /// - [HttpDelete("{id}")] - public async Task Delete(string id) - { - var entity = await _db.Queryable().FirstAsync(p => p.Id == id); - _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005); - var isOk = await _db.Deleteable().Where(d => d.Id == id).ExecuteCommandAsync(); - if (!(isOk > 0)) - throw NCCException.Oh(ErrorCode.COM1002); - } - } -} diff --git a/netcore/src/Modularity/Extend/NCC.Extend/Utils/LqKdKdjlbStringGenerator.cs b/netcore/src/Modularity/Extend/NCC.Extend/Utils/LqKdKdjlbStringGenerator.cs index 876fff8..47c6766 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/Utils/LqKdKdjlbStringGenerator.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/Utils/LqKdKdjlbStringGenerator.cs @@ -46,8 +46,9 @@ namespace NCC.Extend.Utils var customerName = GetCustomerName(entity.kdhy); sb.AppendLine($"⏩顾客姓名：{customerName}"); // 健康师：王维 - var healthTeachers = HealthInstructorNames.TrimEnd(','); - sb.AppendLine($"⏩健康师：{healthTeachers}"); + //这里需要把HealthInstructorNames去重，HealthInstructorNames格式为张三、李四、张三、 + var healthTeachers = HealthInstructorNames.Split(',', StringSplitOptions.RemoveEmptyEntries).Distinct().ToArray(); + sb.AppendLine($"⏩健康师：{string.Join("、", healthTeachers)}"); // 活动方案：532工程 sb.AppendLine($"⏩活动方案：{entity.pxxx ?? "无"}"); -- libgit2 0.21.4