From 44e7987a5884ea2aa334bccca6983d9536c1e69b Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期二, 21 五月 2024 11:57:33 +0800
Subject: [PATCH] no message
---
CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionPartial.cs | 24 +++++++++++++++++++++---
CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/index.html | 5 +++++
CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs | 8 +++++++-
3 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionPartial.cs b/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionPartial.cs
index 4bd09d6..621bec7 100644
--- a/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionPartial.cs
+++ b/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;
+ }
}
}
\ No newline at end of file
diff --git a/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs b/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs
index 8ba09f7..3dc415c 100644
--- a/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs
+++ b/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)
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/index.html
index 3d6a499..0ae8851 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/index.html
+++ b/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 },
--
Gitblit v1.9.1