Commit 23b61da9 authored by liudong1993's avatar liudong1993

1

parent 7e536ea0
...@@ -525,7 +525,7 @@ where a.FinalPriceTips>0 and a.DepartTime>NOW() AND DATE_SUB(a.DepartTime, INTER ...@@ -525,7 +525,7 @@ where a.FinalPriceTips>0 and a.DepartTime>NOW() AND DATE_SUB(a.DepartTime, INTER
//可以用字典配置 需要执行的集团ID //可以用字典配置 需要执行的集团ID
DateTime sdate1 = DateTime.Now; DateTime sdate1 = DateTime.Now;
FinanceStatisticsModule.InsertBatchStatistics(0, "2025-01-01", groupId: 106);//团队 FinanceStatisticsModule.InsertBatchStatistics(0, "2023-01-01", groupId: 106);//团队
FinanceStatisticsModule.InsertBatchVisaStatistics(106);//签证 FinanceStatisticsModule.InsertBatchVisaStatistics(106);//签证
FinanceStatisticsModule.InsertBatchCRMTicketStatistics(106);//单机票 FinanceStatisticsModule.InsertBatchCRMTicketStatistics(106);//单机票
FinanceStatisticsModule.InsertBatchSinleHotelStatistics(106);//单项酒店 --- 2023-05-06 ld FinanceStatisticsModule.InsertBatchSinleHotelStatistics(106);//单项酒店 --- 2023-05-06 ld
......
...@@ -1812,7 +1812,7 @@ namespace REBORN.Module.DataStatisticsModule ...@@ -1812,7 +1812,7 @@ namespace REBORN.Module.DataStatisticsModule
string dateTime = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-01")).AddYears(1).AddDays(-1).ToString("yyyy-MM-dd"); string dateTime = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-01")).AddYears(1).AddDays(-1).ToString("yyyy-MM-dd");
if (DateTime.Parse(SKDate).AddYears(1) < DateTime.Now) if (DateTime.Parse(SKDate).AddYears(1) < DateTime.Now)
{ {
SKDate = DateTime.Now.AddMonths(-3).ToString("yyyy-MM-dd"); SKDate = DateTime.Now.AddMonths(-8).ToString("yyyy-MM-dd");
} }
if (!string.IsNullOrEmpty(SKDate) && IsHistory == true) if (!string.IsNullOrEmpty(SKDate) && IsHistory == true)
{ {
......
...@@ -16826,7 +16826,7 @@ namespace REBORN.Module.SellModule ...@@ -16826,7 +16826,7 @@ namespace REBORN.Module.SellModule
#endregion #endregion
#region 提成比例显示 + 金额显示 #region 提成比例显示 + 金额显示
item.Commission = commissionList.Where(x => x.OrderId == item.OrderId && x.RoleType == 4).Sum(x => x.CommissionMoney ?? 0); item.Commission = commissionList.Where(x => x.OrderId == item.OrderId && x.RoleType == 4).Sum(x => x.CommissionMoney);
if (cRuleList.Any()) if (cRuleList.Any())
{ {
var ruleModel = cRuleList.Where(x => ("," + x.BranchIds + ",").Contains("," + item.RB_Branch_Id + ",")).FirstOrDefault(); var ruleModel = cRuleList.Where(x => ("," + x.BranchIds + ",").Contains("," + item.RB_Branch_Id + ",")).FirstOrDefault();
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment