From 926774478bbab4b0ecf6a92b0889bd497be425bc Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 25 三月 2024 16:30:16 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop
---
CoreCms.Net.Web.WebApi/Controllers/GoodController.cs | 64 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 12 deletions(-)
diff --git a/CoreCms.Net.Web.WebApi/Controllers/GoodController.cs b/CoreCms.Net.Web.WebApi/Controllers/GoodController.cs
index 5eef183..39a360f 100644
--- a/CoreCms.Net.Web.WebApi/Controllers/GoodController.cs
+++ b/CoreCms.Net.Web.WebApi/Controllers/GoodController.cs
@@ -1,10 +1,9 @@
-锘�/***********************************************************************
- * Project: CoreCms
- * ProjectName: 鏍稿績鍐呭绠＄悊绯荤粺
- * Web: https://www.corecms.net
- * Author: 澶х伆鐏�
- * Email: jianweie@163.com
- * CreateTime: 2021/1/31 21:45:10
+锘�/***********************************************************************
+ * ProjectName: 鐧惧垎鍏垫硶绠＄悊绯荤粺
+ * Web: http://chuanyin.com
+ * Author:
+ * Email:
+ * CreateTime: 202403/02
* Description: 鏆傛棤
***********************************************************************/
@@ -25,6 +24,7 @@
using CoreCms.Net.Model.FromBody;
using CoreCms.Net.Model.ViewModels.DTO;
using CoreCms.Net.Model.ViewModels.UI;
+using CoreCms.Net.Services.Basic;
using CoreCms.Net.Utility.Extensions;
using CoreCms.Net.Utility.Helper;
using Microsoft.AspNetCore.Authorization;
@@ -33,6 +33,8 @@
using Newtonsoft.Json;
using NPOI.SS.Formula.Functions;
using SqlSugar;
+using static SKIT.FlurlHttpClient.Wechat.Api.Models.ChannelsECMerchantAddFreightTemplateRequest.Types.FreightTemplate.Types;
+using static SKIT.FlurlHttpClient.Wechat.Api.Models.ComponentTCBBatchCreateContainerServiceVersionRequest.Types;
namespace CoreCms.Net.Web.WebApi.Controllers
{
@@ -60,6 +62,7 @@
private ICoreCmsAgentProductsServices _agentProductsServices;
private ICoreCmsAgentGradeServices _agentGradeServices;
private ICoreCmsGoodsCategoryExtendServices _goodsCategoryExtendServices;
+ private readonly ICoreCmsAreaServices _coreCmsAreaServices;
/// <summary>
/// 鏋勯�犲嚱鏁�
@@ -76,7 +79,13 @@
, ICoreCmsGoodsParamsServices goodsParamsServices
, ICoreCmsGoodsCollectionServices goodsCollectionServices
, ICoreCmsUserServices userServices
- , ICoreCmsAgentServices agentServices, ICoreCmsAgentProductsServices agentProductsServices, ICoreCmsAgentGradeServices agentGradeServices, ICoreCmsGoodsCategoryExtendServices goodsCategoryExtendServices)
+ , ICoreCmsAgentServices agentServices,
+ ICoreCmsAgentProductsServices agentProductsServices,
+ ICoreCmsAgentGradeServices agentGradeServices,
+ ICoreCmsGoodsCategoryExtendServices goodsCategoryExtendServices,
+ ICoreCmsAreaServices areaServices
+
+ )
{
_mapper = mapper;
_user = user;
@@ -94,6 +103,7 @@
_agentProductsServices = agentProductsServices;
_agentGradeServices = agentGradeServices;
_goodsCategoryExtendServices = goodsCategoryExtendServices;
+ _coreCmsAreaServices = areaServices;
}
//鍏叡鎺ュ彛====================================================================================================
@@ -133,7 +143,7 @@
parentTree.imageUrl = !string.IsNullOrEmpty(item.imageUrl) ? item.imageUrl : "/static/images/common/empty.png";
parentTree.name = item.name;
parentTree.sort = item.sort;
-
+ parentTree.key=item.key;
childTree.Add(parentTree);
parentTree.child = GetCategories(oldCategories, item.id);
@@ -167,6 +177,8 @@
brandId = "",
labelId = "",
searchName = "",
+ areaCode=""
+
});
if (!string.IsNullOrWhiteSpace(obj.priceFrom))
@@ -241,13 +253,28 @@
{
where = where.And(p => p.name.Contains(obj.searchName));
}
+ if (!string.IsNullOrWhiteSpace(obj.areaCode))
+ {
+ where = where.And(p => p.areaCode.Contains(obj.areaCode));
+ }
}
+
//鑾峰彇鏁版嵁
var list = await _goodsServices.QueryPageByDTOAsync(where, entity.page, entity.limit, true);
//鑾峰彇鍝佺墝
var brands = await _brandServices.QueryListByClauseAsync(p => p.isShow == true, p => p.sort, OrderByType.Desc, true, true);
-
+ foreach (var item in list)
+ {
+ var codelist = item.areaCode?.Split(",");
+ item.area = "";
+ if(codelist!=null)
+ foreach (var code in codelist)
+ {
+
+ item.area+= (await _coreCmsAreaServices.GetAreaString(code)+"");
+ }
+ }
//杩斿洖鏁版嵁
jm.status = true;
jm.data = new
@@ -278,13 +305,19 @@
{
var jm = new WebApiCallBack();
- var model = await _goodsServices.GetGoodsDetail(entity.id, 0, false, "goods", 0, entity.data.ObjectToBool());
+ CoreCmsGoods model = await _goodsServices.GetGoodsDetail(entity.id, 0, false, "goods", 0, entity.data.ObjectToBool());
if (model == null)
{
jm.msg = "鍟嗗搧鑾峰彇澶辫触";
return jm;
}
-
+ var codelist= model.areaCode.Split(",");
+ model.area = "";
+ foreach (var item in codelist)
+ {
+
+ model.area += (await _coreCmsAreaServices.GetAreaString(item) + "");
+ }
jm.status = true;
jm.msg = "鑾峰彇鍟嗗搧璇︽儏鎴愬姛";
jm.data = model;
@@ -580,7 +613,14 @@
jm.msg = "鍟嗗搧鑾峰彇澶辫触";
return jm;
}
+ var codelist = model.areaCode?.Split(",");
+ model.area = "";
+ if(codelist!=null)
+ foreach (var item in codelist)
+ {
+ model.area += (await _coreCmsAreaServices.GetAreaString(item) + "");
+ }
var userAgent = await _agentServices.QueryByClauseAsync(p => p.userId == user.id);
var agentProducts = new List<CoreCmsAgentProducts>();
var userAgentGrade = new CoreCmsAgentGrade();
--
Gitblit v1.9.1