no message

移动系统liao

2024-05-21 4d6cbddc0762c0164b072dc59ac8e0d51a0199ba

no message

 CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionOrderPartial.cs

@@ -65,5 +65,13 @@
        public List<CoreCmsDistributionOrderDetails> distributionOrderDetails { get; set; }


        /// <summary>
        /// 订单状态
        /// </summary>
        [Display(Name = "订单状态")]
        [SugarColumn(IsIgnore = true)]
        public int OderState { get; set; }


    }
}

 CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionPartial.cs

@@ -171,5 +171,6 @@
        {
            get; set;
        }
       
    }
}

 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),

                })

 CoreCms.Net.Services/Distribution/CoreCmsDistributionServices.cs

@@ -103,6 +103,20 @@
                info.TotalSettlementAmount = await _distributionOrderRepository.GetSumAsync(
                    p => p.isSettlement != (int)GlobalEnumVars.DistributionOrderSettlementStatus.SettlementCancel && p.userId == userId,
                    p => p.amount);
                var lisdata = await _unitOfWork.GetDbClient().Queryable<CoreCmsDistributionOrder>().Where(x=>x.userId == userId&&x.isSettlement== (int)GlobalEnumVars.DistributionOrderSettlementStatus.SettlementNo)
                    .Select(x=>new CoreCmsDistributionOrder
                    {
                         amount = x.amount,
                        OderState= SqlFunc.Subqueryable<CoreCmsOrder>().Where(c=>c.orderId==x.orderId).Select(c=>c.confirmStatus),

                    }).WithCache(10).ToListAsync();
                //可领金额
                info.DistributionKeLingTotals = lisdata.Where(x=>x.OderState== (int)GlobalEnumVars.OrderConfirmStatus.ConfirmReceipt
                || x.OderState == (int)GlobalEnumVars.OrderShipStatus.Yes).Sum(x=>x.amount);

                //应领金额
                info.DistributionYingLingTotals = lisdata.Where(x => x.OderState == (int)GlobalEnumVars.OrderConfirmStatus.ReceiptNotConfirmed
                || x.OderState == (int)GlobalEnumVars.OrderShipStatus.Yes).Sum(x => x.amount); ;
                //已结算金额
                info.SettlementAmount = await _distributionOrderRepository.GetSumAsync(
                    p => p.isSettlement == (int)GlobalEnumVars.DistributionOrderSettlementStatus.SettlementYes && p.userId == userId,