Skip to content

M
mall.oytour.com
Commit cc256e6f authored by 吴春's avatar 吴春
Browse files
Options

提交

parent 9b472457
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 11 deletions
Mall.Model/Entity/Product/RB_Goods.cs
View file @ cc256e6f
...@@ -411,5 +411,11 @@ namespace Mall.Model.Entity.Product ...@@ -411,5 +411,11 @@ namespace Mall.Model.Entity.Product
/// 采购状态 1正常 2代理下架 /// 采购状态 1正常 2代理下架
/// </summary> /// </summary>
public int? ProcurementStatus { get; set; } public int? ProcurementStatus { get; set; }
/// <summary>
/// 返佣总金额
/// </summary>
public decimal Commission { get; set; }
} }
} }
Mall.Model/Entity/Product/RB_Goods_SpecificationPrice.cs
View file @ cc256e6f
...@@ -47,6 +47,23 @@ namespace Mall.Model.Entity.Product ...@@ -47,6 +47,23 @@ namespace Mall.Model.Entity.Product
set; set;
} }
/// <summary> /// <summary>
/// 返佣总金额
/// </summary>
public decimal Commission
{
get;
set;
}
/// <summary>
/// 成本价
/// </summary>
public decimal CostMoney
{
get;
set;
}
/// <summary>
/// 库存 /// 库存
/// </summary> /// </summary>
public int? InventoryNum public int? InventoryNum
......
Mall.Module.Product/ProductModule.cs
View file @ cc256e6f
...@@ -1662,7 +1662,8 @@ namespace Mall.Module.Product ...@@ -1662,7 +1662,8 @@ namespace Mall.Module.Product
IsAllowShare = 2; IsAllowShare = 2;
} }
if ((model.IsCustomSpecification ?? 2) != 1) { if ((model.IsCustomSpecification ?? 2) != 1)
{
var VauleL = new List<RB_Goods_SpecificationValue_Extend> var VauleL = new List<RB_Goods_SpecificationValue_Extend>
{ {
new RB_Goods_SpecificationValue_Extend() new RB_Goods_SpecificationValue_Extend()
...@@ -3516,6 +3517,7 @@ namespace Mall.Module.Product ...@@ -3516,6 +3517,7 @@ namespace Mall.Module.Product
{ nameof(RB_Goods.ProxyType),demodel.ProxyType}, { nameof(RB_Goods.ProxyType),demodel.ProxyType},
{ nameof(RB_Goods.ProxyRises),demodel.ProxyRises}, { nameof(RB_Goods.ProxyRises),demodel.ProxyRises},
{ nameof(RB_Goods.ProxyMoney),demodel.ProxyMoney}, { nameof(RB_Goods.ProxyMoney),demodel.ProxyMoney},
{ nameof(RB_Goods.Commission),demodel.Commission},
}; };
if (goodsModel.IsProcurement == 1) if (goodsModel.IsProcurement == 1)
{ {
...@@ -3662,7 +3664,9 @@ namespace Mall.Module.Product ...@@ -3662,7 +3664,9 @@ namespace Mall.Module.Product
SpecificationSort = item.SpecificationSort, SpecificationSort = item.SpecificationSort,
Status = 0, Status = 0,
TenantId = demodel.TenantId, TenantId = demodel.TenantId,
UpdateDate = demodel.UpdateDate UpdateDate = demodel.UpdateDate,
Commission = item.Commission,
CostMoney = item.CostMoney
}, trans); }, trans);
} }
} }
...@@ -3751,7 +3755,9 @@ namespace Mall.Module.Product ...@@ -3751,7 +3755,9 @@ namespace Mall.Module.Product
SpecificationSort = item.SpecificationSort, SpecificationSort = item.SpecificationSort,
Status = 0, Status = 0,
TenantId = demodel.TenantId, TenantId = demodel.TenantId,
UpdateDate = demodel.UpdateDate UpdateDate = demodel.UpdateDate,
Commission = item.Commission,
CostMoney = item.CostMoney
}, trans); }, trans);
} }
} }
...@@ -3766,7 +3772,9 @@ namespace Mall.Module.Product ...@@ -3766,7 +3772,9 @@ namespace Mall.Module.Product
{ nameof(RB_Goods_SpecificationPrice.SellingPrice),pupmodel.SellingPrice}, { nameof(RB_Goods_SpecificationPrice.SellingPrice),pupmodel.SellingPrice},
{ nameof(RB_Goods_SpecificationPrice.InventoryNum),pupmodel.InventoryNum}, { nameof(RB_Goods_SpecificationPrice.InventoryNum),pupmodel.InventoryNum},
{ nameof(RB_Goods_SpecificationPrice.GoodsWeight),pupmodel.GoodsWeight}, { 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>() { List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){ new WhereHelper(){
...@@ -3804,7 +3812,9 @@ namespace Mall.Module.Product ...@@ -3804,7 +3812,9 @@ namespace Mall.Module.Product
SpecificationSort = item.SpecificationSort, SpecificationSort = item.SpecificationSort,
Status = 0, Status = 0,
TenantId = demodel.TenantId, TenantId = demodel.TenantId,
UpdateDate = demodel.UpdateDate UpdateDate = demodel.UpdateDate,
Commission = item.Commission,
CostMoney = item.CostMoney
}, trans); }, trans);
} }
} }
...@@ -3819,7 +3829,9 @@ namespace Mall.Module.Product ...@@ -3819,7 +3829,9 @@ namespace Mall.Module.Product
{ nameof(RB_Goods_SpecificationPrice.SellingPrice),pupmodel.SellingPrice}, { nameof(RB_Goods_SpecificationPrice.SellingPrice),pupmodel.SellingPrice},
{ nameof(RB_Goods_SpecificationPrice.InventoryNum),pupmodel.InventoryNum}, { nameof(RB_Goods_SpecificationPrice.InventoryNum),pupmodel.InventoryNum},
{ nameof(RB_Goods_SpecificationPrice.GoodsWeight),pupmodel.GoodsWeight}, { 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>() { List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){ new WhereHelper(){
...@@ -4118,7 +4130,9 @@ namespace Mall.Module.Product ...@@ -4118,7 +4130,9 @@ namespace Mall.Module.Product
SpecificationSort = item.SpecificationSort, SpecificationSort = item.SpecificationSort,
Status = 0, Status = 0,
TenantId = demodel.TenantId, TenantId = demodel.TenantId,
UpdateDate = demodel.UpdateDate UpdateDate = demodel.UpdateDate,
Commission = item.Commission,
CostMoney = item.CostMoney
}, trans); }, trans);
} }
} }
...@@ -4571,7 +4585,7 @@ namespace Mall.Module.Product ...@@ -4571,7 +4585,7 @@ namespace Mall.Module.Product
{ nameof(RB_Goods.IsQuickBuy),model.IsQuickBuy==1?2:1} { nameof(RB_Goods.IsQuickBuy),model.IsQuickBuy==1?2:1}
}; };
} }
else else
{ {
return false; return false;
...@@ -4616,7 +4630,7 @@ namespace Mall.Module.Product ...@@ -4616,7 +4630,7 @@ namespace Mall.Module.Product
/// <param name="tenantId"></param> /// <param name="tenantId"></param>
/// <param name="mallBaseId"></param> /// <param name="mallBaseId"></param>
/// <returns></returns> /// <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; Dictionary<string, object> keyValues;
if (type == 1) if (type == 1)
...@@ -5650,6 +5664,6 @@ namespace Mall.Module.Product ...@@ -5650,6 +5664,6 @@ namespace Mall.Module.Product
#endregion #endregion
} }
} }
Mall.WebApi/Controllers/Product/ProductController.cs
View file @ cc256e6f
...@@ -1449,6 +1449,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1449,6 +1449,7 @@ namespace Mall.WebApi.Controllers.MallBase
model.ProxyRises, model.ProxyRises,
model.ProxyMoney, model.ProxyMoney,
model.IsProcurement, model.IsProcurement,
model.Commission,
CategoryList = model.CategoryList.Select(x => new CategoryList = model.CategoryList.Select(x => new
{ {
x.Id, x.Id,
...@@ -1478,7 +1479,9 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1478,7 +1479,9 @@ namespace Mall.WebApi.Controllers.MallBase
x.InventoryNum, x.InventoryNum,
x.SellingPrice, x.SellingPrice,
x.SpecificationSort, x.SpecificationSort,
x.AttrList x.AttrList,
x.Commission,
x.CostMoney
}), }),
AreaList = model.AreaList.Select(x => new 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