Enhance performance statistics with refund metrics

- Added refund performance and count fields to personal and store total performance statistics. - Introduced actual performance calculations that account for refunds. - Updated relevant DTOs and entity classes to include new fields. - Improved front-end tables to display refund-related data in performance statistics views.

Enhance performance statistics with refund metrics
- Added refund performance and count fields to personal and store total performance statistics. - Introduced actual performance calculations that account for refunds. - Updated relevant DTOs and entity classes to include new fields. - Improved front-end tables to display refund-related data in performance statistics views.
“wangming”
1 parent 0c63f3b7
Showing 13 changed files with 170 additions and 29 deletions
antis-ncc-admin/src/views/lqInventory/InventoryInfoDialog.vue
antis-ncc-admin/src/views/personalPerformanceStatistics/index.vue
antis-ncc-admin/src/views/storeTotalPerformanceStatistics/index.vue
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxInfoOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxListOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatistics/LqStoreTotalPerformanceStatisticsListOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatisticsPersonalPerformance/LqStatisticsPersonalPerformanceListOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatisticsStoreTotalPerformance/LqStatisticsStoreTotalPerformanceListOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_statistics_personal_performance/LqStatisticsPersonalPerformanceEntity.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_statistics_store_total_performance/LqStatisticsStoreTotalPerformanceEntity.cs
netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs
netcore/src/Modularity/Extend/NCC.Extend/LqMdxxService.cs
netcore/src/Modularity/Extend/NCC.Extend/LqStatisticsService.cs
@@ -191,4 +191,3 @@ export default {
     text-align: right;
 }
 </style>
-
@@ -50,7 +50,7 @@
                     <el-table-column prop="EmployeeName" label="员工姓名" width="120" fixed="left"></el-table-column>
                     <el-table-column prop="StoreName" label="门店名称" width="150" fixed="left"></el-table-column>
                     <el-table-column prop="Position" label="岗位" width="100" fixed="left"></el-table-column>
-                    <el-table-column prop="GoldTriangleTeam" label="金三角战队" width="120" fixed="left"></el-table-column>
+                    <el-table-column prop="GoldTriangleName" label="金三角战队" width="120" fixed="left"></el-table-column>
                     <el-table-column prop="TotalPerformance" label="总业绩" width="100" align="right">
                         <template slot-scope="scope">
                             {{ formatMoney(scope.row.TotalPerformance) }}
@@ -66,6 +66,22 @@
                             {{ formatMoney(scope.row.UpgradeOrderPerformance) }}
                         </template>
                     </el-table-column>
