From a5851a4e906725b868bcfdaa8c59249523137586 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 29 十月 2024 14:03:47 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop
---
CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsPlanOrderController.cs | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsPlanOrderController.cs b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsPlanOrderController.cs
index ba42d3f..5a59362 100644
--- a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsPlanOrderController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsPlanOrderController.cs
@@ -260,8 +260,9 @@
{
where = where.And(p => p.isdelete == false);
}
+ OtherData otherData = new OtherData();
//鑾峰彇鏁版嵁
- var list = await _CoreCmsPlanOrderServices.QueryPageAsync(where, orderEx, orderBy, pageCurrent, pageSize, true);
+ var list = await _CoreCmsPlanOrderServices.QueryPageAsync(where, orderEx, orderBy, otherData, pageCurrent, pageSize, true);
if (list != null && list.Count > 0)
{
@@ -278,6 +279,12 @@
jm.code = 0;
jm.count = list.TotalCount;
jm.msg = "鏁版嵁璋冪敤鎴愬姛!";
+
+ otherData.heji1 = list.Sum(x => x.oldOrderAmount);
+ otherData.heji2 = list.Sum(x => x.orderAmount);
+ otherData.heji3 = list.Sum(x => x.keYongAmount);
+ jm.otherData = otherData;
+
return jm;
}
#endregion
--
Gitblit v1.9.1