diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqShareStatisticsStoreService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqShareStatisticsStoreService.cs index 0685402..33c4540 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqShareStatisticsStoreService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqShareStatisticsStoreService.cs @@ -399,8 +399,7 @@ namespace NCC.Extend // 2. 店助底薪和提成 var assistantSalary = await _db.Queryable() - .Where(x => x.StoreId == entity.StoreId && x.StatisticsMonth == statisticsMonth - && x.Position == "店助") + .Where(x => x.StoreId == entity.StoreId && x.StatisticsMonth == statisticsMonth && x.Position == "店助") .Select(x => new { BaseSalary = SqlFunc.AggregateSum(x.BaseSalary), @@ -416,12 +415,14 @@ namespace NCC.Extend entity.SalaryHeadcountReward = assistantSalary?.HeadcountReward ?? 0; // 3. 店助主任底薪和提成 - var directorSalary = await _db.Queryable() - .Where(x => x.StoreId == entity.StoreId && x.StatisticsMonth == statisticsMonth) + var directorSalary = await _db.Queryable() + .Where(x => x.StoreId == entity.StoreId && x.StatisticsMonth == statisticsMonth && x.Position == "店助主任") .Select(x => new { - BaseSalary = SqlFunc.AggregateSum(x.ActualBaseSalary), - Commission = SqlFunc.AggregateSum(x.TotalCommissionAmount) + BaseSalary = SqlFunc.AggregateSum(x.BaseSalary), + Commission = SqlFunc.AggregateSum(x.CommissionAmount), + PhoneCustody = SqlFunc.AggregateSum(x.PhoneManagementFee), + HeadcountReward = SqlFunc.AggregateSum(x.Stage1Reward + x.Stage2Reward) }) .FirstAsync(); diff --git a/sql/排查生美业绩统计差异-简化版.sql b/sql/排查生美业绩统计差异-简化版.sql index d98ed59..20bf328 100644 --- a/sql/排查生美业绩统计差异-简化版.sql +++ b/sql/排查生美业绩统计差异-简化版.sql @@ -119,3 +119,4 @@ ORDER BY 生美业绩 DESC; + diff --git a/sql/排查生美业绩统计差异详细.sql b/sql/排查生美业绩统计差异详细.sql index 4a4dde9..6039721 100644 --- a/sql/排查生美业绩统计差异详细.sql +++ b/sql/排查生美业绩统计差异详细.sql @@ -171,3 +171,4 @@ HAVING COUNT(*) > 1; + diff --git a/sql/检查生美业绩统计差异.sql b/sql/检查生美业绩统计差异.sql index e14f4e0..40ef5d1 100644 --- a/sql/检查生美业绩统计差异.sql +++ b/sql/检查生美业绩统计差异.sql @@ -141,3 +141,4 @@ ORDER BY 生美业绩 DESC; + diff --git a/test_tianwang_api.py b/test_tianwang_api.py index 7dcc326..3b1e749 100644 --- a/test_tianwang_api.py +++ b/test_tianwang_api.py @@ -74,3 +74,4 @@ print(f"\n教育一部+教育二部合计 BillingPerformance: {total2}") + diff --git a/门店股份统计说明.md b/门店股份统计说明.md index 8f1cfc1..bf43b21 100644 --- a/门店股份统计说明.md +++ b/门店股份统计说明.md @@ -104,7 +104,7 @@ ### 4.1 人工工资-底薪 (base_salary) * **人工工资-健康师底薪**: 来源于 `lq_salary_statistics.F_ActualBaseSalary`。 * **人工工资-店助底薪**: 来源于 `lq_assistant_salary_statistics.F_ActualBaseSalary` (岗位为“店助”)。 -* **人工工资-店助主任底薪**: 来源于 `lq_director_salary_statistics.F_ActualBaseSalary` (岗位为“主任”)。 +* **人工工资-店助主任底薪**: 来源于 `lq_director_salary_statistics.F_ActualBaseSalary` (岗位为“店助主任”)。 * **人工工资-店长底薪**: 来源于 `lq_store_manager_salary_statistics.F_ActualBaseSalary`。 * **人工工资-总经理/经理底薪**: 来源于事业部总经理/经理工资表 `F_ActualBaseSalary` (按门店平均分摊 - 底薪固定4000,按管理门店数平均)。