From 4b31ecb4b4844aa24bbda0a2fdca104f5980ba10 Mon Sep 17 00:00:00 2001
From: “wangming” <“wangming@antissoft.com”>
Date: Tue, 21 Oct 2025 18:15:17 +0800
Subject: [PATCH] feat: 更新开发环境配置和DTO字段

---
 antis-ncc-admin/.env.development                                                            |  4 ++--
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytk/LqHytkHytkListQueryInput.cs | 35 ++++++++++++++++++++---------------
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbListQueryInput.cs   | 12 ++++++++----
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/TransferCardInput.cs         | 16 ----------------
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkListQueryInput.cs     |  5 +++++
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlStatisticsInput.cs        | 35 +++++++++++++++++++++++++++++++++++
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlStatisticsOutput.cs       | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 7 files changed, 160 insertions(+), 37 deletions(-)
 create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlStatisticsInput.cs
 create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlStatisticsOutput.cs

diff --git a/antis-ncc-admin/.env.development b/antis-ncc-admin/.env.development
index 78e23e6..be31aec 100644
--- a/antis-ncc-admin/.env.development
+++ b/antis-ncc-admin/.env.development
@@ -2,6 +2,6 @@
 
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 # VUE_APP_BASE_API = 'http://lvqian.antissoft.com'
-VUE_APP_BASE_API = 'http://erp_test.lvqianmeiye.com'
-# VUE_APP_BASE_API = 'http://localhost:2011'
+# VUE_APP_BASE_API = 'http://erp_test.lvqianmeiye.com'
+VUE_APP_BASE_API = 'http://localhost:2011'
 VUE_APP_BASE_WSS = 'ws://192.168.110.45:2011/websocket'
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytk/LqHytkHytkListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytk/LqHytkHytkListQueryInput.cs
index 31f41ee..1369ba5 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytk/LqHytkHytkListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytk/LqHytkHytkListQueryInput.cs
@@ -12,72 +12,72 @@ namespace NCC.Extend.Entitys.Dto.LqHytkHytk
         /// 退卡编号
         /// </summary>
         public string id { get; set; }
-        
+
         /// <summary>
         /// 门店
         /// </summary>
         public string md { get; set; }
-        
+
         /// <summary>
         /// 门店编号
         /// </summary>
         public string mdbh { get; set; }
-        
+
         /// <summary>
         /// 门店名称
         /// </summary>
         public string mdmc { get; set; }
-        
+
         /// <summary>
         /// 会员
         /// </summary>
         public string hy { get; set; }
-        
+
         /// <summary>
         /// 会员姓名
         /// </summary>
         public string hymc { get; set; }
-        
+
         /// <summary>
         /// 会员账号
         /// </summary>
         public string hyzh { get; set; }
-        
+
         /// <summary>
         /// 顾客类型
         /// </summary>
         public string gklx { get; set; }
-        
+
         /// <summary>
         /// 退卡总金额
         /// </summary>
         public decimal? tkje { get; set; }
-        
+
         /// <summary>
         /// 手工费用
         /// </summary>
         public decimal? sgfy { get; set; }
-        
+
         /// <summary>
         /// 备注
         /// </summary>
         public string bz { get; set; }
-        
+
         /// <summary>
         /// 退卡时间
         /// </summary>
         public string tksj { get; set; }
-        
+
         /// <summary>
         /// 操作人员
         /// </summary>
         public string czry { get; set; }
-        
+
         /// <summary>
         /// 退卡状态
         /// </summary>
         public string tkzt { get; set; }
-        
+
         /// <summary>
         /// 退卡原因
         /// </summary>
@@ -87,6 +87,11 @@ namespace NCC.Extend.Entitys.Dto.LqHytkHytk
         /// 退卡附件
         /// </summary>
         public string fileUrl { get; set; }
-        
+
+        /// <summary>
+        /// 是否有效
+        /// </summary>
+        public int isEffective { get; set; } = 0;
+
     }
 }
\ No newline at end of file
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 d7a1c3f..8504adb 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
@@ -48,21 +48,20 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
         /// 合作机构
         /// </summary>
         public string hgjg { get; set; }
-
         /// <summary>
         /// 整单业绩
         /// </summary>
-        public string zdyj { get; set; }
+        public decimal? zdyj { get; set; }
 
         /// <summary>
         /// 实付业绩
         /// </summary>
-        public string sfyj { get; set; }
+        public decimal? sfyj { get; set; }
 
         /// <summary>
         /// 欠款
         /// </summary>
-        public string qk { get; set; }
+        public decimal? qk { get; set; }
 
         /// <summary>
         /// 储扣方式
@@ -135,5 +134,10 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
         /// </summary>
         public string CreateUser { get; set; }
 
+        /// <summary>
+        /// 是否有效
+        /// </summary>
+        public int isEffective { get; set; } = 0;
+
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/TransferCardInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/TransferCardInput.cs
index 99c8d24..82c6b98 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/TransferCardInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/TransferCardInput.cs
@@ -28,7 +28,6 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
         /// 转出会员签名
         /// </summary>
         [Required(ErrorMessage = "传出会员签名不能为空")]
