no message

移动系统liao

2024-05-21 44e7987a5884ea2aa334bccca6983d9536c1e69b

 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)