+                    <el-table-column prop="RefundPerformance" label="退单业绩" width="100" align="right">
+                        <template slot-scope="scope">
+                            <span style="color: #F56C6C;">{{ formatMoney(scope.row.RefundPerformance) }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="RefundCount" label="退单次数" width="100" align="right">
+                        <template slot-scope="scope">
+                            <span style="color: #F56C6C;">{{ scope.row.RefundCount || 0 }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="ActualPerformance" label="实际业绩" width="100" align="right">
+                        <template slot-scope="scope">
+                            <span style="color: #67C23A; font-weight: bold;">{{ formatMoney(scope.row.ActualPerformance)
+                                }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="FirstOrderCount" label="首开单数量" width="100" align="right"></el-table-column>
                     <el-table-column prop="UpgradeOrderCount" label="升单数量" width="100" align="right"></el-table-column>
                     <el-table-column prop="OrderCount" label="订单总数" width="100" align="right"></el-table-column>
@@ -81,6 +81,12 @@
                             <span style="color: #F56C6C;">{{ scope.row.RefundCount || 0 }}</span>
                         </template>
                     </el-table-column>
+                    <el-table-column prop="ActualPerformance" label="实际业绩" width="120" align="right">
+                        <template slot-scope="scope">
+                            <span style="color: #67C23A; font-weight: bold;">{{ formatMoney(scope.row.ActualPerformance)
+                                }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="CreateTime" label="创建时间" width="150" align="center">
                         <template slot-scope="scope">
                             {{ formatDateTime(scope.row.CreateTime) }}
@@ -123,21 +123,21 @@ namespace NCC.Extend.Entitys.Dto.LqMdxx
         /// <summary>
         /// 门店类别
         /// </summary>
-        public int? StoreCategory { get; set; }
+        public int? storeCategory { get; set; }
         /// <summary>
         /// 门店类别名称
         /// </summary>
-        public string StoreCategoryName => StoreCategory.HasValue ? EnumHelper.GetEnumDesc<StoreCategoryEnum>(StoreCategory.Value) : string.Empty;
+        public string storeCategoryName => storeCategory.HasValue ? EnumHelper.GetEnumDesc<StoreCategoryEnum>(storeCategory.Value) : string.Empty;
         /// <summary>
         /// 门店类型
         /// </summary>
-        public int? StoreType { get; set; }
+        public int? storeType { get; set; }
         /// <summary>
         /// 门店类型名称
         /// </summary>
-        public string StoreTypeName => StoreType.HasValue ? EnumHelper.GetEnumDesc<StoreTypeEnum>(StoreType.Value) : string.Empty;
+        public string storeTypeName => storeType.HasValue ? EnumHelper.GetEnumDesc<StoreTypeEnum>(storeType.Value) : string.Empty;
     }
 }
@@ -152,21 +152,21 @@ namespace NCC.Extend.Entitys.Dto.LqMdxx
         /// <summary>
         /// 门店类别
         /// </summary>
-        public int? StoreCategory { get; set; }
+        public int? storeCategory { get; set; }
         /// <summary>
         /// 门店类别名称
         /// </summary>
-        public string StoreCategoryName => StoreCategory.HasValue ? EnumHelper.GetEnumDesc<StoreCategoryEnum>(StoreCategory.Value) : string.Empty;
+        public string storeCategoryName => storeCategory.HasValue ? EnumHelper.GetEnumDesc<StoreCategoryEnum>(storeCategory.Value) : string.Empty;
         /// <summary>
         /// 门店类型
         /// </summary>
-        public int? StoreType { get; set; }
+        public int? storeType { get; set; }
         /// <summary>
         /// 门店类型名称
         /// </summary>
-        public string StoreTypeName => StoreType.HasValue ? EnumHelper.GetEnumDesc<StoreTypeEnum>(StoreType.Value) : string.Empty;
+        public string storeTypeName => storeType.HasValue ? EnumHelper.GetEnumDesc<StoreTypeEnum>(storeType.Value) : string.Empty;
     }
 }
@@ -73,6 +73,11 @@ namespace NCC.Extend.Entitys.Dto.LqStatistics
         public int RefundCount { get; set; }
         /// <summary>
+        /// 实际业绩
+        /// </summary>
+        public decimal ActualPerformance { get; set; }
+
+        /// <summary>
         /// 创建时间
         /// </summary>
         public DateTime CreateTime { get; set; }
@@ -93,6 +93,21 @@ namespace NCC.Extend.Entitys.Dto.LqStatisticsPersonalPerformance
         public decimal UpgradeOrderPerformance { get; set; }
         /// <summary>
+        /// 退单业绩
+        /// </summary>
+        public decimal RefundPerformance { get; set; }
+
+        /// <summary>
+        /// 退单次数
+        /// </summary>
+        public int RefundCount { get; set; }
+
+        /// <summary>
+        /// 实际业绩
+        /// </summary>
+        public decimal ActualPerformance { get; set; }
+
+        /// <summary>
         /// 最后订单日期
         /// </summary>
         public DateTime? LastOrderDate { get; set; }
@@ -86,5 +86,10 @@ namespace NCC.Extend.Entitys.Dto.LqStatisticsStoreTotalPerformance
         /// 创建时间
         /// </summary>
         public DateTime? createTime { get; set; }
+
+        /// <summary>
+        /// 实际业绩
+        /// </summary>
+        public decimal actualPerformance { get; set; }
     }
 }
