Skip to content

M
mall.oytour.com
Commit c8548132 authored by liudong1993's avatar liudong1993
Browse files
Options

1

parent db857b44
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 20 deletions
Mall.Module.MarketingCenter/StatisticsModule.cs
View file @ c8548132
......@@ -1024,11 +1024,10 @@ namespace Mall.Module.MarketingCenter
#endregion
#region 会员累计
var disList = distributor_InfoRepository.GetMemberDistributorNumberForCutOff(new RB_Distributor_Info_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, AuditStatus = Common.Enum.User.DistributorAuditStatusEnum.Audited }, EndTime);
int TotalPXNum = disList.Where(x => x.FXGradeId == 1).FirstOrDefault()?.SortNum ?? 0;
int TotalVIPNum = disList.Where(x => x.FXGradeId == 2).FirstOrDefault()?.SortNum ?? 0;
int TotalYXNum = disList.Where(x => x.FXGradeId == 3).FirstOrDefault()?.SortNum ?? 0;
int TotalJXNum = disList.Where(x => x.FXGradeId == 4).FirstOrDefault()?.SortNum ?? 0;
int TotalPXNum = list.Any() ? list.Max(x => x.PXLJNum) : 0;
int TotalVIPNum = list.Any() ? list.Max(x => x.VipLJNum) : 0;
int TotalYXNum = list.Any() ? list.Max(x => x.YXLJNum) : 0;
int TotalJXNum = list.Any() ? list.Max(x => x.JXLJNum) : 0;
#endregion
return new
......@@ -1746,11 +1745,10 @@ namespace Mall.Module.MarketingCenter
#endregion
#region 会员累计
var disList = distributor_InfoRepository.GetMemberDistributorNumberForCutOff(new RB_Distributor_Info_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, AuditStatus = Common.Enum.User.DistributorAuditStatusEnum.Audited }, EndTime);
int TotalPXNum = disList.Where(x => x.FXGradeId == 1).FirstOrDefault()?.SortNum ?? 0;
int TotalVIPNum = disList.Where(x => x.FXGradeId == 2).FirstOrDefault()?.SortNum ?? 0;
int TotalYXNum = disList.Where(x => x.FXGradeId == 3).FirstOrDefault()?.SortNum ?? 0;
int TotalJXNum = disList.Where(x => x.FXGradeId == 4).FirstOrDefault()?.SortNum ?? 0;
int TotalPXNum = list.Any() ? list.Max(x => x.PXLJNum) : 0;
int TotalVIPNum = list.Any() ? list.Max(x => x.VipLJNum) : 0;
int TotalYXNum = list.Any() ? list.Max(x => x.YXLJNum) : 0;
int TotalJXNum = list.Any() ? list.Max(x => x.JXLJNum) : 0;
ExcelDataSource datarow7 = new ExcelDataSource()
{
......@@ -1863,11 +1861,11 @@ namespace Mall.Module.MarketingCenter
mmodel.BuyNum = mlist.Sum(x => x.BuyNum);
mmodel.TotalPayPeople = mlist.Any() ? mlist.Max(x => x.PaymentNum) : 0;
mmodel.Profit = mlist.Sum(x => x.Profit);
var disList = distributor_InfoRepository.GetMemberDistributorNumberForCutOff(new RB_Distributor_Info_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, AuditStatus = Common.Enum.User.DistributorAuditStatusEnum.Audited }, Convert.ToDateTime(SMonth + "-01").AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd"));
int TotalPXNum = disList.Where(x => x.FXGradeId == 1).FirstOrDefault()?.SortNum ?? 0;
int TotalVIPNum = disList.Where(x => x.FXGradeId == 2).FirstOrDefault()?.SortNum ?? 0;
int TotalYXNum = disList.Where(x => x.FXGradeId == 3).FirstOrDefault()?.SortNum ?? 0;
int TotalJXNum = disList.Where(x => x.FXGradeId == 4).FirstOrDefault()?.SortNum ?? 0;
//抓取累计数据
int TotalPXNum = mlist.Any() ? list.Max(x => x.PXLJNum) : 0;
int TotalVIPNum = mlist.Any() ? list.Max(x => x.VipLJNum) : 0;
int TotalYXNum = mlist.Any() ? list.Max(x => x.YXLJNum) : 0;
int TotalJXNum = mlist.Any() ? list.Max(x => x.JXLJNum) : 0;
mmodel.PXNum = TotalPXNum;
mmodel.VipNum = TotalVIPNum;
mmodel.YXNum = TotalYXNum;
......@@ -2231,11 +2229,11 @@ namespace Mall.Module.MarketingCenter
mmodel.BuyNum = mlist.Sum(x => x.BuyNum);
mmodel.TotalPayPeople = mlist.Any() ? mlist.Max(x => x.PaymentNum) : 0;
mmodel.Profit = mlist.Sum(x => x.Profit);
var disList = distributor_InfoRepository.GetMemberDistributorNumberForCutOff(new RB_Distributor_Info_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, AuditStatus = Common.Enum.User.DistributorAuditStatusEnum.Audited }, Convert.ToDateTime(SMonth + "-01").AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd"));
int TotalPXNum = disList.Where(x => x.FXGradeId == 1).FirstOrDefault()?.SortNum ?? 0;
int TotalVIPNum = disList.Where(x => x.FXGradeId == 2).FirstOrDefault()?.SortNum ?? 0;
int TotalYXNum = disList.Where(x => x.FXGradeId == 3).FirstOrDefault()?.SortNum ?? 0;
int TotalJXNum = disList.Where(x => x.FXGradeId == 4).FirstOrDefault()?.SortNum ?? 0;
//抓取累计数据
int TotalPXNum = mlist.Any() ? list.Max(x => x.PXLJNum) : 0;
int TotalVIPNum = mlist.Any() ? list.Max(x => x.VipLJNum) : 0;
int TotalYXNum = mlist.Any() ? list.Max(x => x.YXLJNum) : 0;
int TotalJXNum = mlist.Any() ? list.Max(x => x.JXLJNum) : 0;
mmodel.PXNum = TotalPXNum;
mmodel.VipNum = TotalVIPNum;
mmodel.YXNum = TotalYXNum;
......
Mall.WindowsService/Module/UserStatisticsModule.cs
View file @ c8548132
......@@ -166,12 +166,24 @@ namespace Mall.WindowsService.Module
usmodel.ReBuyRate = usmodel.PaymentNum <= 0 ? 0 : Math.Round(Convert.ToDecimal(usmodel.ReBuyNum) / usmodel.PaymentNum, 4, MidpointRounding.AwayFromZero) * 100;
usmodel.NewPeopleNum = usmodel.PeopleNum - usmodel.ReBuyNum;
//今日数量
var newList = distributor_InfoRepository.GetNewUserForNowDay(new RB_Distributor_Info_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, AuditStatus = Common.Enum.User.DistributorAuditStatusEnum.Audited }, SDate);
usmodel.PXNum = newList.Where(x => x.FXGradeId == 1).Count();
usmodel.VipNum = newList.Where(x => x.FXGradeId == 2).Count();
usmodel.YXNum = newList.Where(x => x.FXGradeId == 3).Count();
usmodel.JXNum = newList.Where(x => x.FXGradeId == 4).Count();
#region 累计数量 当月最后一天来查询
if (SDate == Convert.ToDateTime(Convert.ToDateTime(SDate).ToString("yyyy-MM") + "-01").AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd"))
{
var cutList = distributor_InfoRepository.GetMemberDistributorNumberForCutOff(new RB_Distributor_Info_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, AuditStatus = Common.Enum.User.DistributorAuditStatusEnum.Audited }, SDate);
usmodel.PXLJNum = cutList.Where(x => x.FXGradeId == 1)?.FirstOrDefault()?.SortNum ?? 0;
usmodel.VipLJNum = cutList.Where(x => x.FXGradeId == 2)?.FirstOrDefault()?.SortNum ?? 0;
usmodel.YXLJNum = cutList.Where(x => x.FXGradeId == 3)?.FirstOrDefault()?.SortNum ?? 0;
usmodel.JXLJNum = cutList.Where(x => x.FXGradeId == 4)?.FirstOrDefault()?.SortNum ?? 0;
}
#endregion
//利润
usmodel.Profit = dayList.Sum(x => x.GrossProfit);
usmodel.ProfitRate = dayList.Count() > 0 ? dayList.Sum(x => x.GrossProfitRate) / dayList.Count() : 0;
......
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