Skip to content

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

Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

parents c4c0718f cc256e6f
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 11 deletions
Mall.Model/Entity/Product/RB_Goods.cs
View file @ b14bd414
......@@ -411,5 +411,11 @@ namespace Mall.Model.Entity.Product
/// 采购状态 1正常 2代理下架
/// </summary>
public int? ProcurementStatus { get; set; }
/// <summary>
/// 返佣总金额
/// </summary>
public decimal Commission { get; set; }
}
}
Mall.Model/Entity/Product/RB_Goods_SpecificationPrice.cs
View file @ b14bd414
......@@ -47,6 +47,23 @@ namespace Mall.Model.Entity.Product
set;
}
/// <summary>
/// 返佣总金额
/// </summary>
public decimal Commission
{
get;
set;
}
/// <summary>
/// 成本价
/// </summary>
public decimal CostMoney
{
get;
set;
}
/// <summary>
/// 库存
/// </summary>
public int? InventoryNum
......
Mall.Module.Product/ProductModule.cs
View file @ b14bd414
......@@ -1718,7 +1718,8 @@ namespace Mall.Module.Product
IsAllowShare = 2;
}
if ((model.IsCustomSpecification ?? 2) != 1) {
if ((model.IsCustomSpecification ?? 2) != 1)
{
var VauleL = new List<RB_Goods_SpecificationValue_Extend>
{
new RB_Goods_SpecificationValue_Extend()
......@@ -3572,6 +3573,7 @@ namespace Mall.Module.Product
{ nameof(RB_Goods.ProxyType),demodel.ProxyType},
{ nameof(RB_Goods.ProxyRises),demodel.ProxyRises},
{ nameof(RB_Goods.ProxyMoney),demodel.ProxyMoney},
{ nameof(RB_Goods.Commission),demodel.Commission},
};
if (goodsModel.IsProcurement == 1)
{
......@@ -3718,7 +3720,9 @@ namespace Mall.Module.Product
SpecificationSort = item.SpecificationSort,
Status = 0,
TenantId = demodel.TenantId,
UpdateDate = demodel.UpdateDate
UpdateDate = demodel.UpdateDate,
Commission = item.Commission,
CostMoney = item.CostMoney
}, trans);
}
}
......@@ -3807,7 +3811,9 @@ namespace Mall.Module.Product
SpecificationSort = item.SpecificationSort,
Status = 0,
TenantId = demodel.TenantId,
UpdateDate = demodel.UpdateDate
UpdateDate = demodel.UpdateDate,
Commission = item.Commission,
CostMoney = item.CostMoney
}, trans);
}
}
......@@ -3822,7 +3828,9 @@ namespace Mall.Module.Product
{ nameof(RB_Goods_SpecificationPrice.SellingPrice),pupmodel.SellingPrice},
{ nameof(RB_Goods_SpecificationPrice.InventoryNum),pupmodel.InventoryNum},
{ nameof(RB_Goods_SpecificationPrice.GoodsWeight),pupmodel.GoodsWeight},
{ nameof(RB_Goods_SpecificationPrice.GoodsNumbers),pupmodel.GoodsNumbers}
{ nameof(RB_Goods_SpecificationPrice.GoodsNumbers),pupmodel.GoodsNumbers},
{ nameof(RB_Goods_SpecificationPrice.Commission),pupmodel.Commission},
{ nameof(RB_Goods_SpecificationPrice.CostMoney),pupmodel.CostMoney},
};
List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){
......@@ -3860,7 +3868,9 @@ namespace Mall.Module.Product
SpecificationSort = item.SpecificationSort,
Status = 0,
TenantId = demodel.TenantId,
UpdateDate = demodel.UpdateDate
UpdateDate = demodel.UpdateDate,
Commission = item.Commission,
CostMoney = item.CostMoney
}, trans);
}
}
......@@ -3875,7 +3885,9 @@ namespace Mall.Module.Product
{ nameof(RB_Goods_SpecificationPrice.SellingPrice),pupmodel.SellingPrice},
{ nameof(RB_Goods_SpecificationPrice.InventoryNum),pupmodel.InventoryNum},
{ nameof(RB_Goods_SpecificationPrice.GoodsWeight),pupmodel.GoodsWeight},
{ nameof(RB_Goods_SpecificationPrice.GoodsNumbers),pupmodel.GoodsNumbers}
{ nameof(RB_Goods_SpecificationPrice.GoodsNumbers),pupmodel.GoodsNumbers},
{ nameof(RB_Goods_SpecificationPrice.Commission),pupmodel.Commission},
{ nameof(RB_Goods_SpecificationPrice.CostMoney),pupmodel.CostMoney},
};
List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){
......@@ -4174,7 +4186,9 @@ namespace Mall.Module.Product
SpecificationSort = item.SpecificationSort,
Status = 0,
TenantId = demodel.TenantId,
UpdateDate = demodel.UpdateDate
UpdateDate = demodel.UpdateDate,
Commission = item.Commission,
CostMoney = item.CostMoney
}, trans);
}
}
......@@ -4627,7 +4641,7 @@ namespace Mall.Module.Product
{ nameof(RB_Goods.IsQuickBuy),model.IsQuickBuy==1?2:1}
};
}
else
{
return false;
......@@ -4672,7 +4686,7 @@ namespace Mall.Module.Product
/// <param name="tenantId"></param>
/// <param name="mallBaseId"></param>
/// <returns></returns>
public bool SetProductGoodsQuickUpdate(string goodsIds, int type, int sort, string goodsName, int freightId, int limitBuyGoodsNum, int limitBuyOrderNum, int integralPresent, int integralPresentType, decimal pointsDeduction, int pointsDeductionType, int isMultipleDeduction, int isQuickBuy, int isGoodsNegotiable,int SupplierId, int tenantId, int mallBaseId)
public bool SetProductGoodsQuickUpdate(string goodsIds, int type, int sort, string goodsName, int freightId, int limitBuyGoodsNum, int limitBuyOrderNum, int integralPresent, int integralPresentType, decimal pointsDeduction, int pointsDeductionType, int isMultipleDeduction, int isQuickBuy, int isGoodsNegotiable, int SupplierId, int tenantId, int mallBaseId)
{
Dictionary<string, object> keyValues;
if (type == 1)
......@@ -5706,6 +5720,6 @@ namespace Mall.Module.Product
#endregion
}
}
Mall.WebApi/Controllers/Product/ProductController.cs
View file @ b14bd414
......@@ -1449,6 +1449,7 @@ namespace Mall.WebApi.Controllers.MallBase
model.ProxyRises,
model.ProxyMoney,
model.IsProcurement,
model.Commission,
CategoryList = model.CategoryList.Select(x => new
{
x.Id,
......@@ -1478,7 +1479,9 @@ namespace Mall.WebApi.Controllers.MallBase
x.InventoryNum,
x.SellingPrice,
x.SpecificationSort,
x.AttrList
x.AttrList,
x.Commission,
x.CostMoney
}),
AreaList = model.AreaList.Select(x => new
{
......
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