@@ -114,6 +114,24 @@ namespace NCC.Extend.Entitys.lq_statistics_personal_performance
         public decimal UpgradeOrderPerformance { get; set; }
         /// <summary>
+        /// 退单业绩
+        /// </summary>
+        [SugarColumn(ColumnName = "F_RefundPerformance")]
+        public decimal RefundPerformance { get; set; }
+
+        /// <summary>
+        /// 退单次数
+        /// </summary>
+        [SugarColumn(ColumnName = "F_RefundCount")]
+        public int RefundCount { get; set; }
+
+        /// <summary>
+        /// 实际业绩
+        /// </summary>
+        [SugarColumn(ColumnName = "F_ActualPerformance")]
+        public decimal ActualPerformance { get; set; }
+
+        /// <summary>
         /// 最后订单日期
         /// </summary>
         [SugarColumn(ColumnName = "F_LastOrderDate")]
@@ -102,6 +102,12 @@ namespace NCC.Extend.Entitys.lq_statistics_store_total_performance
         public int RefundCount { get; set; }
         /// <summary>
+        /// 实际业绩
+        /// </summary>
+        [SugarColumn(ColumnName = "F_ActualPerformance")]
+        public decimal ActualPerformance { get; set; }
+
+        /// <summary>
         /// 创建时间
         /// </summary>
         [SugarColumn(ColumnName = "F_CreateTime")]
@@ -1179,6 +1179,25 @@ namespace NCC.Extend.LqKdKdjlb
         }
         #endregion
+        #region 获取状态枚举内容（所有的状态通用）
+        /// <summary>
+        /// 获取状态枚举内容
+        /// </summary>
+        /// <returns>状态枚举列表</returns>
+        [HttpGet("status-enum")]
+        public List<EnumOutput> GetStatusEnum()
+        {
+            return Enum.GetValues<StatusEnum>()
+                .Select(e => new EnumOutput
+                {
+                    Value = (int)e,
+                    Name = e.ToString(),
+                    Description = e.GetDescription(),
+                })
+                .ToList();
+        }
+        #endregion
+
         #region 修改开单记录
         /// <summary>
         /// 修改开单记录
@@ -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
-
-
     }
 }
@@ -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<LqMdxxListOutput>.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
         /// </summary>
         /// <returns></returns>
         [HttpGet("Selector/StoreCategory")]
-        public async Task<dynamic> GetStoreCategorySelector()
+        public List<EnumOutput> GetStoreCategorySelector()
         {
-            //从Enum中获取门店类别
-            var storeCategoryEnum = EnumExtensions.GetEnumDescDictionary(typeof(StoreCategoryEnum));
-            return new { list = storeCategoryEnum };
+            return Enum.GetValues<StoreCategoryEnum>().Select(e => new EnumOutput
+            {
+                Value = (int)e,
+                Name = e.ToString(),
+                Description = e.GetDescription(),
+            }).ToList();
         }
         #endregion
@@ -373,11 +390,18 @@ namespace NCC.Extend.LqMdxx
         /// </summary>
         /// <returns></returns>
         [HttpGet("Selector/StoreType")]
-        public async Task<dynamic> GetStoreTypeSelector()
+        public List<EnumOutput> GetStoreTypeSelector()
         {
             //从Enum中获取门店类型
-            var storeTypeEnum = EnumExtensions.GetEnumDescDictionary(typeof(StoreTypeEnum));
-            return new { list = storeTypeEnum };
+            var storeTypeEnum = Enum.GetValues<StoreTypeEnum>()
+                .Select(e => new EnumOutput
+                {
+                    Value = (int)e,
+                    Name = e.ToString(),
+                    Description = e.GetDescription(),
+                })
+                .ToList();
+            return storeTypeEnum;
         }
         #endregion
     }
@@ -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
         }
         /// <summary>
-        /// 分页查询个人开单业绩统计数据
+        /// 分页查询个人开单业绩统计数据（在用）
         /// </summary>
         /// <remarks>
         /// 分页查询个人业绩统计数据，支持多条件筛选
@@ -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