Commit bf2cd2f9 authored by 黄奎's avatar 黄奎

新增字段

parent 5a33feb6
...@@ -107,5 +107,10 @@ namespace Mall.Model.Entity.Product ...@@ -107,5 +107,10 @@ namespace Mall.Model.Entity.Product
get; get;
set; set;
} }
/// <summary>
/// 阶梯编号
/// </summary>
public int StepId { get; set; }
} }
} }
...@@ -90,5 +90,10 @@ namespace Mall.Model.Entity.Product ...@@ -90,5 +90,10 @@ namespace Mall.Model.Entity.Product
get; get;
set; set;
} }
/// <summary>
/// 阶梯编号
/// </summary>
public int StepId { get; set; }
} }
} }
\ No newline at end of file
...@@ -13,6 +13,9 @@ namespace Mall.Model.Extend.Product ...@@ -13,6 +13,9 @@ namespace Mall.Model.Extend.Product
[DB(ConnectionName = "DefaultConnection")] [DB(ConnectionName = "DefaultConnection")]
public class RB_GroupBuy_Distributioncommission_Extend : RB_GroupBuy_Distributioncommission public class RB_GroupBuy_Distributioncommission_Extend : RB_GroupBuy_Distributioncommission
{ {
/// <summary>
/// 商品编号
/// </summary>
public string GoodIds { get; set; }
} }
} }
...@@ -22,5 +22,16 @@ namespace Mall.Model.Entity.Product ...@@ -22,5 +22,16 @@ namespace Mall.Model.Entity.Product
/// 阶梯价格列表 /// 阶梯价格列表
/// </summary> /// </summary>
public List<RB_Groupbuy_Activity_Step_Price_Extend> StepPriceList { get; set; } public List<RB_Groupbuy_Activity_Step_Price_Extend> StepPriceList { get; set; }
/// <summary>
/// 拼团活动分销佣金列表
/// </summary>
public List<RB_GroupBuy_Distributioncommission_Extend> DistributioncommissionList { get; set; }
/// <summary>
/// 拼团活动会员价列表
/// </summary>
public List<RB_Groupbuy_Memberprice_Extend> MemberpriceList { get; set; }
} }
} }
...@@ -13,6 +13,9 @@ namespace Mall.Model.Extend.Product ...@@ -13,6 +13,9 @@ namespace Mall.Model.Extend.Product
[DB(ConnectionName = "DefaultConnection")] [DB(ConnectionName = "DefaultConnection")]
public class RB_Groupbuy_Memberprice_Extend : RB_Groupbuy_Memberprice public class RB_Groupbuy_Memberprice_Extend : RB_Groupbuy_Memberprice
{ {
/// <summary>
/// 商品编号
/// </summary>
public string GoodIds { get; set; }
} }
} }
\ No newline at end of file
...@@ -44,6 +44,36 @@ namespace Mall.Module.Product ...@@ -44,6 +44,36 @@ namespace Mall.Module.Product
/// </summary> /// </summary>
private RB_Groupbuy_Activity_Step_PriceRepository groupbuy_Activity_Step_PriceRepository = new RB_Groupbuy_Activity_Step_PriceRepository(); private RB_Groupbuy_Activity_Step_PriceRepository groupbuy_Activity_Step_PriceRepository = new RB_Groupbuy_Activity_Step_PriceRepository();
/// <summary>
/// 拼团活动商品关联分销佣金表仓储对象
/// </summary>
private RB_GroupBuy_DistributioncommissionRepository groupBuy_DistributioncommissionRepository = new RB_GroupBuy_DistributioncommissionRepository();
/// <summary>
/// 拼团活动商品关联会员价格表仓储对象
/// </summary>
private RB_Groupbuy_MemberpriceRepository groupbuy_MemberpriceRepository = new RB_Groupbuy_MemberpriceRepository();
/// <summary>
/// 获取拼团活动商品分销佣金
/// </summary>
/// <returns></returns>
public List<RB_Groupbuy_Memberprice_Extend> GetGroupBuyMemberpriceModule(RB_Groupbuy_Memberprice_Extend query)
{
return groupbuy_MemberpriceRepository.GetGroupBuyMemberpriceRepository(query);
}
/// <summary>
/// 获取拼团活动商品分销佣金
/// </summary>
/// <returns></returns>
public List<RB_GroupBuy_Distributioncommission_Extend> GetGroupBuyCommissionRepository(RB_GroupBuy_Distributioncommission_Extend query)
{
return groupBuy_DistributioncommissionRepository.GetGroupBuyCommissionRepository(query);
}
/// <summary> /// <summary>
/// 获取拼团活动商品规格价格列表 /// 获取拼团活动商品规格价格列表
/// </summary> /// </summary>
...@@ -391,7 +421,6 @@ namespace Mall.Module.Product ...@@ -391,7 +421,6 @@ namespace Mall.Module.Product
} }
} }
} }
foreach (var priceItem in extModel.SpecificationPriceList) foreach (var priceItem in extModel.SpecificationPriceList)
{ {
priceItem.MallBaseId = extModel.MallBaseId; priceItem.MallBaseId = extModel.MallBaseId;
......
...@@ -3,6 +3,7 @@ using Mall.Model.Extend.Product; ...@@ -3,6 +3,7 @@ using Mall.Model.Extend.Product;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using System.Linq;
namespace Mall.Repository.Product namespace Mall.Repository.Product
{ {
...@@ -12,12 +13,33 @@ namespace Mall.Repository.Product ...@@ -12,12 +13,33 @@ namespace Mall.Repository.Product
public class RB_GroupBuy_DistributioncommissionRepository : BaseRepository<RB_GroupBuy_Distributioncommission> public class RB_GroupBuy_DistributioncommissionRepository : BaseRepository<RB_GroupBuy_Distributioncommission>
{ {
/// <summary> /// <summary>
/// /// 获取拼团活动商品分销佣金
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public List<RB_GroupBuy_Distributioncommission_Extend> GetGroupBuyCommissionRepository() public List<RB_GroupBuy_Distributioncommission_Extend> GetGroupBuyCommissionRepository(RB_GroupBuy_Distributioncommission_Extend query)
{ {
return null; StringBuilder builder = new StringBuilder();
builder.Append(@" SELECT * FROM RB_GroupBuy_Distributioncommission WHERE 1=1 ");
if (query != null)
{
if (query.MallBaseId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_GroupBuy_Distributioncommission_Extend.MallBaseId), query.MallBaseId);
}
if (query.TenantId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_GroupBuy_Distributioncommission_Extend.TenantId), query.TenantId);
}
if (query.GoodsId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_GroupBuy_Distributioncommission_Extend.GoodsId), query.GoodsId);
}
if (!string.IsNullOrWhiteSpace(query.GoodIds))
{
builder.AppendFormat(" AND {0} IN({1}) ", nameof(RB_GroupBuy_Distributioncommission_Extend.GoodsId), query.GoodIds);
}
}
return Get<RB_GroupBuy_Distributioncommission_Extend>(builder.ToString()).ToList();
} }
} }
} }
using Mall.Model.Entity.Product; using Mall.Model.Entity.Product;
using Mall.Model.Extend.Product;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text; using System.Text;
namespace Mall.Repository.Product namespace Mall.Repository.Product
...@@ -10,6 +12,34 @@ namespace Mall.Repository.Product ...@@ -10,6 +12,34 @@ namespace Mall.Repository.Product
/// </summary> /// </summary>
public class RB_Groupbuy_MemberpriceRepository:BaseRepository<RB_Groupbuy_Memberprice> public class RB_Groupbuy_MemberpriceRepository:BaseRepository<RB_Groupbuy_Memberprice>
{ {
/// <summary>
/// 获取拼团活动商品分销佣金
/// </summary>
/// <returns></returns>
public List<RB_Groupbuy_Memberprice_Extend> GetGroupBuyMemberpriceRepository(RB_Groupbuy_Memberprice_Extend query)
{
StringBuilder builder = new StringBuilder();
builder.Append(@" SELECT * FROM RB_Groupbuy_Memberprice WHERE 1=1 ");
if (query != null)
{
if (query.MallBaseId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Groupbuy_Memberprice_Extend.MallBaseId), query.MallBaseId);
}
if (query.TenantId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Groupbuy_Memberprice_Extend.TenantId), query.TenantId);
}
if (query.GoodsId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Groupbuy_Memberprice_Extend.GoodsId), query.GoodsId);
}
if (!string.IsNullOrWhiteSpace(query.GoodIds))
{
builder.AppendFormat(" AND {0} IN({1}) ", nameof(RB_Groupbuy_Memberprice_Extend.GoodsId), query.GoodIds);
}
}
return Get<RB_Groupbuy_Memberprice_Extend>(builder.ToString()).ToList();
}
} }
} }
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