From 850bf2058d189ec6f83db1e9f03dea5c0d294a9b Mon Sep 17 00:00:00 2001 From: “wangming” <“wangming@antissoft.com”> Date: Fri, 19 Sep 2025 10:04:49 +0800 Subject: [PATCH] Add ActualPrice field to LqKdKdjlb and LqKdPxmx entities and DTOs for enhanced pricing details --- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbCrInput.cs | 57 ++++++++++++++++++++++++++++----------------------------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdPxmx/LqKdPxmxCrInput.cs | 5 +++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_kdjlb/LqKdKdjlbEntity.cs | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_pxmx/LqKdPxmxEntity.cs | 43 +++++++++++++++++++++++-------------------- netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs | 1 + netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs | 2 +- 6 files changed, 116 insertions(+), 109 deletions(-) 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 cb4b367..18162ef 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 @@ -13,146 +13,145 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb /// 开单编号 /// public string id { get; set; } - + /// /// 单据门店 /// public string djmd { get; set; } - + /// /// 金三角 /// public string jsj { get; set; } - + /// /// 开单日期 /// public DateTime? kdrq { get; set; } - + /// /// 顾客类型 /// public string gjlx { get; set; } - + /// /// 合作机构 /// public string hgjg { get; set; } - + /// /// 整单业绩 /// public decimal zdyj { get; set; } - + /// /// 实付业绩 /// public decimal sfyj { get; set; } - + /// /// 欠款 /// public decimal qk { get; set; } - + /// /// 储扣方式 /// public string ckfs { get; set; } - + /// /// 储扣明细 /// public string ckmx { get; set; } - + /// /// 付款方式 /// public string fkfs { get; set; } - + /// /// 付款医院 /// public string fkyy { get; set; } - + /// /// 付款判断 /// public string fkpd { get; set; } - + /// /// 客户来源 /// public string khly { get; set; } - + /// /// 推荐人 /// public string tjr { get; set; } - + /// /// 是否首开订单 /// public string sfskdd { get; set; } - + /// /// 简介 /// public string jj { get; set; } - + /// /// 上传文件 /// public List scwj { get; set; } - + /// /// 会员签字 /// public List hyqz { get; set; } - + /// /// 备注 /// public string bz { get; set; } - + /// /// 开单会员 /// public string kdhy { get; set; } - + /// /// 开单会员名称 /// public string kdhyc { get; set; } - + /// /// 开单会员手机号 /// public string kdhysjh { get; set; } - + /// /// 健康师业绩 /// public string jksyj { get; set; } - + /// /// 科技部老师业绩 /// public string kjblsyj { get; set; } - + /// /// 品项信息 /// public string pxxx { get; set; } - + /// /// 方案其他 /// public string F_FIleUrl { get; set; } - + /// /// 开单_品项明细 /// public List lqKdPxmxList { 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 167a35c..e34c224 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 @@ -34,6 +34,11 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb public decimal pxjg { get; set; } /// + /// 实付金额 + /// + public decimal actualPrice { get; set; } + + /// /// 会员id /// public string memberId { 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 d7e728b..075ea1c 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 @@ -1,6 +1,6 @@ -using NCC.Common.Const; +using System; +using NCC.Common.Const; using SqlSugar; -using System; namespace NCC.Extend.Entitys.lq_kd_kdjlb { @@ -16,174 +16,173 @@ namespace NCC.Extend.Entitys.lq_kd_kdjlb /// [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)] public string Id { get; set; } - + /// /// 单据门店 /// - [SugarColumn(ColumnName = "djmd")] + [SugarColumn(ColumnName = "djmd")] public string Djmd { get; set; } - + /// /// 金三角 /// - [SugarColumn(ColumnName = "jsj")] + [SugarColumn(ColumnName = "jsj")] public string Jsj { get; set; } - + /// /// 开单日期 /// - [SugarColumn(ColumnName = "kdrq")] + [SugarColumn(ColumnName = "kdrq")] public DateTime? Kdrq { get; set; } - + /// /// 顾客类型 /// - [SugarColumn(ColumnName = "gjlx")] + [SugarColumn(ColumnName = "gjlx")] public string Gjlx { get; set; } - + /// /// 合作机构 /// - [SugarColumn(ColumnName = "hgjg")] + [SugarColumn(ColumnName = "hgjg")] public string Hgjg { get; set; } - + /// /// 整单业绩 /// - [SugarColumn(ColumnName = "zdyj")] + [SugarColumn(ColumnName = "zdyj")] public decimal Zdyj { get; set; } - + /// /// 实付业绩 /// - [SugarColumn(ColumnName = "sfyj")] + [SugarColumn(ColumnName = "sfyj")] public decimal Sfyj { get; set; } - + /// /// 欠款 /// - [SugarColumn(ColumnName = "qk")] + [SugarColumn(ColumnName = "qk")] public decimal Qk { get; set; } - + /// /// 储扣方式 /// - [SugarColumn(ColumnName = "ckfs")] + [SugarColumn(ColumnName = "ckfs")] public string Ckfs { get; set; } - + /// /// 储扣明细 /// - [SugarColumn(ColumnName = "ckmx")] + [SugarColumn(ColumnName = "ckmx")] public string Ckmx { get; set; } - + /// /// 付款方式 /// - [SugarColumn(ColumnName = "fkfs")] + [SugarColumn(ColumnName = "fkfs")] public string Fkfs { get; set; } - + /// /// 付款医院 /// - [SugarColumn(ColumnName = "fkyy")] + [SugarColumn(ColumnName = "fkyy")] public string Fkyy { get; set; } - + /// /// 付款判断 /// - [SugarColumn(ColumnName = "fkpd")] + [SugarColumn(ColumnName = "fkpd")] public string Fkpd { get; set; } - + /// /// 客户来源 /// - [SugarColumn(ColumnName = "khly")] + [SugarColumn(ColumnName = "khly")] public string Khly { get; set; } - + /// /// 推荐人 /// - [SugarColumn(ColumnName = "tjr")] + [SugarColumn(ColumnName = "tjr")] public string Tjr { get; set; } - + /// /// 是否首开订单 /// - [SugarColumn(ColumnName = "sfskdd")] + [SugarColumn(ColumnName = "sfskdd")] public string Sfskdd { get; set; } - + /// /// 简介 /// - [SugarColumn(ColumnName = "jj")] + [SugarColumn(ColumnName = "jj")] public string Jj { get; set; } - + /// /// 上传文件 /// - [SugarColumn(ColumnName = "scwj")] + [SugarColumn(ColumnName = "scwj")] public string Scwj { get; set; } - + /// /// 会员签字 /// - [SugarColumn(ColumnName = "hyqz")] + [SugarColumn(ColumnName = "hyqz")] public string Hyqz { get; set; } - + /// /// 备注 /// - [SugarColumn(ColumnName = "bz")] + [SugarColumn(ColumnName = "bz")] public string Bz { get; set; } - + /// /// 开单会员 /// - [SugarColumn(ColumnName = "kdhy")] + [SugarColumn(ColumnName = "kdhy")] public string Kdhy { get; set; } - + /// /// 开单会员名称 /// - [SugarColumn(ColumnName = "kdhyc")] + [SugarColumn(ColumnName = "kdhyc")] public string Kdhyc { get; set; } - + /// /// 开单会员手机号 /// - [SugarColumn(ColumnName = "kdhysjh")] + [SugarColumn(ColumnName = "kdhysjh")] public string Kdhysjh { get; set; } - + /// /// 健康师业绩 /// - [SugarColumn(ColumnName = "jksyj")] + [SugarColumn(ColumnName = "jksyj")] public string Jksyj { get; set; } - + /// /// 科技部老师业绩 /// - [SugarColumn(ColumnName = "kjblsyj")] + [SugarColumn(ColumnName = "kjblsyj")] public string Kjblsyj { get; set; } - + /// /// 品项信息 /// - [SugarColumn(ColumnName = "pxxx")] + [SugarColumn(ColumnName = "pxxx")] public string Pxxx { get; set; } /// /// 开单用户 /// - [SugarColumn(ColumnName = "F_CreateUser")] + [SugarColumn(ColumnName = "F_CreateUser")] public string CreateUser { get; set; } - + /// /// 方案其他 /// - [SugarColumn(ColumnName = "F_FIleUrl")] + [SugarColumn(ColumnName = "F_FIleUrl")] public string F_FIleUrl { get; set; } - } -} \ No newline at end of file +} 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 3bc66bb..7e4f21f 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 @@ -1,6 +1,6 @@ -using NCC.Common.Const; +using System; +using NCC.Common.Const; using SqlSugar; -using System; namespace NCC.Extend.Entitys.lq_kd_pxmx { @@ -16,68 +16,71 @@ namespace NCC.Extend.Entitys.lq_kd_pxmx /// [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)] public string Id { get; set; } - + /// /// 关联开单编号 /// - [SugarColumn(ColumnName = "glkdbh")] + [SugarColumn(ColumnName = "glkdbh")] public string Glkdbh { get; set; } - + /// /// 品项 /// - [SugarColumn(ColumnName = "px")] + [SugarColumn(ColumnName = "px")] public string Px { get; set; } - + /// /// 品项名称 /// - [SugarColumn(ColumnName = "pxmc")] + [SugarColumn(ColumnName = "pxmc")] public string Pxmc { get; set; } - + /// /// 品项价格 /// - [SugarColumn(ColumnName = "pxjg")] + [SugarColumn(ColumnName = "pxjg")] public decimal Pxjg { get; set; } /// /// 会员id /// - [SugarColumn(ColumnName = "F_MemberId")] + [SugarColumn(ColumnName = "F_MemberId")] public string MemberId { get; set; } /// /// 创建时间 /// - [SugarColumn(ColumnName = "F_CreateTIme")] + [SugarColumn(ColumnName = "F_CreateTIme")] public DateTime? CreateTIme { get; set; } /// /// 项目次数 /// - [SugarColumn(ColumnName = "F_ProjectNumber")] + [SugarColumn(ColumnName = "F_ProjectNumber")] public int? ProjectNumber { get; set; } /// /// 是否有效 /// - [SugarColumn(ColumnName = "F_IsEnabled")] + [SugarColumn(ColumnName = "F_IsEnabled")] public int? IsEnabled { get; set; } - /// /// 来源类型 /// - [SugarColumn(ColumnName = "F_SourceType")] + [SugarColumn(ColumnName = "F_SourceType")] public string SourceType { get; set; } - /// /// 金额合计 /// - [SugarColumn(ColumnName = "F_TotalPrice")] + [SugarColumn(ColumnName = "F_TotalPrice")] public decimal TotalPrice { get; set; } - + + /// + /// 实付金额 + /// + [SugarColumn(ColumnName = "F_ActualPrice")] + public decimal ActualPrice { get; set; } } -} \ No newline at end of file +} diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs index bceffd5..3873e22 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs @@ -281,6 +281,7 @@ namespace NCC.Extend.LqKdKdjlb Pxmc = item.pxmc, Pxjg = item.pxjg, SourceType = item.sourceType, + ActualPrice = item.actualPrice, }; allPxmxEntities.Add(lqKdPxmxEntity); diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs index fd6f1c3..0f62233 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs @@ -336,7 +336,7 @@ namespace NCC.Extend.LqKhxx } #endregion - #region 获取客户订单类型 + #region 获取客户订单类型（首单/升单） /// /// 获取客户订单类型（首单/升单） /// -- libgit2 0.21.4