diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqEventUser/LqEventUserCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqEventUser/LqEventUserCrInput.cs index 373e018..48f73cc 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqEventUser/LqEventUserCrInput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqEventUser/LqEventUserCrInput.cs @@ -38,5 +38,10 @@ namespace NCC.Extend.Entitys.Dto.LqEventUser /// 门店id /// public string StoreId { get; set; } + + /// + /// 目标张数 + /// + public int? TargetCount { 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 e34c224..8cf281d 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 @@ -51,7 +51,7 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb /// /// 项目次数 /// - public int? projectNumber { get; set; } + public decimal projectNumber { get; set; } /// /// 是否有效 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 7e4f21f..791cefa 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 @@ -57,7 +57,7 @@ namespace NCC.Extend.Entitys.lq_kd_pxmx /// 项目次数 /// [SugarColumn(ColumnName = "F_ProjectNumber")] - public int? ProjectNumber { get; set; } + public decimal ProjectNumber { get; set; } /// /// 是否有效 diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqEventService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqEventService.cs index 86853d8..08e180d 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqEventService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqEventService.cs @@ -604,6 +604,7 @@ namespace NCC.Extend.LqEvent DepId = user.OrganizeId, TeamName = row.TeamName, StoreId = storeId, + TargetCount = row.TargetCount, }; result.SuccessData.Add(successData); @@ -656,8 +657,23 @@ namespace NCC.Extend.LqEvent // 使用ExcelImportHelper读取Excel文件 var dataTable = ExcelImportHelper.ToDataTable(tempFilePath, 0, 0); - // 从第2行开始读取数据(第1行是标题) - for (int i = 1; i < dataTable.Rows.Count; i++) + // 调试信息:输出总行数和列数 + Console.WriteLine($"Excel总行数: {dataTable.Rows.Count}, 总列数: {dataTable.Columns.Count}"); + + // 调试信息:输出所有行的数据 + for (int debugRow = 0; debugRow < dataTable.Rows.Count; debugRow++) + { + var debugRowData = dataTable.Rows[debugRow]; + var debugValues = new List(); + for (int debugCol = 0; debugCol < debugRowData.ItemArray.Length; debugCol++) + { + debugValues.Add(debugRowData[debugCol]?.ToString() ?? "null"); + } + Console.WriteLine($"调试第{debugRow + 1}行: {string.Join(", ", debugValues)}"); + } + + // 从第1行开始读取数据(没有标题行) + for (int i = 0; i < dataTable.Rows.Count; i++) { var row = dataTable.Rows[i]; var mobilePhone = row[0]?.ToString()?.Trim(); @@ -666,6 +682,9 @@ namespace NCC.Extend.LqEvent var storeName = row[3]?.ToString()?.Trim(); var targetCountStr = row[4]?.ToString()?.Trim(); + // 调试信息:输出每一行读取的数据 + Console.WriteLine($"第{i + 1}行数据: 手机号={mobilePhone}, 姓名={name}, 战队={teamName}, 门店={storeName}, 目标={targetCountStr}"); + int? targetCount = null; if (!string.IsNullOrEmpty(targetCountStr) && int.TryParse(targetCountStr, out int target)) { @@ -675,6 +694,7 @@ namespace NCC.Extend.LqEvent // 跳过空行 if (string.IsNullOrEmpty(mobilePhone) && string.IsNullOrEmpty(name)) { + Console.WriteLine($"第{i + 1}行被跳过:空行"); continue; } diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs index 448898c..6550734 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs @@ -276,8 +276,8 @@ namespace NCC.Extend.LqKdKdjlb CreateTIme = DateTime.Now, MemberId = entity.Kdhy, IsEnabled = 0, - ProjectNumber = item.projectNumber ?? 1, - TotalPrice = (decimal)(item.pxjg * (item.projectNumber ?? 1)), + ProjectNumber = item.projectNumber, + TotalPrice = (decimal)(item.pxjg * item.projectNumber), Px = item.px, Pxmc = item.pxmc, Pxjg = item.pxjg,