-        [StringLength(50, ErrorMessage = "传出会员签名长度不能超过50个字符")]
         [Display(Name = "传出会员签名")]
         public string SignatureFile { get; set; }
 
@@ -77,14 +76,6 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
         public int TransferQuantity { get; set; }
 
         /// <summary>
-        /// 品项ID
-        /// </summary>
-        [Required(ErrorMessage = "品项ID不能为空")]
-        [StringLength(50, ErrorMessage = "品项ID长度不能超过50个字符")]
-        [Display(Name = "品项ID")]
-        public string ItemId { get; set; }
-
-        /// <summary>
         /// 品项名称
         /// </summary>
         [Required(ErrorMessage = "品项名称不能为空")]
@@ -100,12 +91,5 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
         [Display(Name = "品项价格")]
         public decimal ItemPrice { get; set; }
 
-        /// <summary>
-        /// 来源类型
-        /// </summary>
-        [StringLength(50, ErrorMessage = "来源类型长度不能超过50个字符")]
-        [Display(Name = "来源类型")]
-        public string SourceType { get; set; } = "转卡";
-
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkListQueryInput.cs
index 8455b70..d612c3f 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkListQueryInput.cs
@@ -74,5 +74,10 @@ namespace NCC.Extend.Entitys.Dto.LqXhHyhk
         /// </summary>
         public string czry { get; set; }
 
+        /// <summary>
+        /// 是否有效
+        /// </summary>
+        public int isEffective { get; set; } = 0;
+
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlStatisticsInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlStatisticsInput.cs
new file mode 100644
index 0000000..d939edb
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlStatisticsInput.cs
@@ -0,0 +1,35 @@
+using System;
+
+namespace NCC.Extend.Entitys.Dto.LqXmzl
+{
+    /// <summary>
+    /// 品项维度统计输入参数
+    /// </summary>
+    public class LqXmzlStatisticsInput
+    {
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public DateTime? StartTime { get; set; }
+
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public DateTime? EndTime { get; set; }
+
+        /// <summary>
+        /// 门店ID
+        /// </summary>
+        public string StoreId { get; set; }
+
+        /// <summary>
+        /// 品项分类
+        /// </summary>
+        public string Category { get; set; }
+
+        /// <summary>
+        /// 品项ID（单个品项统计）
+        /// </summary>
+        public string ItemId { get; set; }
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlStatisticsOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlStatisticsOutput.cs
new file mode 100644
index 0000000..58f52d6
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlStatisticsOutput.cs
@@ -0,0 +1,90 @@
+using System;
+
+namespace NCC.Extend.Entitys.Dto.LqXmzl
+{
+    /// <summary>
+    /// 品项维度统计输出参数
+    /// </summary>
+    public class LqXmzlStatisticsOutput
+    {
+        /// <summary>
+        /// 品项ID
+        /// </summary>
+        public string ItemId { get; set; }
+
+        /// <summary>
+        /// 品项名称
+        /// </summary>
+        public string ItemName { get; set; }
+
+        /// <summary>
+        /// 品项编号
+        /// </summary>
+        public string ItemNumber { get; set; }
+
+        /// <summary>
+        /// 开卡业绩
+        /// </summary>
+        public decimal BillingAmount { get; set; }
+
+        /// <summary>
+        /// 开卡业绩占比
+        /// </summary>
+        public decimal BillingAmountRatio { get; set; }
+
+        /// <summary>
+        /// 购买总人数
+        /// </summary>
+        public int TotalBuyers { get; set; }
+
+        /// <summary>
+        /// 品项占比
+        /// </summary>
+        public decimal ItemRatio { get; set; }
+
+        /// <summary>
+        /// 复购人数
+        /// </summary>
+        public int RepeatBuyers { get; set; }
+
+        /// <summary>
+        /// 复购率
+        /// </summary>
+        public decimal RepeatBuyRate { get; set; }
+
+        /// <summary>
+        /// 消耗业绩
+        /// </summary>
+        public decimal ConsumeAmount { get; set; }
+
+        /// <summary>
+        /// 消耗占比
+        /// </summary>
+        public decimal ConsumeAmountRatio { get; set; }
+
+        /// <summary>
+        /// 消耗购买次数
+        /// </summary>
+        public int ConsumePurchaseCount { get; set; }
+
+        /// <summary>
+        /// 消耗赠送次数
+        /// </summary>
+        public int ConsumeGiftCount { get; set; }
+
+        /// <summary>
+        /// 消耗体验次数
+        /// </summary>
+        public int ConsumeExperienceCount { get; set; }
+
+        /// <summary>
+        /// 退卡业绩
+        /// </summary>
+        public decimal RefundAmount { get; set; }
+
+        /// <summary>
+        /// 退卡次数
+        /// </summary>
+        public int RefundCount { get; set; }
+    }
+}
--
libgit2 0.21.4