diff --git a/CoreCms.Net.Model/ViewModels/SQ/SQReservationParticipantsDto.cs b/CoreCms.Net.Model/ViewModels/SQ/SQReservationParticipantsDto.cs index 7fc98fd..5c81ee8 100644 --- a/CoreCms.Net.Model/ViewModels/SQ/SQReservationParticipantsDto.cs +++ b/CoreCms.Net.Model/ViewModels/SQ/SQReservationParticipantsDto.cs @@ -25,6 +25,11 @@ namespace CoreCms.Net.Model.ViewModels.SQ /// public string UserName { get; set; } + /// + /// 用户昵称 + /// + public string NickName { get; set; } + /// /// 用户头像 /// diff --git a/CoreCms.Net.Repository/SQ/SQReservationParticipantsRepository.cs b/CoreCms.Net.Repository/SQ/SQReservationParticipantsRepository.cs index bc1b864..b3d5d6d 100644 --- a/CoreCms.Net.Repository/SQ/SQReservationParticipantsRepository.cs +++ b/CoreCms.Net.Repository/SQ/SQReservationParticipantsRepository.cs @@ -209,38 +209,13 @@ namespace CoreCms.Net.Repository { page = await DbClient.Queryable() .OrderByIF(orderByExpression != null, orderByExpression, orderByType) - .WhereIF(predicate != null, predicate).Select(p => new SQReservationParticipants - { - id = p.id, - reservation_id = p.reservation_id, - user_id = p.user_id, - role = p.role, - join_time = p.join_time, - quit_time = p.quit_time, - status = p.status, - important_data = p.important_data, - is_refund = p.is_refund, - remarks = p.remarks, - - }).With(SqlWith.NoLock).ToPageListAsync(pageIndex, pageSize, totalCount); + .WhereIF(predicate != null, predicate).With(SqlWith.NoLock).ToPageListAsync(pageIndex, pageSize, totalCount); } else { page = await DbClient.Queryable() .OrderByIF(orderByExpression != null, orderByExpression, orderByType) - .WhereIF(predicate != null, predicate).Select(p => new SQReservationParticipants - { - id = p.id, - reservation_id = p.reservation_id, - user_id = p.user_id, - role = p.role, - join_time = p.join_time, - quit_time = p.quit_time, - status = p.status, - important_data = p.important_data, - is_refund = p.is_refund, - remarks = p.remarks, - }).ToPageListAsync(pageIndex, pageSize, totalCount); + .WhereIF(predicate != null, predicate).ToPageListAsync(pageIndex, pageSize, totalCount); } var list = new PageList(page, pageIndex, pageSize, totalCount); return list; diff --git a/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs b/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs index 813f9da..ff433a8 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs @@ -87,7 +87,7 @@ namespace CoreCms.Net.Web.Admin.Controllers private readonly ICoreCmsPagesServices _pagesServices; private readonly IToolsServices _toolsServices; private readonly ICoreCmsReportsServices _reportsServices; - + private readonly ISQReservationsServices _SQReservationsServices; private readonly WeChat.Service.HttpClients.IWeChatApiHttpClientFactory _weChatApiHttpClientFactory; @@ -114,7 +114,9 @@ namespace CoreCms.Net.Web.Admin.Controllers , ISysMenuServices sysMenuServices , ISysUserRoleServices sysUserRoleServices , ISysOrganizationServices sysOrganizationServices, ICodeGeneratorServices codeGeneratorServices, - ICoreCmsLogisticsServices logisticsServices, ISysLoginRecordServices sysLoginRecordServices, ISysNLogRecordsServices sysNLogRecordsServices, ICoreCmsBillPaymentsServices paymentsServices, ICoreCmsBillDeliveryServices billDeliveryServices, ICoreCmsUserServices userServices, ICoreCmsOrderServices orderServices, ICoreCmsBillAftersalesServices aftersalesServices, ICoreCmsSettingServices settingServices, ICoreCmsProductsServices productsServices, ICoreCmsServicesServices servicesServices, IOptions filesStorageOptions, ISysRoleMenuServices sysRoleMenuServices, IWeChatApiHttpClientFactory weChatApiHttpClientFactory, ICoreCmsPagesServices pagesServices, IToolsServices toolsServices, ICoreCmsReportsServices reportsServices) + ICoreCmsLogisticsServices logisticsServices, ISysLoginRecordServices sysLoginRecordServices, ISysNLogRecordsServices sysNLogRecordsServices, ICoreCmsBillPaymentsServices paymentsServices, ICoreCmsBillDeliveryServices billDeliveryServices, ICoreCmsUserServices userServices, ICoreCmsOrderServices orderServices, ICoreCmsBillAftersalesServices aftersalesServices, ICoreCmsSettingServices settingServices, ICoreCmsProductsServices productsServices, ICoreCmsServicesServices servicesServices, IOptions filesStorageOptions, ISysRoleMenuServices sysRoleMenuServices, IWeChatApiHttpClientFactory weChatApiHttpClientFactory, ICoreCmsPagesServices pagesServices, IToolsServices toolsServices, ICoreCmsReportsServices reportsServices + , ISQReservationsServices sQReservationsServices + ) { _user = user; _webHostEnvironment = webHostEnvironment; @@ -150,6 +152,7 @@ namespace CoreCms.Net.Web.Admin.Controllers _pagesServices = pagesServices; _toolsServices = toolsServices; _reportsServices = reportsServices; + _SQReservationsServices = sQReservationsServices; } #region 获取登录用户用户信息(用于面板展示)==================================================== @@ -1549,24 +1552,15 @@ namespace CoreCms.Net.Web.Admin.Controllers public async Task GetBackLog() { var jm = new AdminUiCallBack(); - //待支付 - var paymentWhere = _orderServices.GetReverseStatus((int)GlobalEnumVars.OrderAllStatusType.ALL_PENDING_PAYMENT); - var unpaidCount = await _orderServices.GetCountAsync(paymentWhere); - - - //待发货 - 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); - - var allConfigs = await _settingServices.GetConfigDictionaries(); - var goodsStocksWarn = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.GoodsStocksWarn).ObjectToInt(10); - - //库存报警 - var goodsStaticsTotalWarn = await _productsServices.GoodsStaticsTotalWarn(goodsStocksWarn); + //组局中 + var unpaidCount = await _SQReservationsServices.GetCountAsync(it => it.status == 0); + //待开始 + var unshipCount = await _SQReservationsServices.GetCountAsync(it => it.status == 1); + //进行中 + var aftersalesCount = await _SQReservationsServices.GetCountAsync(it => it.status == 2); + //已结束 + var goodsStaticsTotalWarn = await _SQReservationsServices.GetCountAsync(it => it.status == 3); //返回数据 jm.code = 0; jm.msg = "数据调用成功!"; diff --git a/CoreCms.Net.Web.Admin/Controllers/SQ/SQReservationParticipantsController.cs b/CoreCms.Net.Web.Admin/Controllers/SQ/SQReservationParticipantsController.cs index dc6ee3e..dd8de0c 100644 --- a/CoreCms.Net.Web.Admin/Controllers/SQ/SQReservationParticipantsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/SQ/SQReservationParticipantsController.cs @@ -217,6 +217,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (user != null) { item.UserName = user.userName; + item.NickName = user.nickName; } } } diff --git a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj index 7f06bb7..13a70b6 100644 --- a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj +++ b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj @@ -241,10 +241,6 @@ - - - - diff --git a/CoreCms.Net.Web.Admin/Doc.xml b/CoreCms.Net.Web.Admin/Doc.xml index 5092051..276cb75 100644 --- a/CoreCms.Net.Web.Admin/Doc.xml +++ b/CoreCms.Net.Web.Admin/Doc.xml @@ -554,7 +554,7 @@ 后端常用方法 - + 构造函数 diff --git a/CoreCms.Net.Web.Admin/appsettings.json b/CoreCms.Net.Web.Admin/appsettings.json index 2e84aa5..928682b 100644 --- a/CoreCms.Net.Web.Admin/appsettings.json +++ b/CoreCms.Net.Web.Admin/appsettings.json @@ -84,7 +84,7 @@ "WeChatPay": { // 应用号 // 如：微信公众平台AppId、微信开放平台AppId、微信小程序AppId、企业微信CorpId等 - "AppId": "", + "AppId": "wxa17265f5fe8374b1", // 商户号 // 为微信支付商户平台的商户号 "MchId": "", diff --git a/CoreCms.Net.Web.Admin/wwwroot/lib/ckeditor5/index.html b/CoreCms.Net.Web.Admin/wwwroot/lib/ckeditor5/index.html index 974ed9d..617da6d 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/lib/ckeditor5/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/lib/ckeditor5/index.html @@ -104,7 +104,6 @@ For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/index.html index 27d7362..1f79132 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/index.html @@ -10,48 +10,7 @@
-
-
-
版本信息
-
- - - - - - - - - - - - - - - - - - - - - - - -
当前版本 - - 检查更新 -
基于框架 - -
主要特色单页面 / 响应式 / 清爽 / 极简
获取渠道 -
- 获取授权 - GitHub下载 - Gitee下载 -
-
-
-
-
- -
-
-
- 订单统计 -
-
-
-
-
-
-
-
- -
-
-
- 会员统计 -
-
-
-
-
-
-
-
+ +
@@ -213,25 +102,25 @@
-
关于版权
-
- -
- 允许个人学习研究使用，支持二次开发。
- 允许商业用途，但仅限自运营，如果商用必须保留版权信息，望自觉遵守。
- 不允许对程序代码以任何形式、任何目的的再发行或出售，否则将追究侵权者法律责任。
- 软件受国家计算机软件著作权保护（登记号：2020SR1224749）。
- 我们的团队水平有限，也是在探索中学习、改进。开源，是为了让认可我们的用户能自由的使用、学习软件的内部架构，让更多的人有机会阅读并发现Bug、对软件项目提出改进意见。 -
-

© 2021 coreshop.cn 版权所有

-
\ No newline at end of file