From 9173f6e5b34a12c01804676d76842031e9ec6724 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 26 六月 2024 11:52:16 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop
---
CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsProductsController.cs | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsProductsController.cs b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsProductsController.cs
index 7498747..c88b9b7 100644
--- a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsProductsController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsProductsController.cs
@@ -30,6 +30,7 @@
using Microsoft.AspNetCore.Mvc;
using NPOI.HSSF.UserModel;
using SqlSugar;
+using CoreCms.Net.Services;
namespace CoreCms.Net.Web.Admin.Controllers
{
@@ -45,16 +46,19 @@
{
private readonly IWebHostEnvironment _webHostEnvironment;
private readonly ICoreCmsProductsServices _coreCmsProductsServices;
+ private readonly ICoreCmsGoodsCategoryServices _coreCmsGoodsCategoryServices;
/// <summary>
/// 鏋勯�犲嚱鏁�
///</summary>
public CoreCmsProductsController(IWebHostEnvironment webHostEnvironment
, ICoreCmsProductsServices coreCmsProductsServices
+ , ICoreCmsGoodsCategoryServices coreCmsGoodsCategoryServices
)
{
_webHostEnvironment = webHostEnvironment;
_coreCmsProductsServices = coreCmsProductsServices;
+ _coreCmsGoodsCategoryServices = coreCmsGoodsCategoryServices;
}
#region 鑾峰彇鍒楄〃============================================================
@@ -132,7 +136,12 @@
{
where = where.And(p => p.name.Contains(name));
}
-
+ //鍟嗗搧鍒嗙被 decimal
+ var Category = Request.Form["categoryId"].FirstOrDefault().ToInt32OrDefault();
+ if (Category > 0)
+ {
+ where = where.And(p => p.CategoryID == Category);
+ }
//鑾峰彇鏁版嵁
var list = await _coreCmsProductsServices.QueryDetailPageAsync(where, orderEx, orderBy, pageCurrent, pageSize, true);
//杩斿洖鏁版嵁
@@ -152,10 +161,13 @@
/// <returns></returns>
[HttpPost]
[Description("棣栭〉鏁版嵁")]
- public AdminUiCallBack GetIndex()
+ public async Task<AdminUiCallBack> GetIndexAsync()
{
//杩斿洖鏁版嵁
var jm = new AdminUiCallBack { code = 0 };
+ var categories = await _coreCmsGoodsCategoryServices.QueryListByClauseAsync(p => p.isShow, p => p.sort, OrderByType.Asc, true, true);
+ var categoriesTree = GoodsHelper.GetTree(categories, false);
+ jm.data= categoriesTree;
return jm;
}
#endregion
--
Gitblit v1.9.1