From 4d6cbddc0762c0164b072dc59ac8e0d51a0199ba Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期二, 21 五月 2024 14:40:15 +0800
Subject: [PATCH] no message
---
CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs b/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs
index 3dc415c..7ffa8d8 100644
--- a/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs
+++ b/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs
@@ -161,9 +161,14 @@
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),
+ DistributionYingLingTotals = SqlFunc.Subqueryable<CoreCmsDistributionOrder>().Where(x=>x.isSettlement==(int )GlobalEnumVars.DistributionOrderSettlementStatus.SettlementNo&&x.userId==p.userId && SqlFunc.Subqueryable<CoreCmsOrder>().Where(z => z.orderId == x.orderId).Select(z => z.confirmStatus) == (int)GlobalEnumVars.OrderConfirmStatus.ReceiptNotConfirmed).Sum(x => x.amount),
+ DistributionKeLingTotals = SqlFunc.Subqueryable<CoreCmsDistributionOrder>()
+ .Where(x => x.isSettlement == (int)GlobalEnumVars.DistributionOrderSettlementStatus.SettlementNo && x.userId == p.userId&&SqlFunc.Subqueryable<CoreCmsOrder>().Where(z=>z.orderId==x.orderId).Select(z=>z.confirmStatus)==(int )GlobalEnumVars.OrderConfirmStatus.ConfirmReceipt)
+
+ .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()
@@ -201,8 +206,11 @@
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),
+ DistributionKeLingTotals = SqlFunc.Subqueryable<CoreCmsDistributionOrder>()
+ .Where(x => x.isSettlement == (int)GlobalEnumVars.DistributionOrderSettlementStatus.SettlementNo && x.userId == p.userId && SqlFunc.Subqueryable<CoreCmsOrder>().Where(z => z.orderId == x.orderId).Select(z => z.confirmStatus) == (int)GlobalEnumVars.OrderConfirmStatus.ConfirmReceipt)
+
+ .Sum(x => x.amount),
DistributionYiJieSuanTotals = SqlFunc.Subqueryable<CoreCmsDistributionOrder>().Where(x => x.isSettlement == (int)GlobalEnumVars.DistributionOrderSettlementStatus.SettlementYes && x.userId == p.userId).Sum(x => x.amount),
})
--
Gitblit v1.9.1