From bc35ccd11e5a69ef6f8b889302580b5887492e79 Mon Sep 17 00:00:00 2001 From: “wangming” <“wangming@antissoft.com”> Date: Fri, 31 Oct 2025 11:22:45 +0800 Subject: [PATCH] feat: 添加退卡业务相关功能 --- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_mx/LqHytkMxEntity.cs | 6 ++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Enum/StatusEnum.cs | 5 ----- netcore/src/Modularity/Extend/NCC.Extend/LqHytkHytkService.cs | 5 ++++- netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs | 1 + 数据库说明.md | 15 ++++++++++++++- 添加lq_hytk_mx表会员ID字段.sql | 27 +++++++++++++++++++++++++++ 6 files changed, 52 insertions(+), 7 deletions(-) create mode 100644 添加lq_hytk_mx表会员ID字段.sql 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 051cc2b..8786f9b 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 @@ -31,6 +31,12 @@ namespace NCC.Extend.Entitys.lq_hytk_mx public string BillingItemId { get; set; } /// + /// 会员id + /// + [SugarColumn(ColumnName = "F_MemberId")] + public string MemberId { get; set; } + + /// /// 品项 /// [SugarColumn(ColumnName = "px")] 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 b2b34c5..59e8dc1 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Enum/StatusEnum.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Enum/StatusEnum.cs @@ -19,10 +19,5 @@ namespace NCC.Extend.Entitys.Enum [Description("有效")] 有效 = 1, - /// - /// 删除 - /// - [Description("删除")] - 删除 = 99, } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqHytkHytkService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqHytkHytkService.cs index fad3d6d..ce5fd82 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqHytkHytkService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqHytkHytkService.cs @@ -24,6 +24,7 @@ using NCC.Extend.Entitys.lq_hytk_hytk; using NCC.Extend.Entitys.lq_hytk_jksyj; using NCC.Extend.Entitys.lq_hytk_kjbsyj; using NCC.Extend.Entitys.lq_hytk_mx; +using NCC.Extend.Entitys.lq_kd_pxmx; using NCC.Extend.Interfaces.LqHytkHytk; using NCC.FriendlyException; using NCC.JsonSerialization; @@ -230,6 +231,7 @@ namespace NCC.Extend.LqHytkHytk Id = YitIdHelper.NextId().ToString(), RefundInfoId = newEntity.Id, BillingItemId = item.billingItemId, + MemberId = newEntity.Hy, CreateTime = DateTime.Now, CreateUser = userInfo.userId, Px = item.px, @@ -368,18 +370,19 @@ namespace NCC.Extend.LqHytkHytk var allMxEntities = new List(); var allJksyjEntities = new List(); var allKjbsyjEntities = new List(); - // 处理品项明细列表 if (input.lqHytkMxList != null && input.lqHytkMxList.Any()) { foreach (var item in input.lqHytkMxList) { + // 创建品项明细实体 var lqHytkMxEntity = new LqHytkMxEntity { Id = YitIdHelper.NextId().ToString(), RefundInfoId = id, BillingItemId = item.billingItemId, + MemberId = entity.Hy, CreateTime = DateTime.Now, CreateUser = userInfo.userId, Tksj = input.tksj, diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs index 0969449..9b25335 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs @@ -2478,6 +2478,7 @@ namespace NCC.Extend.LqKdKdjlb Id = YitIdHelper.NextId().ToString(), RefundInfoId = refundId, BillingItemId = item.BillingItemId, + MemberId = input.FromMemberId, // 转卡时使用转出方会员ID CreateTime = transferTime, CreateUser = userInfo.userId, Px = refundPxmxEntity.Px, diff --git a/数据库说明.md b/数据库说明.md index e194e7c..d7784c2 100644 --- a/数据库说明.md +++ b/数据库说明.md @@ -90,7 +90,20 @@ - `lq_xh_jksyj.F_kdpxid` ↔ `lq_xh_pxmx.F_Id` (健康师业绩关联品项明细) - `lq_xh_kjbsyj.F_hkpxid` ↔ `lq_xh_pxmx.F_Id` (科技部老师业绩关联品项明细) -### 5. 业绩统计关系 +### 5. 退卡业务关系 +- **退卡记录**: `lq_hytk_hytk` (退卡记录表) +- **退卡品项明细**: `lq_hytk_mx` (退卡品项明细) +- **退卡健康师业绩**: `lq_hytk_jksyj` (退卡健康师业绩) +- **退卡科技部老师业绩**: `lq_hytk_kjbsyj` (退卡科技部老师业绩) +- **关联字段**: + - `lq_hytk_hytk.F_Id` ↔ `lq_hytk_mx.F_RefundInfoId` (退卡记录关联品项明细) + - `lq_hytk_hytk.F_Id` ↔ `lq_hytk_jksyj.gltkbh` (退卡记录关联健康师业绩) + - `lq_hytk_hytk.F_Id` ↔ `lq_hytk_kjbsyj.gltkbh` (退卡记录关联科技部老师业绩) + - `lq_hytk_mx.F_BillingItemId` ↔ `lq_kd_pxmx.F_Id` (退卡明细关联开单品项明细) + - `lq_hytk_mx.F_MemberId` ↔ `lq_khxx.F_Id` (退卡明细关联会员，通过会员ID) + - `lq_hytk_hytk.hy` ↔ `lq_khxx.F_Id` (退卡记录关联会员) + +### 6. 业绩统计关系 - **业绩明细**: `lq_yjmxb` (业绩统计表) - **关联字段**: - `lq_yjmxb.jks` ↔ `BASE_USER.F_REALNAME` (健康师姓名) diff --git a/添加lq_hytk_mx表会员ID字段.sql b/添加lq_hytk_mx表会员ID字段.sql new file mode 100644 index 0000000..b3b339d --- /dev/null +++ b/添加lq_hytk_mx表会员ID字段.sql @@ -0,0 +1,27 @@ +-- ============================================ +-- 为 lq_hytk_mx 表添加会员ID字段 +-- ============================================ + +-- 1. 添加会员ID字段 +ALTER TABLE lq_hytk_mx +ADD COLUMN F_MemberId VARCHAR(50) NULL COMMENT '会员id' AFTER F_BillingItemId; + +-- 2. 创建索引以优化查询性能 +CREATE INDEX idx_hytk_mx_member_id ON lq_hytk_mx(F_MemberId); + +-- 3. 根据退卡信息表填充现有数据的会员ID（通过 F_RefundInfoId 关联） +UPDATE lq_hytk_mx mx +INNER JOIN lq_hytk_hytk hytk ON mx.F_RefundInfoId = hytk.F_Id +SET mx.F_MemberId = hytk.hy +WHERE mx.F_MemberId IS NULL + AND hytk.hy IS NOT NULL + AND hytk.hy != ''; + +-- 4. 根据开单品项明细表填充会员ID（如果退卡信息表中没有，则从开单品项明细表获取） +UPDATE lq_hytk_mx mx +INNER JOIN lq_kd_pxmx pxmx ON mx.F_BillingItemId = pxmx.F_Id +SET mx.F_MemberId = pxmx.F_MemberId +WHERE mx.F_MemberId IS NULL + AND pxmx.F_MemberId IS NOT NULL + AND pxmx.F_MemberId != ''; + -- libgit2 0.21.4