Skip to content

M
mall.oytour.com
Commit 321b7962 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent fd9cd272
Hide whitespace changes
Inline Side-by-side
Showing with 176 additions and 53 deletions
Mall.Common/Config.cs
View file @ 321b7962
......@@ -37,10 +37,9 @@ namespace Mall.Common
public readonly static IConfiguration Configuration;
static Config()
{
Configuration = new ConfigurationBuilder()
.SetBasePath(Directory.GetCurrentDirectory())
.AddJsonFile("appsettings.json", optional: true)
.Build();
Configuration= new ConfigurationBuilder()
.Add(new JsonConfigurationSource { Path = "appsettings.json", ReloadOnChange = true })
.Build();
}
/// <summary>
......
Mall.Model/Extend/Product/RB_GroupBuy_Distributioncommission_Extend.cs
View file @ 321b7962
......@@ -17,5 +17,15 @@ namespace Mall.Model.Extend.Product
/// 商品编号
/// </summary>
public string GoodIds { get; set; }
/// <summary>
/// 等级列表
/// </summary>
public List<RB_GroupBuy_Distributioncommission_Extend> GradeCommissionList { get; set; }
/// <summary>
/// 规格值列表
/// </summary>
public object AttrList { get; set; }
}
}
Mall.Module.Product/GroupBuyActivityModule.cs
View file @ 321b7962
......@@ -158,7 +158,7 @@ namespace Mall.Module.Product
{
foreach (var item in groupStepList)
{
item.StepPriceList = StepPriceList?.Where(qitem => qitem.GoodId==item.GoodId && qitem.StepId == item.StepId)?.ToList() ?? new List<RB_Groupbuy_Activity_Step_Price_Extend>();
item.StepPriceList = StepPriceList?.Where(qitem => qitem.GoodId == item.GoodId && qitem.StepId == item.StepId)?.ToList() ?? new List<RB_Groupbuy_Activity_Step_Price_Extend>();
}
}
foreach (var item in list)
......@@ -210,6 +210,7 @@ namespace Mall.Module.Product
item.SpecificationValueList = specificationvalueList?.Where(qitem => qitem.SpecificationId == item.Id)?.ToList() ?? new List<RB_Groupbuy_Activity_Specificationvalue_Extend>();
}
}
//规格价格列表
List<RB_Groupbuy_Activity_Specificationprice_Extend> specPriceList = GetGroupbuyActivitySpecificationpriceListModule(new RB_Groupbuy_Activity_Specificationprice_Extend()
{
MallBaseId = query.MallBaseId,
......@@ -223,23 +224,7 @@ namespace Mall.Module.Product
int SortNum = 1;
if (!string.IsNullOrEmpty(item.SpecificationSort))
{
var ssarr = item.SpecificationSort.Split(':');
int Sort = Convert.ToInt32(ssarr[0]);
string pic_url = specificationList[0].SpecificationValueList.Where(x => x.Sort == Sort).FirstOrDefault()?.ImagePath;
List<object> AttrList = new List<object>();
for (int i = 0; i < ssarr.Length; i++)
{
var smodel = specificationList[i];
var svmodel = smodel.SpecificationValueList.Where(x => x.Sort == Convert.ToInt32(ssarr[i])).FirstOrDefault();
AttrList.Add(new
{
SName = smodel.Name,
SId = smodel.Id,
SVId = svmodel.Sort,
SVName = svmodel.Name
});
}
item.AttrList = AttrList;
item.AttrList = GetGroupBuyGoodsAttr(item.SpecificationSort, specificationList); ;
}
item.SortNum = SortNum;
SortNum++;
......@@ -256,9 +241,17 @@ namespace Mall.Module.Product
//拼团阶梯价格设置列表
List<RB_Groupbuy_Activity_Step_Price_Extend> StepPriceList = GetGroupbuyActivitySpecificationpriceListModule(new RB_Groupbuy_Activity_Step_Price_Extend()
{
MallBaseId=query.MallBaseId,
TenantId=query.TenantId,
GoodId=extModel.GoodId,
MallBaseId = query.MallBaseId,
TenantId = query.TenantId,
GoodId = extModel.GoodId,
});
//分销佣金列表
List<RB_GroupBuy_Distributioncommission_Extend> commissionList = GetGroupBuyCommissionRepository(new RB_GroupBuy_Distributioncommission_Extend()
{
MallBaseId = query.MallBaseId,
TenantId = query.TenantId,
GoodsId = extModel.GoodId,
});
if (groupStepList != null && groupStepList.Count > 0)
......@@ -271,27 +264,40 @@ namespace Mall.Module.Product
int SortNum = 1;
if (!string.IsNullOrEmpty(subItem.SpecificationSort))
{
var ssarr = subItem.SpecificationSort.Split(':');
int Sort = Convert.ToInt32(ssarr[0]);
string pic_url = specificationList[0].SpecificationValueList.Where(x => x.Sort == Sort).FirstOrDefault()?.ImagePath;
List<object> AttrList = new List<object>();
for (int i = 0; i < ssarr.Length; i++)
{
var smodel = specificationList[i];
var svmodel = smodel.SpecificationValueList.Where(x => x.Sort == Convert.ToInt32(ssarr[i])).FirstOrDefault();
AttrList.Add(new
{
SName = smodel.Name,
SId = smodel.Id,
SVId = svmodel.Sort,
SVName = svmodel.Name
});
}
subItem.AttrList = AttrList;
subItem.AttrList = GetGroupBuyGoodsAttr(subItem.SpecificationSort, specificationList);
}
subItem.SortNum = SortNum;
SortNum++;
}
//分销普通类型
if (extModel.SeparateDistributionType == 1)
{
item.DistributioncommissionList = commissionList?.Where(qitem => qitem.StepId == item.StepId)?.ToList() ?? new List<RB_GroupBuy_Distributioncommission_Extend>();
}
//分销详细设置
else if (extModel.SeparateDistributionType == 2)
{
item.DistributionCommissionTreeList = new List<RB_GroupBuy_Distributioncommission_Extend>();
var gradeList = commissionList.Where(qitem => qitem.StepId == item.StepId).GroupBy(qitem => new { qitem.SpecificationSort, qitem.StepId }).ToList();
foreach (var subItem in gradeList)
{
var tempModel = commissionList.Where(qitem => qitem.StepId == subItem.Key.StepId && qitem.SpecificationSort == subItem.Key.SpecificationSort).FirstOrDefault();
item.DistributionCommissionTreeList.Add(new RB_GroupBuy_Distributioncommission_Extend()
{
SpecificationSort = tempModel.SpecificationSort,
GradeCommissionList =
commissionList.Where(qitem => qitem.StepId == subItem.Key.StepId && qitem.SpecificationSort == subItem.Key.SpecificationSort)
.OrderBy(qitem => qitem.DistributorGrade).ToList()
});
}
foreach (var subItem in item.DistributionCommissionTreeList)
{
if (!string.IsNullOrWhiteSpace(subItem.SpecificationSort))
{
subItem.AttrList = GetGroupBuyGoodsAttr(subItem.SpecificationSort, specificationList);
}
}
}
}
}
extModel.SpecificationList = specificationList;
......@@ -301,6 +307,36 @@ namespace Mall.Module.Product
return extModel;
}
/// <summary>
/// 获取拼团商品的商品规格属性
/// </summary>
/// <param name="SpecificationSort">商品规格</param>
/// <param name="specificationList">规格值</param>
/// <returns></returns>
public List<object> GetGroupBuyGoodsAttr(string SpecificationSort, List<RB_Groupbuy_Activity_Specification_Extend> specificationList)
{
List<object> AttrList = new List<object>();
if (!string.IsNullOrEmpty(SpecificationSort))
{
var ssarr = SpecificationSort.Split(':');
int Sort = Convert.ToInt32(ssarr[0]);
string pic_url = specificationList[0].SpecificationValueList.Where(x => x.Sort == Sort).FirstOrDefault()?.ImagePath;
for (int i = 0; i < ssarr.Length; i++)
{
var smodel = specificationList[i];
var svmodel = smodel.SpecificationValueList.Where(x => x.Sort == Convert.ToInt32(ssarr[i])).FirstOrDefault();
AttrList.Add(new
{
SName = smodel.Name,
SId = smodel.Id,
SVId = svmodel.Sort,
SVName = svmodel.Name
});
}
}
return AttrList;
}
/// <summary>
/// 新增修改拼团活动
/// </summary>
......@@ -390,7 +426,7 @@ namespace Mall.Module.Product
specItem.CreateDate = DateTime.Now;
if (specItem.Id > 0)
{
flag= groupbuy_Activity_SpecificationRepository.Update(specItem);
flag = groupbuy_Activity_SpecificationRepository.Update(specItem);
}
else
{
......@@ -410,7 +446,7 @@ namespace Mall.Module.Product
specValueItem.Status = 0;
if (specValueItem.Id > 0)
{
flag= groupbuy_Activity_SpecificationValueRepository.Update(specValueItem);
flag = groupbuy_Activity_SpecificationValueRepository.Update(specValueItem);
}
else
{
......@@ -431,11 +467,11 @@ namespace Mall.Module.Product
priceItem.UpdateDate = DateTime.Now;
if (priceItem.Id > 0)
{
flag= groupbuy_Activity_SpecificationPriceRepository.Update(priceItem);
flag = groupbuy_Activity_SpecificationPriceRepository.Update(priceItem);
}
else
else
{
flag = groupbuy_Activity_SpecificationPriceRepository.Insert(priceItem)>0;
flag = groupbuy_Activity_SpecificationPriceRepository.Insert(priceItem) > 0;
}
}
}
......@@ -484,15 +520,93 @@ namespace Mall.Module.Product
}
else
{
flag = groupbuy_Activity_Step_PriceRepository.Insert(subItem)>0;
flag = groupbuy_Activity_Step_PriceRepository.Insert(subItem) > 0;
}
}
}
//普通设置
if (extModel.SeparateDistributionType == 1)
{
//分销商分销佣金设置
if (groupItem.DistributioncommissionList != null && groupItem.DistributioncommissionList.Count > 0)
{
foreach (var subItem in groupItem.DistributioncommissionList)
{
subItem.GoodsId = extModel.GoodId;
subItem.Status = 0;
subItem.TenantId = extModel.TenantId;
subItem.MallBaseId = extModel.MallBaseId;
subItem.StepId = groupItem.StepId;
if (subItem.Id > 0)
{
subItem.UpdateDate = DateTime.Now;
flag = groupBuy_DistributioncommissionRepository.Update(subItem);
}
else
{
subItem.CreateDate = DateTime.Now;
subItem.UpdateDate = DateTime.Now;
var newDistriId = groupBuy_DistributioncommissionRepository.Insert(subItem);
subItem.Id = newDistriId;
flag = newDistriId > 0;
}
}
}
} //详细设置
else if (extModel.SeparateDistributionType == 2)
{
if (groupItem.DistributionCommissionTreeList != null && groupItem.DistributionCommissionTreeList.Count > 0)
{
foreach (var subItem in groupItem.DistributionCommissionTreeList)
{
if (subItem.GradeCommissionList != null && subItem.GradeCommissionList.Count > 0)
{
foreach (var childItem in subItem.GradeCommissionList)
{
childItem.SpecificationSort = subItem.SpecificationSort;
childItem.GoodsId = extModel.GoodId;
childItem.Status = 0;
childItem.TenantId = extModel.TenantId;
childItem.MallBaseId = extModel.MallBaseId;
childItem.StepId = groupItem.StepId;
if (childItem.Id > 0)
{
childItem.UpdateDate = DateTime.Now;
flag = groupBuy_DistributioncommissionRepository.Update(childItem);
}
else
{
childItem.CreateDate = DateTime.Now;
childItem.UpdateDate = DateTime.Now;
var newDistriId = groupBuy_DistributioncommissionRepository.Insert(childItem);
childItem.Id = newDistriId;
flag = newDistriId > 0;
}
}
}
}
}
}
//分销商分销佣金设置
if (groupItem.DistributioncommissionList != null && groupItem.DistributioncommissionList.Count > 0)
{
//会员价设置
if (groupItem.MemberpriceList != null && groupItem.MemberpriceList.Count > 0)
{
foreach (var subItem in groupItem.MemberpriceList)
{
subItem.StepId = groupItem.StepId;
if (subItem.Id > 0)
{
flag = groupbuy_MemberpriceRepository.Update(subItem);
}
else
{
var newMemberId = groupbuy_MemberpriceRepository.Insert(subItem);
subItem.Id = newMemberId;
flag = newMemberId > 0;
}
}
}
}
}
......@@ -513,7 +627,7 @@ namespace Mall.Module.Product
// new WhereHelper(nameof(RB_Groupbuy_Activity_Specificationprice_Extend.SpecificationId),Id)
//};
//groupbuy_Activity_SpecificationPriceRepository.Delete(specValues);
return groupbuy_Activity_SpecificationPriceRepository.Delete(Id)>0;
return groupbuy_Activity_SpecificationPriceRepository.Delete(Id) > 0;
}
/// <summary>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment