diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytk/LqHytkHytkCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytk/LqHytkHytkCrInput.cs index 5765211..cf559c9 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytk/LqHytkHytkCrInput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytk/LqHytkHytkCrInput.cs @@ -95,5 +95,10 @@ namespace NCC.Extend.Entitys.Dto.LqHytkHytk /// 退卡品项明细列表 /// public List lqHytkMxList { get; set; } + + /// + /// 签名文件 + /// + public string signatureFile { get; set; } } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytk/LqHytkHytkInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytk/LqHytkHytkInfoOutput.cs index e812e0f..4b94cad 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytk/LqHytkHytkInfoOutput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytk/LqHytkHytkInfoOutput.cs @@ -15,72 +15,72 @@ namespace NCC.Extend.Entitys.Dto.LqHytkHytk /// 退卡编号 /// public string id { get; set; } - + /// /// 门店 /// public string md { get; set; } - + /// /// 门店编号 /// public string mdbh { get; set; } - + /// /// 门店名称 /// public string mdmc { get; set; } - + /// /// 会员 /// public string hy { get; set; } - + /// /// 会员姓名 /// public string hymc { get; set; } - + /// /// 会员账号 /// public string hyzh { get; set; } - + /// /// 顾客类型 /// public string gklx { get; set; } - + /// /// 退卡总金额 /// public decimal? tkje { get; set; } - + /// /// 手工费用 /// public decimal? sgfy { get; set; } - + /// /// 备注 /// public string bz { get; set; } - + /// /// 退卡时间 /// public DateTime? tksj { get; set; } - + /// /// 操作人员 /// public string czry { get; set; } - + /// /// 退卡状态 /// public string tkzt { get; set; } - + /// /// 退卡原因 /// @@ -92,6 +92,11 @@ namespace NCC.Extend.Entitys.Dto.LqHytkHytk public string fileUrl { get; set; } /// + /// 签名文件 + /// + public string signatureFile { get; set; } + + /// /// 退卡品项明细列表 /// public List lqHytkMxList { get; set; } @@ -105,6 +110,6 @@ namespace NCC.Extend.Entitys.Dto.LqHytkHytk /// 科技部老师业绩列表 /// public List lqHytkKjbsyjList { get; set; } - + } } \ No newline at end of file diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytk/LqHytkHytkUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytk/LqHytkHytkUpInput.cs index 18d38d4..1e15120 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytk/LqHytkHytkUpInput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytk/LqHytkHytkUpInput.cs @@ -15,72 +15,72 @@ namespace NCC.Extend.Entitys.Dto.LqHytkHytk /// 退卡编号 /// public string id { get; set; } - + /// /// 门店 /// public string md { get; set; } - + /// /// 门店编号 /// public string mdbh { get; set; } - + /// /// 门店名称 /// public string mdmc { get; set; } - + /// /// 会员 /// public string hy { get; set; } - + /// /// 会员姓名 /// public string hymc { get; set; } - + /// /// 会员账号 /// public string hyzh { get; set; } - + /// /// 顾客类型 /// public string gklx { get; set; } - + /// /// 退卡总金额 /// public decimal? tkje { get; set; } - + /// /// 手工费用 /// public decimal? sgfy { get; set; } - + /// /// 备注 /// public string bz { get; set; } - + /// /// 退卡时间 /// public DateTime? tksj { get; set; } - + /// /// 操作人员 /// public string czry { get; set; } - + /// /// 退卡状态 /// public string tkzt { get; set; } - + /// /// 退卡原因 /// @@ -90,21 +90,26 @@ namespace NCC.Extend.Entitys.Dto.LqHytkHytk /// 退卡附件 /// public string fileUrl { get; set; } - + + /// + /// 签名文件 + /// + public string signatureFile { get; set; } + /// /// 退卡品项明细列表 /// public List lqHytkMxList { get; set; } - + /// /// 退卡健康师业绩列表 /// public List lqHytkJksyjList { get; set; } - + /// /// 退卡科技部老师业绩列表 /// public List lqHytkKjbsyjList { get; set; } - + } } \ No newline at end of file diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/BillingRecordQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/BillingRecordQueryInput.cs new file mode 100644 index 0000000..2c81c21 --- /dev/null +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/BillingRecordQueryInput.cs @@ -0,0 +1,31 @@ +using System.ComponentModel.DataAnnotations; +using NCC.Common.Filter; + +namespace NCC.Extend.Entitys.Dto.LqKdKdjlb +{ + /// + /// 会员开单记录查询输入 + /// + public class BillingRecordQueryInput : PageInputBase + { + /// + /// 会员ID + /// + [Required(ErrorMessage = "会员ID不能为空")] + [Display(Name = "会员ID", Description = "查询开单记录的会员ID")] + public string MemberId { get; set; } + + + /// + /// 开始时间 + /// + [Display(Name = "开始时间", Description = "查询开单记录的开始时间")] + public System.DateTime? StartTime { get; set; } + + /// + /// 结束时间 + /// + [Display(Name = "结束时间", Description = "查询开单记录的结束时间")] + public System.DateTime? EndTime { 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 507cf03..431f4bc 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 @@ -116,31 +116,6 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb 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; } 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 f3c8a38..f4df48c 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 @@ -132,21 +132,6 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb 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; } 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 b33f235..a934992 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 @@ -124,21 +124,6 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb 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; } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbListQueryInput.cs index 6befc70..d7a1c3f 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbListQueryInput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbListQueryInput.cs @@ -124,20 +124,6 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb /// public string kdhysjh { get; set; } - /// - /// 健康师业绩 - /// - public string jksyj { get; set; } - - /// - /// 科技部老师业绩 - /// - public string kjblsyj { get; set; } - - /// - /// 品项信息 - /// - public string pxxx { get; set; } /// /// 方案其他 diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxCrInput.cs index 913412e..a4af7b9 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxCrInput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxCrInput.cs @@ -23,10 +23,6 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx /// public string sjh { get; set; } - /// - /// 档案号 - /// - public string dah { get; set; } /// /// 性别 diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhFeedback/LqXhFeedbackCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhFeedback/LqXhFeedbackCrInput.cs new file mode 100644 index 0000000..93ea5f6 --- /dev/null +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhFeedback/LqXhFeedbackCrInput.cs @@ -0,0 +1,36 @@ +using System; +using System.ComponentModel.DataAnnotations; + +namespace NCC.Extend.Entitys.Dto.LqXhFeedback +{ + /// + /// 耗卡反馈创建输入 + /// + public class LqXhFeedbackCrInput + { + /// + /// 耗卡记录ID + /// + [Required(ErrorMessage = "耗卡记录ID不能为空")] + [Display(Name = "耗卡记录ID", Description = "关联的耗卡记录ID")] + public string ConsumeId { get; set; } + + /// + /// 前图片 + /// + [Display(Name = "前图片", Description = "耗卡前的图片")] + public string BeforeImage { get; set; } + + /// + /// 后图片 + /// + [Display(Name = "后图片", Description = "耗卡后的图片")] + public string AfterImage { get; set; } + + /// + /// 备注 + /// + [Display(Name = "备注", Description = "反馈备注信息")] + public string Remark { get; set; } + } +} diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhFeedback/LqXhFeedbackInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhFeedback/LqXhFeedbackInfoOutput.cs new file mode 100644 index 0000000..a62ca01 --- /dev/null +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhFeedback/LqXhFeedbackInfoOutput.cs @@ -0,0 +1,55 @@ +using System; + +namespace NCC.Extend.Entitys.Dto.LqXhFeedback +{ + /// + /// 耗卡反馈详情输出 + /// + public class LqXhFeedbackInfoOutput + { + /// + /// 反馈记录ID + /// + public string id { get; set; } + + /// + /// 耗卡记录ID + /// + public string consumeId { get; set; } + + /// + /// 前图片 + /// + public string beforeImage { get; set; } + + /// + /// 后图片 + /// + public string afterImage { get; set; } + + /// + /// 备注 + /// + public string remark { get; set; } + + /// + /// 添加人ID + /// + public string createUser { get; set; } + + /// + /// 添加人姓名 + /// + public string createUserName { get; set; } + + /// + /// 添加时间 + /// + public DateTime createTime { get; set; } + + /// + /// 更新时间 + /// + public DateTime updateTime { get; set; } + } +} diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhFeedback/LqXhFeedbackListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhFeedback/LqXhFeedbackListOutput.cs new file mode 100644 index 0000000..71119d7 --- /dev/null +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhFeedback/LqXhFeedbackListOutput.cs @@ -0,0 +1,55 @@ +using System; + +namespace NCC.Extend.Entitys.Dto.LqXhFeedback +{ + /// + /// 耗卡反馈列表输出 + /// + public class LqXhFeedbackListOutput + { + /// + /// 反馈记录ID + /// + public string id { get; set; } + + /// + /// 耗卡记录ID + /// + public string consumeId { get; set; } + + /// + /// 前图片 + /// + public string beforeImage { get; set; } + + /// + /// 后图片 + /// + public string afterImage { get; set; } + + /// + /// 备注 + /// + public string remark { get; set; } + + /// + /// 添加人ID + /// + public string createUser { get; set; } + + /// + /// 添加人姓名 + /// + public string createUserName { get; set; } + + /// + /// 添加时间 + /// + public DateTime createTime { get; set; } + + /// + /// 更新时间 + /// + public DateTime updateTime { get; set; } + } +} diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhFeedback/LqXhFeedbackListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhFeedback/LqXhFeedbackListQueryInput.cs new file mode 100644 index 0000000..7b50695 --- /dev/null +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhFeedback/LqXhFeedbackListQueryInput.cs @@ -0,0 +1,30 @@ +using System; + +namespace NCC.Extend.Entitys.Dto.LqXhFeedback +{ + /// + /// 耗卡反馈列表查询输入 + /// + public class LqXhFeedbackListQueryInput : NCC.Common.Filter.PageInputBase + { + /// + /// 耗卡记录ID + /// + public string ConsumeId { get; set; } + + /// + /// 添加人ID + /// + public string CreateUser { get; set; } + + /// + /// 开始时间 + /// + public DateTime? StartTime { get; set; } + + /// + /// 结束时间 + /// + public DateTime? EndTime { get; set; } + } +} diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhFeedback/LqXhFeedbackUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhFeedback/LqXhFeedbackUpInput.cs new file mode 100644 index 0000000..afe6ebc --- /dev/null +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhFeedback/LqXhFeedbackUpInput.cs @@ -0,0 +1,18 @@ +using System; +using System.ComponentModel.DataAnnotations; + +namespace NCC.Extend.Entitys.Dto.LqXhFeedback +{ + /// + /// 耗卡反馈更新输入 + /// + public class LqXhFeedbackUpInput : LqXhFeedbackCrInput + { + /// + /// 反馈记录ID + /// + [Required(ErrorMessage = "反馈记录ID不能为空")] + [Display(Name = "反馈记录ID", Description = "要更新的反馈记录ID")] + public new string id { get; set; } + } +} diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkCrInput.cs index e3c80f8..215d6c4 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkCrInput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkCrInput.cs @@ -75,6 +75,11 @@ namespace NCC.Extend.Entitys.Dto.LqXhHyhk public string czry { get; set; } /// + /// 签名文件 + /// + public string signatureFile { get; set; } + + /// /// 耗卡_品项明细 /// public List lqXhPxmxList { get; set; } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkInfoOutput.cs index bc6d956..d1ccbc2 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkInfoOutput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkInfoOutput.cs @@ -15,96 +15,116 @@ namespace NCC.Extend.Entitys.Dto.LqXhHyhk /// 耗卡编号 /// public string id { get; set; } - + /// /// 门店 /// public string md { get; set; } - + /// /// 门店编号 /// public string mdbh { get; set; } - + /// /// 门店名称 /// public string mdmc { get; set; } - + /// /// 会员 /// public string hy { get; set; } - + /// /// 会员账号 /// public string hyzh { get; set; } - + /// /// 会员名称 /// public string hymc { get; set; } - + + /// + /// 会员手机号 + /// + public string memberPhone { get; set; } + /// /// 顾客类型 /// public string gklx { get; set; } - + /// /// 消费金额 /// public string xfje { get; set; } - + /// /// 手工费用 /// public string sgfy { get; set; } - + /// /// 是否有科技部 /// public string sfykjb { get; set; } - + /// /// 健康师业绩 /// public string jksyj { get; set; } - + /// /// 科技部业绩 /// public string kjbyj { get; set; } - + /// /// 品项信息 /// public string pxxx { get; set; } - + /// /// 耗卡时间 /// public DateTime? hksj { get; set; } - + /// /// 操作人员 /// public string czry { get; set; } - + + /// + /// 签名文件 + /// + public string signatureFile { get; set; } + + /// + /// 是否有效 + /// + public int isEffective { get; set; } + + /// + /// 作废备注 + /// + public string cancelRemark { get; set; } + /// /// 健康师业绩 /// public List lqXhJksyjList { get; set; } - + /// /// 科技部老师业绩 /// public List lqXhKjbsyjList { get; set; } - + /// /// 耗卡_品项明细 /// public List lqXhPxmxList { get; set; } - + } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkListOutput.cs index 9eef5f4..55d0219 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkListOutput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkListOutput.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using NCC.Extend.Entitys.Dto.LqXhPxmx; namespace NCC.Extend.Entitys.Dto.LqXhHyhk { @@ -77,5 +79,20 @@ namespace NCC.Extend.Entitys.Dto.LqXhHyhk /// public string czry { get; set; } + /// + /// 耗卡明细列表 + /// + public List ConsumeDetails { get; set; } + + /// + /// 签名文件 + /// + public string signatureFile { get; set; } + + /// + /// 是否有效 + /// + public int isEffective { get; set; } + } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlListOutput.cs index d9c2290..ec281ca 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlListOutput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlListOutput.cs @@ -11,97 +11,97 @@ namespace NCC.Extend.Entitys.Dto.LqXmzl /// 主键 /// public string id { get; set; } - + /// /// 项目编号 /// public string xmbh { get; set; } - + /// /// 项目名称 /// public string xmmc { get; set; } - + /// /// 标准价格 /// public decimal bzjg { get; set; } - + /// /// 项目时长(分钟) /// public int? xmsc { get; set; } - + /// /// 基础服务提成 /// public decimal jcfwtc { get; set; } - + /// /// 分类①-汇总表 /// public string fl1 { get; set; } - + /// /// 分类②-汇总表 /// public string fl2 { get; set; } - + /// /// 分类③-工资用 /// public string fl3 { get; set; } - + /// /// 分类④-统计品项用 /// public string fl4 { get; set; } - + /// /// 统计类别 /// public string tjlb { get; set; } - + /// /// 折扣类别 /// public string zklb { get; set; } - + /// /// 分类 /// public string fl { get; set; } - + /// /// 其它1 /// public string qt1 { get; set; } - + /// /// 其它2 /// public string qt2 { get; set; } - + /// /// 溯源金额 /// public decimal? syje { get; set; } - + /// /// Cell金额 /// public decimal? cellje { get; set; } - + /// /// 手工费 /// public decimal? sgf { get; set; } - + /// /// 项目次数 /// public int? projectNumber { get; set; } - + /// /// 来源类型 /// diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/Dto/LqMdXdbhsj/LqMdXdbhsjCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/Dto/LqMdXdbhsj/LqMdXdbhsjCrInput.cs index 68d88fa..cf4f511 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/Dto/LqMdXdbhsj/LqMdXdbhsjCrInput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/Dto/LqMdXdbhsj/LqMdXdbhsjCrInput.cs @@ -38,5 +38,12 @@ namespace NCC.Extend.Entitys.Dto.LqMdXdbhsj [Required(ErrorMessage = "是否启用不能为空")] [Range(0, 1, ErrorMessage = "是否启用值必须在0-1之间")] public int sfqy { get; set; } = 1; + + /// + /// 阶段 + /// + [Required(ErrorMessage = "阶段不能为空")] + [Range(0, 1, ErrorMessage = "阶段值必须在1-3之间")] + public int stage { get; set; } = 1; } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/Dto/LqMdXdbhsj/LqMdXdbhsjInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/Dto/LqMdXdbhsj/LqMdXdbhsjInfoOutput.cs index b2827a1..e2eba78 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/Dto/LqMdXdbhsj/LqMdXdbhsjInfoOutput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/Dto/LqMdXdbhsj/LqMdXdbhsjInfoOutput.cs @@ -41,5 +41,10 @@ namespace NCC.Extend.Entitys.Dto.LqMdXdbhsj /// 是否启用 /// public int sfqy { get; set; } + + /// + /// 阶段 + /// + public int stage { get; set; } } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/Dto/LqMdXdbhsj/LqMdXdbhsjListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/Dto/LqMdXdbhsj/LqMdXdbhsjListOutput.cs index b4da1a7..038873b 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/Dto/LqMdXdbhsj/LqMdXdbhsjListOutput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/Dto/LqMdXdbhsj/LqMdXdbhsjListOutput.cs @@ -41,5 +41,10 @@ namespace NCC.Extend.Entitys.Dto.LqMdXdbhsj /// 是否启用 /// public int sfqy { get; set; } + + /// + /// 阶段 + /// + public int stage { get; set; } } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/Dto/LqMdXdbhsj/LqMdXdbhsjUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/Dto/LqMdXdbhsj/LqMdXdbhsjUpInput.cs index de6323b..5a06375 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/Dto/LqMdXdbhsj/LqMdXdbhsjUpInput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/Dto/LqMdXdbhsj/LqMdXdbhsjUpInput.cs @@ -38,5 +38,12 @@ namespace NCC.Extend.Entitys.Dto.LqMdXdbhsj [Required(ErrorMessage = "是否启用不能为空")] [Range(0, 1, ErrorMessage = "是否启用值必须在0-1之间")] public int sfqy { get; set; } + + /// + /// 阶段 + /// + [Required(ErrorMessage = "阶段不能为空")] + [Range(0, 1, ErrorMessage = "阶段值必须在1-3之间")] + public int stage { get; set; } = 1; } } 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 6734291..327e6e5 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 @@ -137,5 +137,11 @@ namespace NCC.Extend.Entitys.lq_hytk_hytk /// [SugarColumn(ColumnName = "F_IsEffective")] public int IsEffective { get; set; } = StatusEnum.有效.GetHashCode(); + + /// + /// 签名文件 + /// + [SugarColumn(ColumnName = "F_SignatureFile")] + public string SignatureFile { get; set; } } } \ No newline at end of file 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 fe97609..cf18be8 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 @@ -157,24 +157,6 @@ namespace NCC.Extend.Entitys.lq_kd_kdjlb public string Kdhysjh { get; set; } /// - /// 健康师业绩 - /// - [SugarColumn(ColumnName = "jksyj")] - public string Jksyj { get; set; } - - /// - /// 科技部老师业绩 - /// - [SugarColumn(ColumnName = "kjblsyj")] - public string Kjblsyj { get; set; } - - /// - /// 品项信息 - /// - [SugarColumn(ColumnName = "pxxx")] - public string Pxxx { get; set; } - - /// /// 开单用户 /// [SugarColumn(ColumnName = "F_CreateUser")] diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_md_xdbhsj/LqMdXdbhsjEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_md_xdbhsj/LqMdXdbhsjEntity.cs index 1d3352e..fb0f9b3 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_md_xdbhsj/LqMdXdbhsjEntity.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_md_xdbhsj/LqMdXdbhsjEntity.cs @@ -16,42 +16,48 @@ namespace NCC.Extend.Entitys.lq_md_xdbhsj /// [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)] public string Id { get; set; } - + /// /// 门店ID /// - [SugarColumn(ColumnName = "mdid")] + [SugarColumn(ColumnName = "mdid")] public string Mdid { get; set; } - + /// /// 保护开始时间 /// - [SugarColumn(ColumnName = "bhkssj")] + [SugarColumn(ColumnName = "bhkssj")] public DateTime Bhkssj { get; set; } - + /// /// 保护结束时间 /// - [SugarColumn(ColumnName = "bhjssj")] + [SugarColumn(ColumnName = "bhjssj")] public DateTime Bhjssj { get; set; } - + /// /// 说明 /// - [SugarColumn(ColumnName = "sm")] + [SugarColumn(ColumnName = "sm")] public string Sm { get; set; } - + /// /// 创建时间 /// - [SugarColumn(ColumnName = "cjsj")] + [SugarColumn(ColumnName = "cjsj")] public DateTime Cjsj { get; set; } - + /// /// 是否启用(1启用,0禁用) /// - [SugarColumn(ColumnName = "sfqy")] + [SugarColumn(ColumnName = "sfqy")] public int Sfqy { get; set; } - + + /// + /// 阶段 + /// + [SugarColumn(ColumnName = "F_Stage")] + public int Stage { get; set; } + } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_mdxx/LqMdxxEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_mdxx/LqMdxxEntity.cs index e3f8beb..5cc89e8 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_mdxx/LqMdxxEntity.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_mdxx/LqMdxxEntity.cs @@ -16,168 +16,174 @@ namespace NCC.Extend.Entitys.lq_mdxx /// [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)] public string Id { get; set; } - + /// /// 门店编码 /// - [SugarColumn(ColumnName = "mdbm")] + [SugarColumn(ColumnName = "mdbm")] public string Mdbm { get; set; } - + /// /// 单据门店编号 /// - [SugarColumn(ColumnName = "djmdbh")] + [SugarColumn(ColumnName = "djmdbh")] public string Djmdbh { get; set; } - + /// /// 单据门店 /// - [SugarColumn(ColumnName = "djmd")] + [SugarColumn(ColumnName = "djmd")] public string Djmd { get; set; } - + /// /// 店名 /// - [SugarColumn(ColumnName = "dm")] + [SugarColumn(ColumnName = "dm")] public string Dm { get; set; } - + /// /// 城市 /// - [SugarColumn(ColumnName = "cs")] + [SugarColumn(ColumnName = "cs")] public string Cs { get; set; } - + /// /// 地址 /// - [SugarColumn(ColumnName = "dz")] + [SugarColumn(ColumnName = "dz")] public string Dz { get; set; } - + /// /// 姓名 /// - [SugarColumn(ColumnName = "xm")] + [SugarColumn(ColumnName = "xm")] public string Xm { get; set; } - + /// /// 电话号码 /// - [SugarColumn(ColumnName = "dhhm")] + [SugarColumn(ColumnName = "dhhm")] public string Dhhm { get; set; } - + /// /// 座机 /// - [SugarColumn(ColumnName = "zj")] + [SugarColumn(ColumnName = "zj")] public string Zj { get; set; } - + /// /// 开业时间 /// - [SugarColumn(ColumnName = "kysj")] + [SugarColumn(ColumnName = "kysj")] public DateTime? Kysj { get; set; } - + /// /// 最新状态 /// - [SugarColumn(ColumnName = "zxzt")] + [SugarColumn(ColumnName = "zxzt")] public string Zxzt { get; set; } - + /// /// 工商名称 /// - [SugarColumn(ColumnName = "gsmc")] + [SugarColumn(ColumnName = "gsmc")] public string Gsmc { get; set; } - + /// /// 法人 /// - [SugarColumn(ColumnName = "fr")] + [SugarColumn(ColumnName = "fr")] public string Fr { get; set; } - + /// /// 有无社保 /// - [SugarColumn(ColumnName = "ywsb")] + [SugarColumn(ColumnName = "ywsb")] public string Ywsb { get; set; } - + /// /// 事业部 /// - [SugarColumn(ColumnName = "syb")] + [SugarColumn(ColumnName = "syb")] public string Syb { get; set; } - + /// /// 教育部 /// - [SugarColumn(ColumnName = "jyb")] + [SugarColumn(ColumnName = "jyb")] public string Jyb { get; set; } - + /// /// 科技部 /// - [SugarColumn(ColumnName = "kjb")] + [SugarColumn(ColumnName = "kjb")] public string Kjb { get; set; } - + /// /// 大项目部 /// - [SugarColumn(ColumnName = "dxmb")] + [SugarColumn(ColumnName = "dxmb")] public string Dxmb { get; set; } - + /// /// 归属起始时间 /// - [SugarColumn(ColumnName = "gsqssj")] + [SugarColumn(ColumnName = "gsqssj")] public DateTime? Gsqssj { get; set; } - + /// /// 归属终止时间 /// - [SugarColumn(ColumnName = "gszzsj")] + [SugarColumn(ColumnName = "gszzsj")] public DateTime? Gszzsj { get; set; } - + /// /// 状态 /// - [SugarColumn(ColumnName = "status")] + [SugarColumn(ColumnName = "status")] public int? Status { get; set; } - + /// /// 目标-门店生命线 /// - [SugarColumn(ColumnName = "xsyj")] + [SugarColumn(ColumnName = "xsyj")] public decimal? Xsyj { get; set; } - + /// /// 目标-消耗业绩 /// - [SugarColumn(ColumnName = "xhyj")] + [SugarColumn(ColumnName = "xhyj")] public decimal? Xhyj { get; set; } - + /// /// 目标-项目数 /// - [SugarColumn(ColumnName = "xms")] + [SugarColumn(ColumnName = "xms")] public int? Xms { get; set; } - + /// /// 目标-人头1 /// - [SugarColumn(ColumnName = "rt1")] + [SugarColumn(ColumnName = "rt1")] public int? Rt1 { get; set; } - + /// /// 目标-人头2 /// - [SugarColumn(ColumnName = "rt2")] + [SugarColumn(ColumnName = "rt2")] public int? Rt2 { get; set; } - + /// /// 目标-人次 /// - [SugarColumn(ColumnName = "rc")] + [SugarColumn(ColumnName = "rc")] public int? Rc { get; set; } - + + /// + /// 门店类型 + /// + [SugarColumn(ColumnName = "F_StoreType")] + public int? StoreType { get; set; } + } } \ No newline at end of file diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_feedback/LqXhFeedbackEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_feedback/LqXhFeedbackEntity.cs new file mode 100644 index 0000000..3758096 --- /dev/null +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_feedback/LqXhFeedbackEntity.cs @@ -0,0 +1,62 @@ +using System; +using NCC.Common.Const; +using SqlSugar; + +namespace NCC.Extend.Entitys.lq_xh_feedback +{ + /// + /// 耗卡反馈表 + /// + [SugarTable("lq_xh_feedback")] + [Tenant(ClaimConst.TENANT_ID)] + public class LqXhFeedbackEntity + { + /// + /// 反馈记录ID + /// + [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)] + public string Id { get; set; } + + /// + /// 耗卡记录ID + /// + [SugarColumn(ColumnName = "F_ConsumeId")] + public string ConsumeId { get; set; } + + /// + /// 前图片 + /// + [SugarColumn(ColumnName = "F_BeforeImage")] + public string BeforeImage { get; set; } + + /// + /// 后图片 + /// + [SugarColumn(ColumnName = "F_AfterImage")] + public string AfterImage { get; set; } + + /// + /// 备注 + /// + [SugarColumn(ColumnName = "F_Remark")] + public string Remark { get; set; } + + /// + /// 添加人ID + /// + [SugarColumn(ColumnName = "F_CreateUser")] + public string CreateUser { get; set; } + + /// + /// 添加时间 + /// + [SugarColumn(ColumnName = "F_CreateTime")] + public DateTime CreateTime { get; set; } + + /// + /// 更新时间 + /// + [SugarColumn(ColumnName = "F_UpdateTime")] + public DateTime UpdateTime { get; set; } + } +} 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 6ed3e3c..5a91782 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 @@ -120,5 +120,11 @@ namespace NCC.Extend.Entitys.lq_xh_hyhk /// [SugarColumn(ColumnName = "F_IsEffective")] public int IsEffective { get; set; } = StatusEnum.有效.GetHashCode(); + + /// + /// 作废备注 + /// + [SugarColumn(ColumnName = "F_CancelRemark")] + public string CancelRemark { get; set; } } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Enum/StoreTypeEnum.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Enum/StoreTypeEnum.cs new file mode 100644 index 0000000..33f3fba --- /dev/null +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Enum/StoreTypeEnum.cs @@ -0,0 +1,22 @@ +using System.ComponentModel; + +namespace NCC.Extend.Entitys.Enum +{ + /// + /// 门店类别枚举 + /// + public enum StoreTypeEnum + { + /// + /// 200平门店 + /// + [Description("200平门店")] + 门店200平 = 1, + + /// + /// 旗舰店 + /// + [Description("旗舰店")] + 旗舰店 = 2, + } +} diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/LqXhFeedback/ILqXhFeedbackService.cs b/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/LqXhFeedback/ILqXhFeedbackService.cs new file mode 100644 index 0000000..845f407 --- /dev/null +++ b/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/LqXhFeedback/ILqXhFeedbackService.cs @@ -0,0 +1,13 @@ +using System.Threading.Tasks; +using NCC.Extend.Entitys.Dto.LqXhFeedback; + +namespace NCC.Extend.Interfaces.LqXhFeedback +{ + /// + /// 耗卡反馈服务接口 + /// + public interface ILqXhFeedbackService + { + + } +} diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqHytkHytkService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqHytkHytkService.cs index 245b345..7f74edb 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqHytkHytkService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqHytkHytkService.cs @@ -544,24 +544,16 @@ namespace NCC.Extend.LqHytkHytk _db.BeginTran(); // 1. 删除退卡品项明细记录 - await _db.Deleteable() - .Where(x => x.RefundInfoId == id) - .ExecuteCommandAsync(); + await _db.Deleteable().Where(x => x.RefundInfoId == id).ExecuteCommandAsync(); // 2. 删除退卡健康师业绩记录 - await _db.Deleteable() - .Where(x => x.Gltkbh == id) - .ExecuteCommandAsync(); + await _db.Deleteable().Where(x => x.Gltkbh == id).ExecuteCommandAsync(); // 3. 删除退卡科技部老师业绩记录 - await _db.Deleteable() - .Where(x => x.Gltkbh == id) - .ExecuteCommandAsync(); + await _db.Deleteable().Where(x => x.Gltkbh == id).ExecuteCommandAsync(); // 4. 删除退卡主表记录 - await _db.Deleteable() - .Where(x => x.Id == id) - .ExecuteCommandAsync(); + await _db.Deleteable().Where(x => x.Id == id).ExecuteCommandAsync(); // 提交事务 _db.CommitTran(); diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs index 5639f7c..375b05d 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs @@ -113,7 +113,10 @@ namespace NCC.Extend.LqKdKdjlb } var output = entity.Adapt(); - + //获取会员信息 + var MemberInfo = await _db.Queryable().FirstAsync(p => p.Id == entity.Kdhy); + output.kdhyc = MemberInfo.Khmc; + output.kdhysjh = MemberInfo.Sjh; // 2. 查询品项明细列表 var lqKdPxmxList = await _db.Queryable().Where(w => w.Glkdbh == entity.Id).ToListAsync(); @@ -217,9 +220,6 @@ namespace NCC.Extend.LqKdKdjlb .WhereIF(!string.IsNullOrEmpty(input.kdhy), p => p.Kdhy.Equals(input.kdhy)) .WhereIF(!string.IsNullOrEmpty(input.kdhyc), p => p.Kdhyc.Contains(input.kdhyc)) .WhereIF(!string.IsNullOrEmpty(input.kdhysjh), p => p.Kdhysjh.Contains(input.kdhysjh)) - .WhereIF(!string.IsNullOrEmpty(input.jksyj), p => p.Jksyj.Contains(input.jksyj)) - .WhereIF(!string.IsNullOrEmpty(input.kjblsyj), p => p.Kjblsyj.Contains(input.kjblsyj)) - .WhereIF(!string.IsNullOrEmpty(input.pxxx), p => p.Pxxx.Contains(input.pxxx)) .WhereIF(!string.IsNullOrEmpty(input.F_FIleUrl), p => p.F_FIleUrl.Contains(input.F_FIleUrl)) .WhereIF(!string.IsNullOrEmpty(input.CreateUser), p => p.CreateUser.Equals(input.CreateUser)) .Select(it => new LqKdKdjlbListOutput @@ -244,11 +244,8 @@ namespace NCC.Extend.LqKdKdjlb jj = it.Jj, bz = it.Bz, kdhy = it.Kdhy, - kdhyc = it.Kdhyc, - kdhysjh = it.Kdhysjh, - jksyj = it.Jksyj, - kjblsyj = it.Kjblsyj, - pxxx = it.Pxxx, + kdhyc = SqlFunc.Subqueryable().Where(x => x.Id == it.Kdhy).Select(x => x.Khmc), + kdhysjh = SqlFunc.Subqueryable().Where(x => x.Id == it.Kdhy).Select(x => x.Sjh), IsEffective = it.IsEffective, CreateUser = it.CreateUser, CreateUserName = SqlFunc.Subqueryable().Where(x => x.Id == it.CreateUser).Select(x => x.RealName), @@ -476,7 +473,7 @@ namespace NCC.Extend.LqKdKdjlb //通过开单记录表查询这个会员开单金额 var kdAmount = await _db.Queryable().Where(u => u.Kdhy == entity.Kdhy).SumAsync(u => u.Sfyj); //如果开单金额小于500，为散客，如果大于500，为会员 - if (kdAmount < 500) + if (kdAmount < 500 && kdAmount > 0) { memberInfo.Khlx = MemberTypeEnum.散客.GetHashCode().ToString(); } @@ -784,9 +781,6 @@ namespace NCC.Extend.LqKdKdjlb .WhereIF(!string.IsNullOrEmpty(input.kdhy), p => p.Kdhy.Equals(input.kdhy)) .WhereIF(!string.IsNullOrEmpty(input.kdhyc), p => p.Kdhyc.Contains(input.kdhyc)) .WhereIF(!string.IsNullOrEmpty(input.kdhysjh), p => p.Kdhysjh.Contains(input.kdhysjh)) - .WhereIF(!string.IsNullOrEmpty(input.jksyj), p => p.Jksyj.Contains(input.jksyj)) - .WhereIF(!string.IsNullOrEmpty(input.kjblsyj), p => p.Kjblsyj.Contains(input.kjblsyj)) - .WhereIF(!string.IsNullOrEmpty(input.pxxx), p => p.Pxxx.Contains(input.pxxx)) .WhereIF(!string.IsNullOrEmpty(input.F_FIleUrl), p => p.F_FIleUrl.Contains(input.F_FIleUrl)) .Select(it => new LqKdKdjlbListOutput { @@ -812,9 +806,6 @@ namespace NCC.Extend.LqKdKdjlb kdhy = it.Kdhy, kdhyc = it.Kdhyc, kdhysjh = it.Kdhysjh, - jksyj = it.Jksyj, - kjblsyj = it.Kjblsyj, - pxxx = it.Pxxx, F_FIleUrl = it.F_FIleUrl, }) .MergeTable() @@ -1432,28 +1423,16 @@ namespace NCC.Extend.LqKdKdjlb await _db.Updateable(entity).ExecuteCommandAsync(); // 标记对应开单明细表为无效 - await _db.Updateable() - .SetColumns(it => new LqKdPxmxEntity { IsEffective = StatusEnum.无效.GetHashCode() }) - .Where(it => it.Glkdbh == input.Id) - .ExecuteCommandAsync(); + await _db.Updateable().SetColumns(it => new LqKdPxmxEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(it => it.Glkdbh == input.Id).ExecuteCommandAsync(); // 标记健康师业绩为无效 - await _db.Updateable() - .SetColumns(it => new LqKdJksyjEntity { IsEffective = StatusEnum.无效.GetHashCode() }) - .Where(it => it.Glkdbh == input.Id) - .ExecuteCommandAsync(); + await _db.Updateable().SetColumns(it => new LqKdJksyjEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(it => it.Glkdbh == input.Id).ExecuteCommandAsync(); // 标记科技部老师业绩为无效 - await _db.Updateable() - .SetColumns(it => new LqKdKjbsyjEntity { IsEffective = StatusEnum.无效.GetHashCode() }) - .Where(it => it.Glkdbh == input.Id) - .ExecuteCommandAsync(); + await _db.Updateable().SetColumns(it => new LqKdKjbsyjEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(it => it.Glkdbh == input.Id).ExecuteCommandAsync(); // 标记开单_储扣详细表为无效 - await _db.Updateable() - .SetColumns(it => new LqKdDeductinfoEntity { IsEffective = StatusEnum.无效.GetHashCode() }) - .Where(it => it.BillingId == input.Id) - .ExecuteCommandAsync(); + await _db.Updateable().SetColumns(it => new LqKdDeductinfoEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(it => it.BillingId == input.Id).ExecuteCommandAsync(); //关闭事务 _db.CommitTran(); @@ -1715,11 +1694,8 @@ namespace NCC.Extend.LqKdKdjlb jj = it.Jj, bz = it.Bz, kdhy = it.Kdhy, - kdhyc = it.Kdhyc, - kdhysjh = it.Kdhysjh, - jksyj = it.Jksyj, - kjblsyj = it.Kjblsyj, - pxxx = it.Pxxx, + kdhyc = SqlFunc.Subqueryable().Where(x => x.Id == it.Kdhy).Select(x => x.Khmc), + kdhysjh = SqlFunc.Subqueryable().Where(x => x.Id == it.Kdhy).Select(x => x.Sjh), IsEffective = it.IsEffective, CreateUser = it.CreateUser, CreateUserName = SqlFunc.Subqueryable().Where(x => x.Id == it.CreateUser).Select(x => x.RealName), @@ -1737,6 +1713,130 @@ namespace NCC.Extend.LqKdKdjlb } #endregion + #region 获取某个会员的开单记录 + /// + /// 获取某个会员的开单记录 + /// + /// + /// 根据会员ID查询该会员的所有开单记录，支持分页和时间筛选 + /// + /// 示例请求： + /// ```json + /// { + /// "memberId": "会员ID", + /// "storeId": "门店ID", + /// "startTime": "2025-01-01", + /// "endTime": "2025-12-31", + /// "currentPage": 1, + /// "pageSize": 20 + /// } + /// ``` + /// + /// 参数说明： + /// - memberId: 会员ID（必填） + /// - storeId: 门店ID（可选） + /// - startTime: 开始时间（可选） + /// - endTime: 结束时间（可选） + /// - currentPage: 当前页码 + /// - pageSize: 每页大小 + /// + /// 查询参数 + /// 分页的开单记录列表 + /// 成功返回会员开单记录列表 + /// 参数错误 + /// 服务器错误 + [HttpGet("GetBillingRecordByMemberId")] + public async Task GetBillingRecordByMemberId([FromQuery] BillingRecordQueryInput input) + { + try + { + var sidx = input.sidx == null ? "kdrq" : input.sidx; + + var data = await _db.Queryable() + .Where(p => p.Kdhy == input.MemberId) + .WhereIF(input.StartTime.HasValue, p => p.Kdrq >= input.StartTime.Value) + .WhereIF(input.EndTime.HasValue, p => p.Kdrq <= input.EndTime.Value) + .Select(it => new LqKdKdjlbListOutput + { + 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, + 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 = SqlFunc.Subqueryable().Where(x => x.Id == it.Kdhy).Select(x => x.Khmc), + kdhysjh = SqlFunc.Subqueryable().Where(x => x.Id == it.Kdhy).Select(x => x.Sjh), + IsEffective = it.IsEffective, + CreateUser = it.CreateUser, + CreateUserName = SqlFunc.Subqueryable().Where(x => x.Id == it.CreateUser).Select(x => x.RealName), + }) + .MergeTable() + .OrderBy(sidx + " " + input.sort) + .ToPagedListAsync(input.currentPage, input.pageSize); + + // 获取当前页的开单记录ID列表 + var billingIds = data.list.Select(x => x.id).ToList(); + + // 批量查询品项明细 + var itemDetails = new List(); + if (billingIds.Any()) + { + itemDetails = await _db.Queryable() + .Where(x => billingIds.Contains(x.Glkdbh) && x.IsEffective == StatusEnum.有效.GetHashCode()) + .Select(x => new LqKdPxmxInfoOutput + { + id = x.Id, + glkdbh = x.Glkdbh, + px = x.Px, + pxmc = x.Pxmc, + pxjg = x.Pxjg, + projectNumber = x.ProjectNumber, + isEnabled = x.IsEnabled, + sourceType = x.SourceType, + memberId = x.MemberId, + createTime = x.CreateTIme, + totalPrice = x.TotalPrice, + actualPrice = x.ActualPrice, + remark = x.Remark, + isEffective = x.IsEffective + }) + .ToListAsync(); + } + // 按开单ID分组品项明细 + var itemDetailsGrouped = itemDetails.GroupBy(x => x.glkdbh) + .ToDictionary(g => g.Key, g => g.ToList()); + + // 为每个开单记录分配品项明细 + foreach (var item in data.list) + { + item.ItemDetails = itemDetailsGrouped.ContainsKey(item.id) + ? itemDetailsGrouped[item.id] + : new List(); + } + + return PageResult.SqlSugarPageResult(data); + } + catch (Exception ex) + { + throw NCCException.Oh($"获取会员开单记录失败: {ex.Message}"); + } + } + #endregion + #region 私有方法 /// /// 检查开单记录是否可以操作 diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs index 9cbab3b..ed0d154 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs @@ -178,6 +178,7 @@ namespace NCC.Extend.LqKhxx } var entity = input.Adapt(); entity.Id = YitIdHelper.NextId().ToString(); + entity.Dah = "LQ" + DateTime.Now.ToString("yyyyMMddHHmmssfff"); // 处理客户消费字段：将数组转换为逗号分隔的字符串 if (input.khxf != null && input.khxf.Count > 0) { diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqMdXdbhsjService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqMdXdbhsjService.cs index 8340951..9b3ee95 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqMdXdbhsjService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqMdXdbhsjService.cs @@ -85,6 +85,7 @@ namespace NCC.Extend.LqMdXdbhsj sm = it.Sm, cjsj = it.Cjsj, sfqy = it.Sfqy, + stage = it.Stage, }) .MergeTable() .OrderBy(sidx + " " + input.sort) @@ -116,16 +117,12 @@ namespace NCC.Extend.LqMdXdbhsj // 检查是否存在重叠的保护时间 var exists = await _db.Queryable() .Where(p => p.Mdid == entity.Mdid && p.Sfqy == 1) - .Where(p => - (p.Bhkssj <= entity.Bhkssj && p.Bhjssj > entity.Bhkssj) || (p.Bhkssj < entity.Bhjssj && p.Bhjssj >= entity.Bhjssj) || (p.Bhkssj >= entity.Bhkssj && p.Bhjssj <= entity.Bhjssj) - ) + .Where(p => (p.Bhkssj <= entity.Bhkssj && p.Bhjssj > entity.Bhkssj) || (p.Bhkssj < entity.Bhjssj && p.Bhjssj >= entity.Bhjssj) || (p.Bhkssj >= entity.Bhkssj && p.Bhjssj <= entity.Bhjssj)) .AnyAsync(); - if (exists) { throw NCCException.Oh("该门店在指定时间段内已存在保护时间设置"); } - var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync(); if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1000); @@ -201,6 +198,7 @@ namespace NCC.Extend.LqMdXdbhsj id = it.Id, fullName = it.Mdid, enCode = it.Id, + stage = it.Stage, }) .ToListAsync(); return new { list = list }; diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs index 21c6d61..a762f99 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs @@ -186,7 +186,7 @@ namespace NCC.Extend.LqTkjlb MemberInfo.Khmc = entity.CustomerName; MemberInfo.Sjh = input.customerPhone; // 设置手机号 MemberInfo.Khlx = MemberTypeEnum.线索.GetHashCode().ToString(); - MemberInfo.Dah = "GK" + DateTime.Now.ToString("yyyyMMddHHmmssfff"); + MemberInfo.Dah = "LQ" + DateTime.Now.ToString("yyyyMMddHHmmssfff"); MemberInfo.Jdqd = "19.9卡"; //找到input.expansionUserId的用户信息 @@ -526,6 +526,5 @@ namespace NCC.Extend.LqTkjlb } #endregion - } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqXhFeedbackService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqXhFeedbackService.cs new file mode 100644 index 0000000..282ae44 --- /dev/null +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqXhFeedbackService.cs @@ -0,0 +1,294 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Mapster; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; +using NCC.Common.Core.Manager; +using NCC.Common.Enum; +using NCC.Common.Filter; +using NCC.Common.Helper; +using NCC.Dependency; +using NCC.DynamicApiController; +using NCC.Extend.Entitys.Dto.LqXhFeedback; +using NCC.Extend.Entitys.lq_xh_feedback; +using NCC.Extend.Entitys.lq_xh_hyhk; +using NCC.Extend.Interfaces.LqXhFeedback; +using NCC.FriendlyException; +using NCC.System.Entitys.Permission; +using SqlSugar; +using Yitter.IdGenerator; + +namespace NCC.Extend +{ + /// + /// 绿纤耗卡服务日志服务 + /// + [ApiDescriptionSettings(Tag = "绿纤耗卡服务日志", Name = "LqXhFeedback", Order = 200, Groups = new[] { "Default" })] + [Route("api/Extend/[controller]")] + public class LqXhFeedbackService : ILqXhFeedbackService, IDynamicApiController, ITransient + { + private readonly ISqlSugarClient _db; + private readonly IUserManager _userManager; + private readonly ILogger _logger; + + public LqXhFeedbackService(ISqlSugarClient db, IUserManager userManager, ILogger logger) + { + _db = db; + _userManager = userManager; + _logger = logger; + } + + #region 获取耗卡反馈详情 + /// + /// 获取耗卡反馈详情 + /// + /// + /// 根据反馈记录ID获取详细信息 + /// + /// 示例请求： + /// GET /api/Extend/LqXhFeedback/GetInfo/{id} + /// + /// 参数说明： + /// - id: 反馈记录ID（路径参数） + /// + /// 反馈记录ID + /// 耗卡反馈详情 + /// 成功返回耗卡反馈详情 + /// 记录不存在 + /// 服务器错误 + [HttpGet("GetInfo/{id}")] + public async Task GetInfo(string id) + { + try + { + var entity = await _db.Queryable().Where(p => p.Id == id).FirstAsync(); + if (entity == null) + { + throw NCCException.Oh(ErrorCode.COM1005, "耗卡反馈记录不存在"); + } + var output = entity.Adapt(); + // 获取添加人姓名 + var createUser = await _db.Queryable().Where(x => x.Id == entity.CreateUser).Select(x => x.RealName).FirstAsync(); + output.createUserName = createUser; + return output; + } + catch (Exception ex) + { + throw NCCException.Oh($"获取耗卡反馈详情失败: {ex.Message}"); + } + } + #endregion + + #region 创建耗卡反馈 + /// + /// 创建耗卡反馈 + /// + /// + /// 创建新的耗卡反馈记录 + /// + /// 示例请求： + /// ```json + /// { + /// "consumeId": "耗卡记录ID", + /// "beforeImage": "前图片路径或Base64", + /// "afterImage": "后图片路径或Base64", + /// "remark": "反馈备注" + /// } + /// ``` + /// + /// 参数说明： + /// - consumeId: 耗卡记录ID（必填） + /// - beforeImage: 前图片（可选） + /// - afterImage: 后图片（可选） + /// - remark: 反馈备注（可选） + /// + /// 创建参数 + /// 创建的耗卡反馈记录 + /// 成功创建耗卡反馈 + /// 参数错误 + /// 服务器错误 + [HttpPost("Create")] + public async Task Create([FromBody] LqXhFeedbackCrInput input) + { + try + { + // 验证耗卡记录是否存在 + var consumeRecord = await _db.Queryable().Where(p => p.Id == input.ConsumeId).FirstAsync(); + if (consumeRecord == null) + { + throw NCCException.Oh(ErrorCode.COM1005, "耗卡记录不存在"); + } + var entity = input.Adapt(); + entity.Id = YitIdHelper.NextId().ToString(); + entity.CreateUser = _userManager.UserId; + entity.CreateTime = DateTime.Now; + entity.UpdateTime = DateTime.Now; + await _db.Insertable(entity).ExecuteCommandAsync(); + return entity.Adapt(); + } + catch (Exception ex) + { + throw NCCException.Oh($"创建耗卡反馈失败: {ex.Message}"); + } + } + #endregion + + #region 更新耗卡反馈 + /// + /// 更新耗卡反馈 + /// + /// + /// 更新现有的耗卡反馈记录 + /// + /// 示例请求： + /// ```json + /// { + /// "id": "反馈记录ID", + /// "consumeId": "耗卡记录ID", + /// "beforeImage": "前图片路径或Base64", + /// "afterImage": "后图片路径或Base64", + /// "remark": "反馈备注" + /// } + /// ``` + /// + /// 参数说明： + /// - id: 反馈记录ID（必填） + /// - consumeId: 耗卡记录ID（必填） + /// - beforeImage: 前图片（可选） + /// - afterImage: 后图片（可选） + /// - remark: 反馈备注（可选） + /// + /// 更新参数 + /// 更新后的耗卡反馈记录 + /// 成功更新耗卡反馈 + /// 参数错误 + /// 记录不存在 + /// 服务器错误 + [HttpPut("Update")] + public async Task Update([FromBody] LqXhFeedbackUpInput input) + { + try + { + var entity = await _db.Queryable().Where(p => p.Id == input.id).FirstAsync(); + if (entity == null) + { + throw NCCException.Oh(ErrorCode.COM1005, "耗卡反馈记录不存在"); + } + // 验证耗卡记录是否存在 + var consumeRecord = await _db.Queryable().Where(p => p.Id == input.ConsumeId).FirstAsync(); + + if (consumeRecord == null) + { + throw NCCException.Oh(ErrorCode.COM1005, "耗卡记录不存在"); + } + entity.ConsumeId = input.ConsumeId; + entity.BeforeImage = input.BeforeImage; + entity.AfterImage = input.AfterImage; + entity.Remark = input.Remark; + entity.UpdateTime = DateTime.Now; + await _db.Updateable(entity).ExecuteCommandAsync(); + return entity.Adapt(); + } + catch (Exception ex) + { + throw NCCException.Oh($"更新耗卡反馈失败: {ex.Message}"); + } + } + #endregion + + #region 删除耗卡反馈 + /// + /// 删除耗卡反馈 + /// + /// + /// 根据反馈记录ID删除记录 + /// + /// 示例请求： + /// DELETE /api/Extend/LqXhFeedback/Delete/{id} + /// + /// 参数说明： + /// - id: 反馈记录ID（路径参数） + /// + /// 反馈记录ID + /// 删除结果 + /// 成功删除耗卡反馈 + /// 记录不存在 + /// 服务器错误 + [HttpDelete("Delete/{id}")] + public async Task Delete(string id) + { + try + { + var entity = await _db.Queryable() + .Where(p => p.Id == id) + .FirstAsync(); + + if (entity == null) + { + throw NCCException.Oh(ErrorCode.COM1005, "耗卡反馈记录不存在"); + } + + await _db.Deleteable() + .Where(p => p.Id == id) + .ExecuteCommandAsync(); + + return new { message = "删除成功" }; + } + catch (Exception ex) + { + throw NCCException.Oh($"删除耗卡反馈失败: {ex.Message}"); + } + } + #endregion + + #region 根据耗卡记录ID获取反馈 + /// + /// 根据耗卡记录ID获取反馈 + /// + /// + /// 根据耗卡记录ID获取相关的所有反馈记录 + /// + /// 示例请求： + /// GET /api/Extend/LqXhFeedback/GetByConsumeId/{consumeId} + /// + /// 参数说明： + /// - consumeId: 耗卡记录ID（路径参数） + /// + /// 耗卡记录ID + /// 耗卡反馈列表 + /// 成功返回耗卡反馈列表 + /// 服务器错误 + [HttpGet("GetByConsumeId/{consumeId}")] + public async Task GetByConsumeId(string consumeId) + { + try + { + var data = await _db.Queryable() + .Where(p => p.ConsumeId == consumeId) + .OrderBy(p => p.CreateTime, OrderByType.Desc) + .Select(it => new LqXhFeedbackListOutput + { + id = it.Id, + consumeId = it.ConsumeId, + beforeImage = it.BeforeImage, + afterImage = it.AfterImage, + remark = it.Remark, + createUser = it.CreateUser, + createUserName = SqlFunc.Subqueryable().Where(x => x.Id == it.CreateUser).Select(x => x.RealName), + createTime = it.CreateTime, + updateTime = it.UpdateTime + }) + .ToListAsync(); + + return data; + } + catch (Exception ex) + { + throw NCCException.Oh($"获取耗卡反馈失败: {ex.Message}"); + } + } + #endregion + } +} diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs index e738f67..8e6f6cd 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs @@ -104,6 +104,10 @@ namespace NCC.Extend.LqXhHyhk } var output = entity.Adapt(); + //获取会员信息 + var MemberInfo = await _db.Queryable().FirstAsync(p => p.Id == entity.Hy); + output.hymc = MemberInfo.Khmc; + output.memberPhone = MemberInfo.Sjh; // 2. 查询品项明细列表 var lqXhPxmxList = await _db.Queryable().Where(w => w.ConsumeInfoId == entity.Id).ToListAsync(); @@ -197,18 +201,59 @@ namespace NCC.Extend.LqXhHyhk mdmc = it.Mdmc, hy = it.Hy, hyzh = it.Hyzh, - hymc = it.Hymc, + hymc = SqlFunc.Subqueryable().Where(w => w.Id == it.Hy).Select(w => w.Khmc), gklx = it.Gklx, xfje = SqlFunc.ToString(it.Xfje), sgfy = SqlFunc.ToString(it.Sgfy), sfykjb = it.Sfykjb, hksj = it.Hksj, czry = it.Czry, - memberPhone = it.MemberPhone, + memberPhone = SqlFunc.Subqueryable().Where(w => w.Id == it.Hy).Select(w => w.Sjh), + isEffective = it.IsEffective, }) .MergeTable() .OrderBy(sidx + " " + input.sort) .ToPagedListAsync(input.currentPage, input.pageSize); + + // 获取当前页的耗卡记录ID列表 + var consumeIds = data.list.Select(x => x.id).ToList(); + + // 批量查询耗卡明细 + var consumeDetails = new List(); + if (consumeIds.Any()) + { + consumeDetails = await _db.Queryable() + .Where(x => consumeIds.Contains(x.ConsumeInfoId) && x.IsEffective == StatusEnum.有效.GetHashCode()) + .Select(x => new LqXhPxmxInfoOutput + { + id = x.Id, + consumeInfoId = x.ConsumeInfoId, + billingItemId = x.BillingItemId, + px = x.Px, + pxmc = x.Pxmc, + pxjg = x.Pxjg, + memberId = x.MemberId, + createTime = x.CreateTIme, + projectNumber = x.ProjectNumber, + sourceType = x.SourceType, + totalPrice = x.TotalPrice, + isEffective = x.IsEffective + }) + .ToListAsync(); + } + + // 按耗卡记录ID分组耗卡明细 + var consumeDetailsGrouped = consumeDetails.GroupBy(x => x.consumeInfoId) + .ToDictionary(g => g.Key, g => g.ToList()); + + // 为每个耗卡记录分配耗卡明细 + foreach (var item in data.list) + { + item.ConsumeDetails = consumeDetailsGrouped.ContainsKey(item.id) + ? consumeDetailsGrouped[item.id] + : new List(); + } + return PageResult.SqlSugarPageResult(data); } #endregion @@ -264,6 +309,8 @@ namespace NCC.Extend.LqXhHyhk entity.Czry = _userManager.UserId; entity.MemberPhone = _db.Queryable().Where(w => w.Id == entity.Hy).First().Sjh; entity.CreateTime = DateTime.Now; + entity.IsEffective = StatusEnum.有效.GetHashCode(); + entity.UpdateTime = DateTime.Now; try { // 开启事务 @@ -407,7 +454,8 @@ namespace NCC.Extend.LqXhHyhk mdmc = it.Mdmc, hy = it.Hy, hyzh = it.Hyzh, - hymc = it.Hymc, + hymc = SqlFunc.Subqueryable().Where(w => w.Id == it.Hy).Select(w => w.Khmc), + memberPhone = SqlFunc.Subqueryable().Where(w => w.Id == it.Hy).Select(w => w.Sjh), gklx = it.Gklx, xfje = SqlFunc.ToString(it.Xfje), sgfy = SqlFunc.ToString(it.Sgfy), @@ -509,7 +557,7 @@ namespace NCC.Extend.LqXhHyhk #region 更新会员耗卡 /// - /// 更新会员耗卡,不会删除品项明细，只会更新或新增 + /// 更新会员耗卡 /// /// 主键 /// 参数 @@ -758,9 +806,10 @@ namespace NCC.Extend.LqXhHyhk /// 耗卡记录作废 /// /// 耗卡记录ID + /// 作废备注 /// [HttpPut("CancelCardUsageRecord/{id}")] - public async Task CancelCardUsageRecord(string id) + public async Task CancelCardUsageRecord(string id, [FromQuery] string remarks = null) { try { @@ -774,6 +823,8 @@ namespace NCC.Extend.LqXhHyhk } //更新耗卡记录状态 LqhyhkInfo.IsEffective = StatusEnum.无效.GetHashCode(); + LqhyhkInfo.UpdateTime = DateTime.Now; + LqhyhkInfo.CancelRemark = remarks; await _db.Updateable(LqhyhkInfo).ExecuteCommandAsync(); //更新品项明细表状态 await _db.Updateable().SetColumns(it => new LqXhPxmxEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(w => w.ConsumeInfoId == id).ExecuteCommandAsync(); @@ -820,7 +871,7 @@ namespace NCC.Extend.LqXhHyhk { Id = it.Id, MemberId = it.Hy, - MemberName = it.Hymc, + MemberName = SqlFunc.Subqueryable().Where(w => w.Id == it.Hy).Select(w => w.Khmc), StoreId = it.Md, StoreName = it.Mdmc, UsageDate = it.Hksj, diff --git a/netcore/src/Modularity/Extend/NCC.Extend/Utils/LqKdKdjlbStringGenerator.cs b/netcore/src/Modularity/Extend/NCC.Extend/Utils/LqKdKdjlbStringGenerator.cs index 47c6766..d8a0b98 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/Utils/LqKdKdjlbStringGenerator.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/Utils/LqKdKdjlbStringGenerator.cs @@ -51,7 +51,7 @@ namespace NCC.Extend.Utils sb.AppendLine($"⏩健康师：{string.Join("、", healthTeachers)}"); // 活动方案：532工程 - sb.AppendLine($"⏩活动方案：{entity.pxxx ?? "无"}"); + // sb.AppendLine($"⏩活动方案：{entity.pxxx ?? "无"}"); // 跟单配合：王经理 竹主任 陈思思老师 var techTeachers = GetTechTeachers(entity.lqKdKjbsyjList); sb.AppendLine($"⏩跟单配合：{techTeachers}"); diff --git a/netcore/src/Modularity/Extend/NCC.Extend/Utils/WeChatBotTestController.cs b/netcore/src/Modularity/Extend/NCC.Extend/Utils/WeChatBotTestController.cs index f3630e1..33fa8f6 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/Utils/WeChatBotTestController.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/Utils/WeChatBotTestController.cs @@ -74,7 +74,7 @@ namespace NCC.Extend.Utils jsj = "DEPT001", // 部门编码 kdhy = "CUSTOMER001", // 客户ID kdhyc = "测试客户", - pxxx = "测试方案", + // pxxx = "测试方案", zdyj = 1000, sfyj = 1000, qk = 0,