From 7ef7efecb721ea4874f4449672946b8900dfc448 Mon Sep 17 00:00:00 2001 From: JianWeie Date: Fri, 19 Nov 2021 23:48:00 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E6=8E=A8=E8=8D=90=E5=95=86=E5=93=811=E5=B0=8F?= =?UTF-8?q?=E6=97=B6=E7=BC=93=E5=AD=98=E5=8A=9F=E8=83=BD=E3=80=82=20?= =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E8=AF=84?= =?UTF-8?q?=E4=BB=B7=E5=9B=9E=E5=A4=8D=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E5=BC=82=E5=B8=B8=E5=AF=BC=E8=87=B4=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=E3=80=82#I4IZ25=20?= =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E4=BF=83=E9=94=80=E6=B7=BB=E5=8A=A0=E5=95=86=E5=93=81?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E9=AB=98=E5=BA=A6=E4=B8=8D=E5=A4=9F=EF=BC=8C?= =?UTF-8?q?=E5=8F=8A=E5=88=A0=E5=87=8F=E5=95=86=E5=93=81=E9=80=89=E9=A1=B9?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82#I4ISGE=20=E3=80=90=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=8F=B0=E9=9D=A2=E6=9D=BF=EF=BC=8C=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E3=80=90=E5=BE=85=E6=94=AF=E4=BB=98=E3=80=91=E3=80=90=E5=BE=85?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E3=80=91=E3=80=90=E5=BE=85=E5=94=AE=E5=90=8E?= =?UTF-8?q?=E3=80=91=E7=BB=9F=E8=AE=A1=E9=97=AE=E9=A2=98=E3=80=82#I4G796?= =?UTF-8?q?=20=E3=80=90=E8=B0=83=E6=95=B4=E3=80=91SqlServer=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93SysLoginRecord=E8=A1=A8os=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=95=BF=E5=BA=A6=E4=B8=BA400=EF=BC=8C?= =?UTF-8?q?=E9=98=B2=E6=AD=A2linux=E7=B3=BB=E7=BB=9F=E4=B8=8B=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=93=8D=E4=BD=9C=E7=B3=BB=E7=BB=9F=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=95=BF=E5=BA=A6=E4=B8=8D=E5=A4=9F=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=82#I4FO90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Good/CoreCmsGoodsRepository.cs | 1 - .../Controllers/Com/ToolsController.cs | 15 +++++---------- .../wwwroot/views/good/goodscomment/edit.html | 2 +- .../promotion/promotion/conditioncreate.html | 8 ++------ .../views/promotion/promotion/edit.html | 8 ++++---- README.md | 3 +-- .../20211119/20211119带商品演示数据.bak | Bin 0 -> 15032320 bytes 数据库/SqlServer/数据库更新日志.txt | 3 +++ 8 files changed, 16 insertions(+), 24 deletions(-) create mode 100644 数据库/SqlServer/20211119/20211119带商品演示数据.bak diff --git a/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs b/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs index ea310fe..4887c7c 100644 --- a/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs +++ b/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs @@ -874,7 +874,6 @@ namespace CoreCms.Net.Repository }) .MergeTable() .OrderBy(p => p.createTime, OrderByType.Desc) - .WithCache(60 * 60) .ToListAsync(); } else diff --git a/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs b/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs index bcfc898..8d19f5c 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs @@ -1799,16 +1799,13 @@ namespace CoreCms.Net.Web.Admin.Controllers { var jm = new AdminUiCallBack(); //待支付 - var unpaidCount = await _orderServices.GetCountAsync(p => - p.status == (int)GlobalEnumVars.OrderStatus.Normal && - p.payStatus == (int)GlobalEnumVars.OrderPayStatus.No && - p.shipStatus == (int)GlobalEnumVars.ShipStatus.Yes); + var paymentWhere = _orderServices.GetReverseStatus((int)GlobalEnumVars.OrderAllStatusType.ALL_PENDING_PAYMENT); + var unpaidCount = await _orderServices.GetCountAsync(paymentWhere); + //待发货 - var unshipCount = await _orderServices.GetCountAsync(p => - p.status == (int)GlobalEnumVars.OrderStatus.Normal && - p.payStatus == (int)GlobalEnumVars.OrderPayStatus.No && - (p.shipStatus == (int)GlobalEnumVars.ShipStatus.Yes || p.shipStatus == (int)GlobalEnumVars.ShipStatus.No)); + var deliveredWhere = _orderServices.GetReverseStatus((int)GlobalEnumVars.OrderAllStatusType.ALL_PENDING_DELIVERY); + var unshipCount = await _orderServices.GetCountAsync(deliveredWhere); //待售后 var aftersalesCount = await _aftersalesServices.GetCountAsync(p => p.status == (int)GlobalEnumVars.BillAftersalesStatus.WaitAudit); @@ -1830,8 +1827,6 @@ namespace CoreCms.Net.Web.Admin.Controllers goodsStaticsTotalWarn }; - - return jm; } diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goodscomment/edit.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goodscomment/edit.html index bc06fa3..285b5bf 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goodscomment/edit.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goodscomment/edit.html @@ -22,7 +22,7 @@ - {{ d.params.data.nickName || '' }} 【{{ d.params.data.mobile || '' }}】 + {{ d.params.data.nickName || '' }} 【{{ d.params.data.mobile || '' }}】 diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/promotion/promotion/conditioncreate.html b/CoreCms.Net.Web.Admin/wwwroot/views/promotion/promotion/conditioncreate.html index b7dc784..ed2aac4 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/promotion/promotion/conditioncreate.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/promotion/promotion/conditioncreate.html @@ -150,7 +150,6 @@