From 44e7987a5884ea2aa334bccca6983d9536c1e69b Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期二, 21 五月 2024 11:57:33 +0800
Subject: [PATCH] no message
---
CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs b/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs
index 8ba09f7..3dc415c 100644
--- a/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs
+++ b/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs
@@ -161,6 +161,9 @@
DistributionAchievementTotals = SqlFunc.Subqueryable<DistributionAchievement>()
.Where(da => da.userID == p.userId && da.isdelete == false)
.Sum(da => da.achievementTotals),
+ DistributionKeLingTotals=SqlFunc.Subqueryable<CoreCmsDistributionOrder>().Where(x=>x.isSettlement==(int )GlobalEnumVars.DistributionOrderSettlementStatus.SettlementNo&&x.userId==p.userId).Sum(x => x.amount),
+ DistributionYingLingTotals = SqlFunc.Subqueryable<CoreCmsDistributionOrder>().Where(x => x.isSettlement == (int)GlobalEnumVars.DistributionOrderSettlementStatus.SettlementNo && x.userId == p.userId).Sum(x => x.amount),
+ DistributionYiJieSuanTotals = SqlFunc.Subqueryable<CoreCmsDistributionOrder>().Where(x => x.isSettlement == (int)GlobalEnumVars.DistributionOrderSettlementStatus.SettlementYes && x.userId == p.userId).Sum(x => x.amount),
})
.MergeTable()
@@ -198,7 +201,10 @@
DistributionAchievementTotals= SqlFunc.Subqueryable<DistributionAchievement>()
.Where(da=>da.userID==p.userId&&da.isdelete==false)
.Sum(da=>da.achievementTotals),
-
+ DistributionKeLingTotals = SqlFunc.Subqueryable<CoreCmsDistributionOrder>().Where(x => x.isSettlement == (int)GlobalEnumVars.DistributionOrderSettlementStatus.SettlementNo && x.userId == p.userId).Sum(x => x.amount),
+ DistributionYingLingTotals = SqlFunc.Subqueryable<CoreCmsDistributionOrder>().Where(x => x.isSettlement == (int)GlobalEnumVars.DistributionOrderSettlementStatus.SettlementNo && x.userId == p.userId).Sum(x => x.amount),
+ DistributionYiJieSuanTotals = SqlFunc.Subqueryable<CoreCmsDistributionOrder>().Where(x => x.isSettlement == (int)GlobalEnumVars.DistributionOrderSettlementStatus.SettlementYes && x.userId == p.userId).Sum(x => x.amount),
+
})
.MergeTable()
.OrderByIF(orderByExpression != null, orderByExpression, orderByType)
--
Gitblit v1.9.1