diff --git a/antis-ncc-admin/src/views/lqInventory/InventoryInfoDialog.vue b/antis-ncc-admin/src/views/lqInventory/InventoryInfoDialog.vue
index 6a8e065..94adeef 100644
--- a/antis-ncc-admin/src/views/lqInventory/InventoryInfoDialog.vue
+++ b/antis-ncc-admin/src/views/lqInventory/InventoryInfoDialog.vue
@@ -191,4 +191,3 @@ export default {
text-align: right;
}
-
diff --git a/antis-ncc-admin/src/views/personalPerformanceStatistics/index.vue b/antis-ncc-admin/src/views/personalPerformanceStatistics/index.vue
index bf027cd..25bbeb3 100644
--- a/antis-ncc-admin/src/views/personalPerformanceStatistics/index.vue
+++ b/antis-ncc-admin/src/views/personalPerformanceStatistics/index.vue
@@ -50,7 +50,7 @@
-
+
{{ formatMoney(scope.row.TotalPerformance) }}
@@ -66,6 +66,22 @@
{{ formatMoney(scope.row.UpgradeOrderPerformance) }}
+
+
+ {{ formatMoney(scope.row.RefundPerformance) }}
+
+
+
+
+ {{ scope.row.RefundCount || 0 }}
+
+
+
+
+ {{ formatMoney(scope.row.ActualPerformance)
+ }}
+
+
diff --git a/antis-ncc-admin/src/views/storeTotalPerformanceStatistics/index.vue b/antis-ncc-admin/src/views/storeTotalPerformanceStatistics/index.vue
index 0a5a9c5..950a7d9 100644
--- a/antis-ncc-admin/src/views/storeTotalPerformanceStatistics/index.vue
+++ b/antis-ncc-admin/src/views/storeTotalPerformanceStatistics/index.vue
@@ -81,6 +81,12 @@
{{ scope.row.RefundCount || 0 }}
+
+
+ {{ formatMoney(scope.row.ActualPerformance)
+ }}
+
+
{{ formatDateTime(scope.row.CreateTime) }}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxInfoOutput.cs
index 1438b6c..2adec93 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxInfoOutput.cs
@@ -123,21 +123,21 @@ namespace NCC.Extend.Entitys.Dto.LqMdxx
///
/// 门店类别
///
- public int? StoreCategory { get; set; }
+ public int? storeCategory { get; set; }
///
/// 门店类别名称
///
- public string StoreCategoryName => StoreCategory.HasValue ? EnumHelper.GetEnumDesc(StoreCategory.Value) : string.Empty;
+ public string storeCategoryName => storeCategory.HasValue ? EnumHelper.GetEnumDesc(storeCategory.Value) : string.Empty;
///
/// 门店类型
///
- public int? StoreType { get; set; }
+ public int? storeType { get; set; }
///
/// 门店类型名称
///
- public string StoreTypeName => StoreType.HasValue ? EnumHelper.GetEnumDesc(StoreType.Value) : string.Empty;
+ public string storeTypeName => storeType.HasValue ? EnumHelper.GetEnumDesc(storeType.Value) : string.Empty;
}
}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxListOutput.cs
index 64df5e5..a332430 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxListOutput.cs
@@ -152,21 +152,21 @@ namespace NCC.Extend.Entitys.Dto.LqMdxx
///
/// 门店类别
///
- public int? StoreCategory { get; set; }
+ public int? storeCategory { get; set; }
///
/// 门店类别名称
///
- public string StoreCategoryName => StoreCategory.HasValue ? EnumHelper.GetEnumDesc(StoreCategory.Value) : string.Empty;
+ public string storeCategoryName => storeCategory.HasValue ? EnumHelper.GetEnumDesc(storeCategory.Value) : string.Empty;
///
/// 门店类型
///
- public int? StoreType { get; set; }
+ public int? storeType { get; set; }
///
/// 门店类型名称
///
- public string StoreTypeName => StoreType.HasValue ? EnumHelper.GetEnumDesc(StoreType.Value) : string.Empty;
+ public string storeTypeName => storeType.HasValue ? EnumHelper.GetEnumDesc(storeType.Value) : string.Empty;
}
}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatistics/LqStoreTotalPerformanceStatisticsListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatistics/LqStoreTotalPerformanceStatisticsListOutput.cs
index 85ffc47..85c8c1d 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatistics/LqStoreTotalPerformanceStatisticsListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatistics/LqStoreTotalPerformanceStatisticsListOutput.cs
@@ -73,6 +73,11 @@ namespace NCC.Extend.Entitys.Dto.LqStatistics
public int RefundCount { get; set; }
///
+ /// 实际业绩
+ ///
+ public decimal ActualPerformance { get; set; }
+
+ ///
/// 创建时间
///
public DateTime CreateTime { get; set; }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatisticsPersonalPerformance/LqStatisticsPersonalPerformanceListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatisticsPersonalPerformance/LqStatisticsPersonalPerformanceListOutput.cs
index e89c7a1..fd53b78 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatisticsPersonalPerformance/LqStatisticsPersonalPerformanceListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatisticsPersonalPerformance/LqStatisticsPersonalPerformanceListOutput.cs
@@ -93,6 +93,21 @@ namespace NCC.Extend.Entitys.Dto.LqStatisticsPersonalPerformance
public decimal UpgradeOrderPerformance { get; set; }
///
+ /// 退单业绩
+ ///
+ public decimal RefundPerformance { get; set; }
+
+ ///
+ /// 退单次数
+ ///
+ public int RefundCount { get; set; }
+
+ ///
+ /// 实际业绩
+ ///
+ public decimal ActualPerformance { get; set; }
+
+ ///
/// 最后订单日期
///
public DateTime? LastOrderDate { get; set; }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatisticsStoreTotalPerformance/LqStatisticsStoreTotalPerformanceListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatisticsStoreTotalPerformance/LqStatisticsStoreTotalPerformanceListOutput.cs
index ae48dcb..8d56eda 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatisticsStoreTotalPerformance/LqStatisticsStoreTotalPerformanceListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatisticsStoreTotalPerformance/LqStatisticsStoreTotalPerformanceListOutput.cs
@@ -86,5 +86,10 @@ namespace NCC.Extend.Entitys.Dto.LqStatisticsStoreTotalPerformance
/// 创建时间
///
public DateTime? createTime { get; set; }
+
+ ///
+ /// 实际业绩
+ ///
+ public decimal actualPerformance { get; set; }
}
}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_statistics_personal_performance/LqStatisticsPersonalPerformanceEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_statistics_personal_performance/LqStatisticsPersonalPerformanceEntity.cs
index 97e21b2..9d9ec05 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_statistics_personal_performance/LqStatisticsPersonalPerformanceEntity.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_statistics_personal_performance/LqStatisticsPersonalPerformanceEntity.cs
@@ -114,6 +114,24 @@ namespace NCC.Extend.Entitys.lq_statistics_personal_performance
public decimal UpgradeOrderPerformance { get; set; }
///
+ /// 退单业绩
+ ///
+ [SugarColumn(ColumnName = "F_RefundPerformance")]
+ public decimal RefundPerformance { get; set; }
+
+ ///
+ /// 退单次数
+ ///
+ [SugarColumn(ColumnName = "F_RefundCount")]
+ public int RefundCount { get; set; }
+
+ ///
+ /// 实际业绩
+ ///
+ [SugarColumn(ColumnName = "F_ActualPerformance")]
+ public decimal ActualPerformance { get; set; }
+
+ ///
/// 最后订单日期
///
[SugarColumn(ColumnName = "F_LastOrderDate")]
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_statistics_store_total_performance/LqStatisticsStoreTotalPerformanceEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_statistics_store_total_performance/LqStatisticsStoreTotalPerformanceEntity.cs
index 2508ed3..fb326e1 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_statistics_store_total_performance/LqStatisticsStoreTotalPerformanceEntity.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_statistics_store_total_performance/LqStatisticsStoreTotalPerformanceEntity.cs
@@ -102,6 +102,12 @@ namespace NCC.Extend.Entitys.lq_statistics_store_total_performance
public int RefundCount { get; set; }
///
+ /// 实际业绩
+ ///
+ [SugarColumn(ColumnName = "F_ActualPerformance")]
+ public decimal ActualPerformance { get; set; }
+
+ ///
/// 创建时间
///
[SugarColumn(ColumnName = "F_CreateTime")]
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs
index 869a939..342ec4d 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs
@@ -1179,6 +1179,25 @@ namespace NCC.Extend.LqKdKdjlb
}
#endregion
+ #region 获取状态枚举内容(所有的状态通用)
+ ///
+ /// 获取状态枚举内容
+ ///
+ /// 状态枚举列表
+ [HttpGet("status-enum")]
+ public List GetStatusEnum()
+ {
+ return Enum.GetValues()
+ .Select(e => new EnumOutput
+ {
+ Value = (int)e,
+ Name = e.ToString(),
+ Description = e.GetDescription(),
+ })
+ .ToList();
+ }
+ #endregion
+
#region 修改开单记录
///
/// 修改开单记录
@@ -2486,7 +2505,7 @@ namespace NCC.Extend.LqKdKdjlb
{
Id = YitIdHelper.NextId().ToString(),
Gltkbh = refundId,
- Jks = jks.Jks,
+ Jks = jks.Jkszh,
Jksxm = jks.Jksxm,
Jkszh = jks.Jkszh,
Jksyj = (totalItemDeduction / refundKdyjEntities.Count()),
@@ -2588,7 +2607,7 @@ namespace NCC.Extend.LqKdKdjlb
{
Id = YitIdHelper.NextId().ToString(),
Glkdbh = billingId,
- Jks = jks.Jks,
+ Jks = jks.Jkszh,
Jksxm = jks.Jksxm,
Jkszh = jks.Jkszh,
Jksyj = jks.Jksyj.ToString(),
@@ -2709,7 +2728,5 @@ namespace NCC.Extend.LqKdKdjlb
}
}
#endregion
-
-
}
}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqMdxxService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqMdxxService.cs
index 90a7359..2ebf5f9 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqMdxxService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqMdxxService.cs
@@ -24,6 +24,7 @@ using NCC.DataEncryption;
using NCC.ClayObject;
using NCC.Extend.Entitys.Enum;
using NCC.Code;
+using NCC.Extend.Entitys.Dto.Common;
namespace NCC.Extend.LqMdxx
{
@@ -120,8 +121,8 @@ namespace NCC.Extend.LqMdxx
rt1 = it.Rt1,
rt2 = it.Rt2,
rc = it.Rc,
- StoreCategory = it.StoreCategory,
- StoreType = it.StoreType,
+ storeCategory = it.StoreCategory,
+ storeType = it.StoreType,
}).MergeTable().OrderBy(sidx + " " + input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
return PageResult.SqlSugarPageResult(data);
}
@@ -191,8 +192,21 @@ namespace NCC.Extend.LqMdxx
gsmc = it.Gsmc,
fr = it.Fr,
ywsb = it.Ywsb,
- StoreCategory = it.StoreCategory,
- StoreType = it.StoreType,
+ jyb = it.Jyb,
+ kjb = it.Kjb,
+ dxmb = it.Dxmb,
+ syb = it.Syb,
+ gsqssj = it.Gsqssj,
+ gszzsj = it.Gszzsj,
+ status = it.Status,
+ xsyj = it.Xsyj,
+ xhyj = it.Xhyj,
+ xms = it.Xms,
+ rt1 = it.Rt1,
+ rt2 = it.Rt2,
+ rc = it.Rc,
+ storeCategory = it.StoreCategory,
+ storeType = it.StoreType,
}).MergeTable().OrderBy(sidx + " " + input.sort).ToListAsync();
return data;
}
@@ -359,11 +373,14 @@ namespace NCC.Extend.LqMdxx
///
///
[HttpGet("Selector/StoreCategory")]
- public async Task GetStoreCategorySelector()
+ public List GetStoreCategorySelector()
{
- //从Enum中获取门店类别
- var storeCategoryEnum = EnumExtensions.GetEnumDescDictionary(typeof(StoreCategoryEnum));
- return new { list = storeCategoryEnum };
+ return Enum.GetValues().Select(e => new EnumOutput
+ {
+ Value = (int)e,
+ Name = e.ToString(),
+ Description = e.GetDescription(),
+ }).ToList();
}
#endregion
@@ -373,11 +390,18 @@ namespace NCC.Extend.LqMdxx
///
///
[HttpGet("Selector/StoreType")]
- public async Task GetStoreTypeSelector()
+ public List GetStoreTypeSelector()
{
//从Enum中获取门店类型
- var storeTypeEnum = EnumExtensions.GetEnumDescDictionary(typeof(StoreTypeEnum));
- return new { list = storeTypeEnum };
+ var storeTypeEnum = Enum.GetValues()
+ .Select(e => new EnumOutput
+ {
+ Value = (int)e,
+ Name = e.ToString(),
+ Description = e.GetDescription(),
+ })
+ .ToList();
+ return storeTypeEnum;
}
#endregion
}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqStatisticsService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqStatisticsService.cs
index 92e2070..a824c65 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqStatisticsService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqStatisticsService.cs
@@ -1432,6 +1432,8 @@ namespace NCC.Extend.LqStatistics
order_stats.FirstOrderDate,
COALESCE(coop_stats.CooperationPerformance, 0) AS CooperationPerformance,
COALESCE(base_stats.BasePerformance, 0) AS BasePerformance,
+ COALESCE(refund_stats.RefundPerformance, 0) AS RefundPerformance,
+ COALESCE(refund_stats.RefundCount, 0) AS RefundCount,
order_stats.TotalPerformance
FROM (
-- 按开单记录统计基础数据,避免重复计算
@@ -1541,6 +1543,23 @@ namespace NCC.Extend.LqStatistics
AND (xmzl.fl3 IS NULL OR xmzl.fl3 != '合作业绩')
GROUP BY jksyj.jkszh
) base_stats ON order_stats.EmployeeId = base_stats.EmployeeId
+ LEFT JOIN (
+ -- 退单业绩统计
+ SELECT
+ hytk_jksyj.jkszh AS EmployeeId,
+ SUM(CAST(hytk_jksyj.jksyj AS DECIMAL(18,2))) AS RefundPerformance,
+ COUNT(*) AS RefundCount
+ FROM lq_hytk_jksyj hytk_jksyj
+ INNER JOIN lq_hytk_hytk hytk ON hytk_jksyj.gltkbh = hytk.F_Id
+ WHERE hytk_jksyj.jksyj IS NOT NULL
+ AND hytk_jksyj.jksyj != ''
+ AND hytk_jksyj.jksyj != '0'
+ AND hytk_jksyj.F_IsEffective = 1
+ AND hytk.F_IsEffective = 1
+ AND YEAR(hytk_jksyj.tksj) = @year
+ AND MONTH(hytk_jksyj.tksj) = @month
+ GROUP BY hytk_jksyj.jks
+ ) refund_stats ON order_stats.EmployeeId = refund_stats.EmployeeId
ORDER BY order_stats.TotalPerformance DESC";
// 解析统计月份
@@ -1582,9 +1601,12 @@ namespace NCC.Extend.LqStatistics
Position = stats.Position?.ToString() ?? "",
EmployeeId = stats.EmployeeId?.ToString() ?? "",
EmployeeName = stats.EmployeeName?.ToString() ?? "",
- TotalPerformance = Convert.ToDecimal(stats.TotalPerformance ?? 0),
+ TotalPerformance = Convert.ToDecimal(stats.TotalPerformance ?? 0) - Convert.ToDecimal(stats.RefundPerformance ?? 0),
BasePerformance = Convert.ToDecimal(stats.BasePerformance ?? 0),
CooperationPerformance = Convert.ToDecimal(stats.CooperationPerformance ?? 0),
+ RefundPerformance = Convert.ToDecimal(stats.RefundPerformance ?? 0),
+ RefundCount = Convert.ToInt32(stats.RefundCount ?? 0),
+ ActualPerformance = Convert.ToDecimal(stats.TotalPerformance ?? 0) - Convert.ToDecimal(stats.RefundPerformance ?? 0),
OrderCount = Convert.ToInt32(stats.OrderCount ?? 0),
FirstOrderCount = Convert.ToInt32(stats.FirstOrderCount ?? 0),
UpgradeOrderCount = Convert.ToInt32(stats.UpgradeOrderCount ?? 0),
@@ -1665,7 +1687,7 @@ namespace NCC.Extend.LqStatistics
}
///
- /// 分页查询个人开单业绩统计数据
+ /// 分页查询个人开单业绩统计数据(在用)
///
///
/// 分页查询个人业绩统计数据,支持多条件筛选
@@ -1727,7 +1749,10 @@ namespace NCC.Extend.LqStatistics
UpgradeOrderPerformance = it.UpgradeOrderPerformance,
LastOrderDate = it.LastOrderDate,
FirstOrderDate = it.FirstOrderDate,
- CreateTime = it.CreateTime
+ CreateTime = it.CreateTime,
+ RefundPerformance = it.RefundPerformance,
+ RefundCount = it.RefundCount,
+ ActualPerformance = it.ActualPerformance
}).ToPagedListAsync(input.currentPage, input.pageSize);
return new
@@ -2588,6 +2613,7 @@ namespace NCC.Extend.LqStatistics
UpgradeOrderPerformance = Convert.ToDecimal(data.F_UpgradeOrderPerformance ?? 0),
RefundAmount = Convert.ToDecimal(data.F_RefundAmount ?? 0),
RefundCount = Convert.ToInt32(data.F_RefundCount ?? 0),
+ ActualPerformance = Convert.ToDecimal(data.F_TotalOrderPerformance ?? 0) - Convert.ToDecimal(data.F_RefundAmount ?? 0),
CreateTime = DateTime.Now
}).ToList();
@@ -2671,6 +2697,9 @@ namespace NCC.Extend.LqStatistics
upgradeOrderCount = it.UpgradeOrderCount,
firstOrderPerformance = it.FirstOrderPerformance,
upgradeOrderPerformance = it.UpgradeOrderPerformance,
+ refundAmount = it.RefundAmount,
+ refundCount = it.RefundCount,
+ actualPerformance = it.ActualPerformance,
createTime = it.CreateTime
})
.OrderBy(sidx + " " + input.sort)
@@ -3329,7 +3358,8 @@ namespace NCC.Extend.LqStatistics
UpgradeOrderCount = it.UpgradeOrderCount,
RefundAmount = it.RefundAmount,
RefundCount = it.RefundCount,
- CreateTime = it.CreateTime.HasValue ? it.CreateTime.Value : DateTime.Now
+ CreateTime = it.CreateTime.HasValue ? it.CreateTime.Value : DateTime.Now,
+ ActualPerformance = it.ActualPerformance
}).ToList();
return new