Skip to content

M
mall.oytour.com
Commit 9c2270e2 authored by liudong1993's avatar liudong1993
Browse files
Options

分销最高返佣

parent f88c9060
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 20 deletions
Mall.Module.Product/ProductModule.cs
View file @ 9c2270e2
...@@ -1346,14 +1346,14 @@ namespace Mall.Module.Product ...@@ -1346,14 +1346,14 @@ namespace Mall.Module.Product
if (disModel.GradeId == 0) if (disModel.GradeId == 0)
{ {
//拿分销基础配置 //拿分销基础配置
if ((BasicsModel?.IsCommissionResidue ?? 2) == 1) //if ((BasicsModel?.IsCommissionResidue ?? 2) == 1)
{ //{
model.MaxShare = (BasicsModel?.OneCommission ?? 0) + (BasicsModel?.TwoCommission ?? 0) + (BasicsModel?.ThreeCommission ?? 0); // model.MaxShare = (BasicsModel?.OneCommission ?? 0) + (BasicsModel?.TwoCommission ?? 0) + (BasicsModel?.ThreeCommission ?? 0);
} //}
else //else
{ //{
model.MaxShare = BasicsModel?.OneCommission ?? 0; model.MaxShare = BasicsModel?.OneCommission ?? 0;
} //}
if ((BasicsModel?.DistributorCommissionType ?? 2) == 1) if ((BasicsModel?.DistributorCommissionType ?? 2) == 1)
{ {
model.MaxShare = Math.Round(model.MaxShare * MaxSellMoney / 100, 2, MidpointRounding.AwayFromZero); model.MaxShare = Math.Round(model.MaxShare * MaxSellMoney / 100, 2, MidpointRounding.AwayFromZero);
...@@ -1365,14 +1365,14 @@ namespace Mall.Module.Product ...@@ -1365,14 +1365,14 @@ namespace Mall.Module.Product
var disgradeModel = distributor_GradeRepository.GetEntity(disModel.GradeId); var disgradeModel = distributor_GradeRepository.GetEntity(disModel.GradeId);
if (disgradeModel != null) if (disgradeModel != null)
{ {
if ((BasicsModel?.IsCommissionResidue ?? 2) == 1) //if ((BasicsModel?.IsCommissionResidue ?? 2) == 1)
{ //{
model.MaxShare = (disgradeModel?.OneCommission ?? 0) + (disgradeModel?.TwoCommission ?? 0) + (disgradeModel?.ThreeCommission ?? 0); // model.MaxShare = (disgradeModel?.OneCommission ?? 0) + (disgradeModel?.TwoCommission ?? 0) + (disgradeModel?.ThreeCommission ?? 0);
} //}
else //else
{ //{
model.MaxShare = disgradeModel?.OneCommission ?? 0; model.MaxShare = disgradeModel?.OneCommission ?? 0;
} //}
if ((disgradeModel?.DistributionCommissionType ?? 2) == 1) if ((disgradeModel?.DistributionCommissionType ?? 2) == 1)
{ {
model.MaxShare = Math.Round(model.MaxShare * MaxSellMoney / 100, 2, MidpointRounding.AwayFromZero); model.MaxShare = Math.Round(model.MaxShare * MaxSellMoney / 100, 2, MidpointRounding.AwayFromZero);
...@@ -3218,8 +3218,25 @@ namespace Mall.Module.Product ...@@ -3218,8 +3218,25 @@ namespace Mall.Module.Product
if (!string.IsNullOrEmpty(demodel.CategoryIds) && !demodel.CategoryIds.Contains(',')) if (!string.IsNullOrEmpty(demodel.CategoryIds) && !demodel.CategoryIds.Contains(','))
{ {
//获取该分类下所有子集分类 //获取该分类下所有子集分类
var cmodel = goods_CategoryRepository.GetEntity(demodel.CategoryIds); var cmodel = product_CategoryRepository.GetEntity(demodel.CategoryIds);
//goods_CategoryRepository.GetList(new RB_Goods_Category_Extend() { TenantId }); if (cmodel != null)
{
List<int> AllClist = new List<int>();
AllClist.Add(cmodel.Id);
var clist = product_CategoryRepository.GetList(new RB_Product_Category_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, RootId = cmodel.RootId });
var OneList = clist.Where(x => x.ParentId == cmodel.Id).ToList();
foreach (var item in OneList)
{
AllClist.Add(item.Id);
var TwoList = clist.Where(x => x.ParentId == item.Id).ToList();
if (TwoList.Any()) {
AllClist.AddRange(TwoList.Select(x => x.Id).Distinct().ToList());
}
}
if (AllClist.Any()) {
demodel.CategoryIds = string.Join(",", AllClist);
}
}
} }
var list = goodsRepository.GetPageList(pageIndex, pageSize, out count, demodel); var list = goodsRepository.GetPageList(pageIndex, pageSize, out count, demodel);
if (list.Any()) if (list.Any())
......
Mall.WebApi/Controllers/Mall/MallHelper.cs
View file @ 9c2270e2
...@@ -195,7 +195,7 @@ namespace Mall.WebApi.Controllers ...@@ -195,7 +195,7 @@ namespace Mall.WebApi.Controllers
else else
{ {
childItem.goodsList = new List<GoodsDetailsItem2>(); childItem.goodsList = new List<GoodsDetailsItem2>();
var catGoodsList = productModule.GetProductGoodsPageList(1, childItem.goodsNum, out long rowsCount, new Model.Extend.Product.RB_Goods_Extend() var catGoodsList = productModule.GetProductGoodsPageList_V2(1, childItem.goodsNum, out long rowsCount, new Model.Extend.Product.RB_Goods_Extend()
{ {
TenantId = TenantId, TenantId = TenantId,
MallBaseId = MallBaseId, MallBaseId = MallBaseId,
...@@ -227,7 +227,7 @@ namespace Mall.WebApi.Controllers ...@@ -227,7 +227,7 @@ namespace Mall.WebApi.Controllers
if (goodsData.addGoodsType == 0) if (goodsData.addGoodsType == 0)
{ {
goodsData.list = new List<GoodsDetailsItem2>(); goodsData.list = new List<GoodsDetailsItem2>();
var goodsList = productModule.GetProductGoodsPageList(1, goodsData.goodsLength, out long rowsCount, new Model.Extend.Product.RB_Goods_Extend() var goodsList = productModule.GetProductGoodsPageList_V2(1, goodsData.goodsLength, out long rowsCount, new Model.Extend.Product.RB_Goods_Extend()
{ {
TenantId = TenantId, TenantId = TenantId,
MallBaseId = MallBaseId, MallBaseId = MallBaseId,
...@@ -742,7 +742,7 @@ namespace Mall.WebApi.Controllers ...@@ -742,7 +742,7 @@ namespace Mall.WebApi.Controllers
}; };
if (subitem.relation_id == 0) if (subitem.relation_id == 0)
{ {
var goodsList = productModule.GetProductGoodsPageList(1, 6, out long rowsCount, new Model.Extend.Product.RB_Goods_Extend() var goodsList = productModule.GetProductGoodsPageList_V2(1, 6, out long rowsCount, new Model.Extend.Product.RB_Goods_Extend()
{ {
TenantId = Convert.ToInt32(miniProgram.TenantId), TenantId = Convert.ToInt32(miniProgram.TenantId),
MallBaseId = miniProgram.MallBaseId, MallBaseId = miniProgram.MallBaseId,
...@@ -765,7 +765,7 @@ namespace Mall.WebApi.Controllers ...@@ -765,7 +765,7 @@ namespace Mall.WebApi.Controllers
} }
else else
{ {
var goodsList = productModule.GetProductGoodsPageList(1, 6, out long rowsCount, new Model.Extend.Product.RB_Goods_Extend() var goodsList = productModule.GetProductGoodsPageList_V2(1, 6, out long rowsCount, new Model.Extend.Product.RB_Goods_Extend()
{ {
TenantId = Convert.ToInt32(miniProgram.TenantId), TenantId = Convert.ToInt32(miniProgram.TenantId),
MallBaseId = miniProgram.MallBaseId, MallBaseId = miniProgram.MallBaseId,
......
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