修改定制封面逻辑

移动系统liao

2024-05-29 71e821ab5e6b3014fac9b691d6957bcc09704b70

 CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs

@@ -156,14 +156,19 @@
                    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),
                    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),
                    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)
                    .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>()
@@ -202,17 +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),
                    DistributionYingLingTotals = 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
                    && 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)
                    .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),

                    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)