From 445d14becca6b5251814934343d7a6394ada6009 Mon Sep 17 00:00:00 2001
From: 小飞侠 <8277136+liaoxujun@user.noreply.gitee.com>
Date: 星期五, 17 十月 2025 16:55:19 +0800
Subject: [PATCH] no message
---
CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs b/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs
index 3dc415c..a86a68e 100644
--- a/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs
+++ b/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs
@@ -156,14 +156,24 @@
updateTime = p.updateTime,
verifyTime = p.verifyTime,
isDelete = p.isDelete,
+ idCradNumber = p.idCradNumber,
+ schoolName = p.schoolName,
storeCoordinate = p.storeCoordinate,
UserGradeId = SqlFunc.Subqueryable<CoreCmsUser>().Where(o => o.id == p.userId).Select(o => o.grade),
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()
@@ -197,14 +207,23 @@
profession = p.profession,
sales=p.sales,
storeCoordinate = p.storeCoordinate,
+ idCradNumber = p.idCradNumber,
+ schoolName = p.schoolName,
UserGradeId = SqlFunc.Subqueryable<CoreCmsUser>().Where(o => o.id == p.userId).Select(o => o.grade),
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()
.OrderByIF(orderByExpression != null, orderByExpression, orderByType)
--
Gitblit v1.9.1