Skip to content

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

页面修改

parent e154f05b
Hide whitespace changes
Inline Side-by-side
Showing with 167 additions and 68 deletions
Mall.Model/Entity/Product/RB_Groupbuy_Activity.cs
View file @ 3afce8cb
...@@ -198,5 +198,50 @@ namespace Mall.Model.Entity.Product ...@@ -198,5 +198,50 @@ namespace Mall.Model.Entity.Product
/// 是否自定义规格 1是 2否 /// 是否自定义规格 1是 2否
/// </summary> /// </summary>
public int IsCustomSpecification { get; set; } public int IsCustomSpecification { get; set; }
/// <summary>
/// 是否开启单独分销 1是 2否
/// </summary>
public int? SeparateDistribution
{
get;
set;
}
/// <summary>
/// 单独分销类型 1普通设置 2详细设置
/// </summary>
public int? SeparateDistributionType
{
get;
set;
}
/// <summary>
/// 分销佣金类型 2固定金额 1百分比
/// </summary>
public int? SeparateDistributionMoneyType
{
get;
set;
}
/// <summary>
/// 是否享受会员功能 1是 2否
/// </summary>
public int? EnjoyMember
{
get;
set;
}
/// <summary>
/// 是否单独设置会员价 1是 2否
/// </summary>
public int? SeparateSetMember
{
get;
set;
}
} }
} }
Mall.Model/Entity/Product/RB_Groupbuy_Activity_Specificationprice.cs
View file @ 3afce8cb
...@@ -138,15 +138,5 @@ namespace Mall.Model.Entity.Product ...@@ -138,15 +138,5 @@ namespace Mall.Model.Entity.Product
get; get;
set; set;
} }
/// <summary>
/// 规格Id
/// </summary>
public int SpecificationId { get; set; }
/// <summary>
/// 规格值Id
/// </summary>
public int SpecificationValueId { get; set; }
} }
} }
Mall.Model/Entity/Product/RB_Groupbuy_Activity_Step_Price.cs
View file @ 3afce8cb
...@@ -46,5 +46,15 @@ namespace Mall.Model.Entity.Product ...@@ -46,5 +46,15 @@ namespace Mall.Model.Entity.Product
/// 拼团库存 /// 拼团库存
/// </summary> /// </summary>
public int PinTuanStock { get; set; } public int PinTuanStock { get; set; }
/// <summary>
/// 规格:规格值 索引
/// </summary>
public string SpecificationSort { get; set; }
/// <summary>
/// 排序字段
/// </summary>
public int SortNum { get; set; }
} }
} }
Mall.Model/Extend/Product/RB_Groupbuy_Activity_Step_Price_Extend.cs
View file @ 3afce8cb
...@@ -16,5 +16,10 @@ namespace Mall.Model.Extend.Product ...@@ -16,5 +16,10 @@ namespace Mall.Model.Extend.Product
/// 商品编号 /// 商品编号
/// </summary> /// </summary>
public string GoodsIds { get; set; } public string GoodsIds { get; set; }
/// <summary>
/// 规格值列表
/// </summary>
public object AttrList { get; set; }
} }
} }
Mall.Model/Query/StatisticsQuery.cs
View file @ 3afce8cb
...@@ -49,7 +49,7 @@ namespace Mall.Model.Query ...@@ -49,7 +49,7 @@ namespace Mall.Model.Query
public string EndDate { get; set; } public string EndDate { get; set; }
/// <summary> /// <summary>
/// 销售查询【1-昨日，7-七日】 /// 销售查询【0-今日,1-昨日，7-七日】
/// </summary> /// </summary>
public int SalesTimeType { get; set; } public int SalesTimeType { get; set; }
......
Mall.Module.Product/GroupBuyActivityModule.cs
View file @ 3afce8cb
...@@ -108,21 +108,33 @@ namespace Mall.Module.Product ...@@ -108,21 +108,33 @@ namespace Mall.Module.Product
var list = groupbuy_ActivityRepository.GetGroupbuyActivityPageListRepository(pageIndex, pageSize, out rowsCount, query); var list = groupbuy_ActivityRepository.GetGroupbuyActivityPageListRepository(pageIndex, pageSize, out rowsCount, query);
if (list != null && list.Count > 0) if (list != null && list.Count > 0)
{ {
string Ids = string.Join(",", list.Select(qitem => qitem.ActivityId)); string Ids = string.Join(",", list.Select(qitem => qitem.GoodId));
//List<RB_Groupbuy_Activity_Step_Extend> groupList = new List<RB_Groupbuy_Activity_Step_Extend>(); //拼团阶梯基础设置列表
//if (!string.IsNullOrEmpty(Ids)) List<RB_Groupbuy_Activity_Step_Extend> groupStepList = GetGroupBuyActivityListModule(new RB_Groupbuy_Activity_Step_Extend()
//{ {
// groupList = GetGroupBuyActivityListModule(new RB_Groupbuy_Activity_Step_Extend() MallBaseId = query.MallBaseId,
// { TenantId = query.TenantId,
// MallBaseId = query.MallBaseId, GoodIds = Ids,
// TenantId = query.TenantId, });
// GoodIds = Ids //拼团阶梯价格设置列表
// }); List<RB_Groupbuy_Activity_Step_Price_Extend> StepPriceList = GetGroupbuyActivitySpecificationpriceListModule(new RB_Groupbuy_Activity_Step_Price_Extend()
//} {
//foreach (var item in list) MallBaseId = query.MallBaseId,
//{ TenantId = query.TenantId,
// item.GroupList = groupList?.Where(qitem => qitem.GoodId == item.GoodId)?.ToList() ?? new List<RB_Groupbuy_Activity_Step_Extend>(); GoodsIds = Ids,
//} });
if (groupStepList != null && groupStepList.Count > 0)
{
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>();
}
}
foreach (var item in list)
{
item.GroupList = groupStepList?.Where(qitem => qitem.GoodId == item.GoodId)?.ToList() ?? new List<RB_Groupbuy_Activity_Step_Extend>();
}
} }
return list; return list;
} }
...@@ -178,17 +190,29 @@ namespace Mall.Module.Product ...@@ -178,17 +190,29 @@ namespace Mall.Module.Product
{ {
foreach (var item in specPriceList) foreach (var item in specPriceList)
{ {
List<object> AttrList = new List<object>(); int SortNum = 1;
var smodel = specificationList?.Where(qitem => qitem.Id == item.SpecificationId)?.FirstOrDefault() ?? new RB_Groupbuy_Activity_Specification_Extend(); if (!string.IsNullOrEmpty(item.SpecificationSort))
var svmodel = specificationvalueList.Where(qitem => qitem.Id == item.SpecificationValueId)?.FirstOrDefault() ?? new RB_Groupbuy_Activity_Specificationvalue_Extend();
AttrList.Add(new
{ {
SName = smodel.Name, var ssarr = item.SpecificationSort.Split(':');
SId = smodel.Id, int Sort = Convert.ToInt32(ssarr[0]);
SVId = svmodel.Sort, string pic_url = specificationList[0].SpecificationValueList.Where(x => x.Sort == Sort).FirstOrDefault()?.ImagePath;
SVName = svmodel.Name List<object> AttrList = new List<object>();
}); for (int i = 0; i < ssarr.Length; i++)
item.AttrList = AttrList; {
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.SortNum = SortNum;
SortNum++;
} }
} }
...@@ -212,6 +236,32 @@ namespace Mall.Module.Product ...@@ -212,6 +236,32 @@ namespace Mall.Module.Product
foreach (var item in groupStepList) foreach (var item in groupStepList)
{ {
item.StepPriceList = StepPriceList?.Where(qitem => qitem.StepId == item.StepId)?.ToList() ?? new List<RB_Groupbuy_Activity_Step_Price_Extend>(); item.StepPriceList = StepPriceList?.Where(qitem => qitem.StepId == item.StepId)?.ToList() ?? new List<RB_Groupbuy_Activity_Step_Price_Extend>();
foreach (var subItem in item.StepPriceList)
{
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.SortNum = SortNum;
SortNum++;
}
} }
} }
extModel.SpecificationList = specificationList; extModel.SpecificationList = specificationList;
...@@ -268,6 +318,11 @@ namespace Mall.Module.Product ...@@ -268,6 +318,11 @@ namespace Mall.Module.Product
{ nameof(RB_Groupbuy_Activity_Extend.App_share_title),extModel.App_share_title}, { nameof(RB_Groupbuy_Activity_Extend.App_share_title),extModel.App_share_title},
{ nameof(RB_Groupbuy_Activity_Extend.App_share_pic),extModel.App_share_pic}, { nameof(RB_Groupbuy_Activity_Extend.App_share_pic),extModel.App_share_pic},
{ nameof(RB_Groupbuy_Activity_Extend.IsCustomSpecification),extModel.IsCustomSpecification}, { nameof(RB_Groupbuy_Activity_Extend.IsCustomSpecification),extModel.IsCustomSpecification},
{ nameof(RB_Groupbuy_Activity_Extend.SeparateDistribution),extModel.SeparateDistribution},
{ nameof(RB_Groupbuy_Activity_Extend.SeparateDistributionType),extModel.SeparateDistributionType},
{ nameof(RB_Groupbuy_Activity_Extend.SeparateDistributionMoneyType),extModel.SeparateDistributionMoneyType},
{ nameof(RB_Groupbuy_Activity_Extend.EnjoyMember),extModel.EnjoyMember},
{ nameof(RB_Groupbuy_Activity_Extend.SeparateSetMember),extModel.SeparateSetMember},
}; };
flag = groupbuy_ActivityRepository.Update(fileds, new WhereHelper(nameof(RB_Groupbuy_Activity_Extend.ActivityId), extModel.ActivityId)); flag = groupbuy_ActivityRepository.Update(fileds, new WhereHelper(nameof(RB_Groupbuy_Activity_Extend.ActivityId), extModel.ActivityId));
} }
...@@ -293,7 +348,7 @@ namespace Mall.Module.Product ...@@ -293,7 +348,7 @@ namespace Mall.Module.Product
/// <returns></returns> /// <returns></returns>
private bool SetGoodsSpecificationModule(RB_Groupbuy_Activity_Extend extModel) private bool SetGoodsSpecificationModule(RB_Groupbuy_Activity_Extend extModel)
{ {
bool flag = false; bool flag = true;
if (extModel.IsCustomSpecification == 1) if (extModel.IsCustomSpecification == 1)
{ {
foreach (var specItem in extModel.SpecificationList) foreach (var specItem in extModel.SpecificationList)
...@@ -345,18 +400,6 @@ namespace Mall.Module.Product ...@@ -345,18 +400,6 @@ namespace Mall.Module.Product
priceItem.Status = 0; priceItem.Status = 0;
priceItem.CreateDate = DateTime.Now; priceItem.CreateDate = DateTime.Now;
priceItem.UpdateDate = DateTime.Now; priceItem.UpdateDate = DateTime.Now;
var specArray = priceItem.SpecificationSort.Split(":");
if (specArray != null && specArray.Length>0 )
{
int.TryParse(specArray[0], out int specIndex);
int specValueIndex = 1;
if (specArray.Length == 2)
{
int.TryParse(specArray[1], out specValueIndex);
}
priceItem.SpecificationId = extModel?.SpecificationList[specIndex-1]?.Id ?? 0;
priceItem.SpecificationValueId = extModel?.SpecificationList[specIndex-1]?.SpecificationValueList[specValueIndex-1]?.Id ?? 0;
}
if (priceItem.Id > 0) if (priceItem.Id > 0)
{ {
flag= groupbuy_Activity_SpecificationPriceRepository.Update(priceItem); flag= groupbuy_Activity_SpecificationPriceRepository.Update(priceItem);
...@@ -366,7 +409,6 @@ namespace Mall.Module.Product ...@@ -366,7 +409,6 @@ namespace Mall.Module.Product
flag = groupbuy_Activity_SpecificationPriceRepository.Insert(priceItem)>0; flag = groupbuy_Activity_SpecificationPriceRepository.Insert(priceItem)>0;
} }
} }
} }
return flag; return flag;
} }
...@@ -378,7 +420,7 @@ namespace Mall.Module.Product ...@@ -378,7 +420,7 @@ namespace Mall.Module.Product
/// <returns></returns> /// <returns></returns>
private bool SetGoodGroupStepModule(RB_Groupbuy_Activity_Extend extModel) private bool SetGoodGroupStepModule(RB_Groupbuy_Activity_Extend extModel)
{ {
bool flag = false; bool flag = true;
if (extModel.GroupList != null && extModel.GroupList.Count > 0) if (extModel.GroupList != null && extModel.GroupList.Count > 0)
{ {
foreach (var groupItem in extModel.GroupList) foreach (var groupItem in extModel.GroupList)
...@@ -431,11 +473,11 @@ namespace Mall.Module.Product ...@@ -431,11 +473,11 @@ namespace Mall.Module.Product
public bool RemoveGroupBuySpecificationModule(object Id) public bool RemoveGroupBuySpecificationModule(object Id)
{ {
//根据商品规格删除商品价格 //根据商品规格删除商品价格
List<WhereHelper> specValues = new List<WhereHelper>() //List<WhereHelper> specValues = new List<WhereHelper>()
{ //{
new WhereHelper(nameof(RB_Groupbuy_Activity_Specificationprice_Extend.SpecificationId),Id) // new WhereHelper(nameof(RB_Groupbuy_Activity_Specificationprice_Extend.SpecificationId),Id)
}; //};
groupbuy_Activity_SpecificationPriceRepository.Delete(specValues); //groupbuy_Activity_SpecificationPriceRepository.Delete(specValues);
return groupbuy_Activity_SpecificationPriceRepository.Delete(Id)>0; return groupbuy_Activity_SpecificationPriceRepository.Delete(Id)>0;
} }
...@@ -446,11 +488,11 @@ namespace Mall.Module.Product ...@@ -446,11 +488,11 @@ namespace Mall.Module.Product
public bool RemoveGroupBuySpecificationValueModule(object Id) public bool RemoveGroupBuySpecificationValueModule(object Id)
{ {
//根据规格值删除价格 //根据规格值删除价格
List<WhereHelper> specValues = new List<WhereHelper>() //List<WhereHelper> specValues = new List<WhereHelper>()
{ //{
new WhereHelper(nameof(RB_Groupbuy_Activity_Specificationprice_Extend.SpecificationValueId),Id) // new WhereHelper(nameof(RB_Groupbuy_Activity_Specificationprice_Extend.SpecificationValueId),Id)
}; //};
groupbuy_Activity_SpecificationPriceRepository.Delete(specValues); //groupbuy_Activity_SpecificationPriceRepository.Delete(specValues);
return groupbuy_Activity_SpecificationValueRepository.Delete(Id) > 0; return groupbuy_Activity_SpecificationValueRepository.Delete(Id) > 0;
} }
} }
......
Mall.Module.User/MiniProgramModule.cs
View file @ 3afce8cb
...@@ -1910,7 +1910,7 @@ namespace Mall.Module.User ...@@ -1910,7 +1910,7 @@ namespace Mall.Module.User
var list = mallStatisticsRepository.MallIndexSalesStatisticsRepository(query); var list = mallStatisticsRepository.MallIndexSalesStatisticsRepository(query);
List<object> resultList = new List<object>(); List<object> resultList = new List<object>();
List<MallSalesStatistics> subList = new List<MallSalesStatistics>(); List<MallSalesStatistics> subList = new List<MallSalesStatistics>();
if (query.SalesTimeType == 1) if (query.SalesTimeType == 1 || query.SalesTimeType==0)
{ {
for (var i = 0; i <= 23; i++) for (var i = 0; i <= 23; i++)
{ {
......
Mall.Repository/Product/RB_Groupbuy_ActivityRepository.cs
View file @ 3afce8cb
...@@ -71,23 +71,23 @@ WHERE 1=1 ...@@ -71,23 +71,23 @@ WHERE 1=1
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT * SELECT A.*,B.Name AS QGoodName
FROM RB_Groupbuy_Activity FROM RB_Groupbuy_Activity AS A LEFT JOIN rb_goods AS B ON A.GoodId=B.Id
WHERE 1=1 WHERE 1=1
"); ");
if (query != null) if (query != null)
{ {
if (query.MallBaseId > 0) if (query.MallBaseId > 0)
{ {
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Groupbuy_Activity_Extend.MallBaseId), query.MallBaseId); builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Groupbuy_Activity_Extend.MallBaseId), query.MallBaseId);
} }
if (query.TenantId > 0) if (query.TenantId > 0)
{ {
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Groupbuy_Activity_Extend.TenantId), query.TenantId); builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Groupbuy_Activity_Extend.TenantId), query.TenantId);
} }
if (query.ActivityId > 0) if (query.ActivityId > 0)
{ {
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Groupbuy_Activity_Extend.ActivityId), query.ActivityId); builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Groupbuy_Activity_Extend.ActivityId), query.ActivityId);
} }
} }
return Get<RB_Groupbuy_Activity_Extend>(builder.ToString()).FirstOrDefault(); return Get<RB_Groupbuy_Activity_Extend>(builder.ToString()).FirstOrDefault();
......
Mall.Repository/User/MallStatisticsRepository.cs
View file @ 3afce8cb
...@@ -194,10 +194,15 @@ WHERE 1=1 AND OrderStatus>=2 AND OrderStatus<=5 ...@@ -194,10 +194,15 @@ WHERE 1=1 AND OrderStatus>=2 AND OrderStatus<=5
builder.AppendFormat(" AND A.{0}>='{1}' ", nameof(RB_Goods_Order_Extend.CreateDate), DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd")); builder.AppendFormat(" AND A.{0}>='{1}' ", nameof(RB_Goods_Order_Extend.CreateDate), DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd"));
builder.AppendFormat(" AND A.{0}<='{1} 23:59:59' ", nameof(RB_Goods_Order_Extend.CreateDate), DateTime.Now.ToString("yyyy-MM-dd")); builder.AppendFormat(" AND A.{0}<='{1} 23:59:59' ", nameof(RB_Goods_Order_Extend.CreateDate), DateTime.Now.ToString("yyyy-MM-dd"));
} }
else
else if (query.SalesTimeType == 1)
{ {
builder.AppendFormat(" AND A.{0}>='{1}' AND A.{0}<='{1} 23:59:59' ", nameof(RB_Goods_Order_Extend.CreateDate), DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd")); builder.AppendFormat(" AND A.{0}>='{1}' AND A.{0}<='{1} 23:59:59' ", nameof(RB_Goods_Order_Extend.CreateDate), DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"));
} }
else if (query.SalesTimeType == 0)
{
builder.AppendFormat(" AND A.{0}>='{1}' AND A.{0}<='{1} 23:59:59' ", nameof(RB_Goods_Order_Extend.CreateDate), DateTime.Now.ToString("yyyy-MM-dd"));
}
builder.Append(groupFileds); builder.Append(groupFileds);
var list = Get<MallSalesStatistics>(builder.ToString()).ToList(); var list = Get<MallSalesStatistics>(builder.ToString()).ToList();
return list; return list;
...@@ -210,6 +215,7 @@ WHERE 1=1 AND OrderStatus>=2 AND OrderStatus<=5 ...@@ -210,6 +215,7 @@ WHERE 1=1 AND OrderStatus>=2 AND OrderStatus<=5
public List<MallSalesGoodsTop> MallIndesSalesIncomeStatisticsRepository(StatisticsQuery query) public List<MallSalesGoodsTop> MallIndesSalesIncomeStatisticsRepository(StatisticsQuery query)
{ {
string where = ""; string where = "";
where += string.Format(" AND B.{0}<>7 ", nameof(RB_Goods_Order_Extend.OrderStatus));
where += string.Format(" AND B.{0}={1} ", nameof(RB_Goods_Order_Extend.TenantId), query.TenantId); where += string.Format(" AND B.{0}={1} ", nameof(RB_Goods_Order_Extend.TenantId), query.TenantId);
where += string.Format(" AND B.{0}={1} ", nameof(RB_Goods_Order_Extend.MallBaseId), query.MallBaseId); where += string.Format(" AND B.{0}={1} ", nameof(RB_Goods_Order_Extend.MallBaseId), query.MallBaseId);
//开始时间 //开始时间
...@@ -262,6 +268,7 @@ GROUP BY A.GoodsId,A.GoodsName) as a ORDER BY a.{query.OrderBy} LIMIT 100 "); ...@@ -262,6 +268,7 @@ GROUP BY A.GoodsId,A.GoodsName) as a ORDER BY a.{query.OrderBy} LIMIT 100 ");
public List<MallSalesUserTop> MallIndesSalesUserStatisticsRepository(StatisticsQuery query) public List<MallSalesUserTop> MallIndesSalesUserStatisticsRepository(StatisticsQuery query)
{ {
string where = ""; string where = "";
where += string.Format(" AND B.{0}<>7 ", nameof(RB_Goods_Order_Extend.OrderStatus));
where += string.Format(" AND B.{0}={1} ", nameof(RB_Goods_Order_Extend.TenantId), query.TenantId); where += string.Format(" AND B.{0}={1} ", nameof(RB_Goods_Order_Extend.TenantId), query.TenantId);
where += string.Format(" AND B.{0}={1} ", nameof(RB_Goods_Order_Extend.MallBaseId), query.MallBaseId); where += string.Format(" AND B.{0}={1} ", nameof(RB_Goods_Order_Extend.MallBaseId), query.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