no message

移动系统liao

2024-05-21 44e7987a5884ea2aa334bccca6983d9536c1e69b

no message

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

@@ -149,9 +149,27 @@
        public decimal DistributionAchievementTotals { get; set; }


    
        /// <summary>
        ///     应领佣金
        /// </summary>
        [Display(Name = "应领佣金")]
        [SugarColumn(IsIgnore = true)]
        public decimal DistributionYingLingTotals { get; set; }



        /// <summary>
        ///     可领佣金
        /// </summary>
        [Display(Name = "可领佣金")]
        [SugarColumn(IsIgnore = true)]
        public decimal DistributionKeLingTotals { get; set; }
        /// <summary>
        ///     已结算佣金
        /// </summary>
        [Display(Name = "已结算佣金")]
        [SugarColumn(IsIgnore = true)]
        public decimal DistributionYiJieSuanTotals
        {
            get; set;
        }
    }
}

 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)

 CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/index.html

@@ -212,6 +212,10 @@
                                }
                            },
                            { field: 'distributionAchievementTotals', title: '历史推广费总和(元)', sort: false, width: 133 },
                            { field: 'distributionYingLingTotals', title: '应领佣金(元)', sort: false, width: 133 },
                            { field: 'distributionKeLingTotals', title: '可领佣金(元)', sort: false, width: 133 },
                            { field: 'distributionYiJieSuanTotals', title: '已结算佣金(元)', sort: false, width: 133 },
                          
                            //{ field: 'storeDesc', title: '店铺简介', sort: false, width: 105 },
                            {
                                field: 'verifyStatus', title: '审核状态', sort: false, width: 80, templet: function (data) {
@@ -222,6 +226,7 @@
                                    }
                                }
                            },

                            { field: 'createTime', title: '创建时间', width: 130, sort: false },
                            { field: 'updateTime', title: '更新时间', width: 130, sort: false },
                            { field: 'verifyTime', title: '审核时间', width: 130, sort: false },