Skip to content

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

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

parents 91e17ca4 1720b8bb
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 43 deletions
Mall.Model/Extend/User/RB_Member_User_Extend.cs
View file @ e90f356e
...@@ -54,6 +54,14 @@ namespace Mall.Model.Extend.User ...@@ -54,6 +54,14 @@ namespace Mall.Model.Extend.User
/// 用户名str /// 用户名str
/// </summary> /// </summary>
public string UserNameStr { get; set; } public string UserNameStr { get; set; }
/// <summary>
/// 开始时间
/// </summary>
public string StartTime { get; set; }
/// <summary>
/// 结束时间
/// </summary>
public string EndTime { get; set; }
/// <summary> /// <summary>
/// 下线数量 /// 下线数量
......
Mall.Module.Product/GroupBuyActivityModule.cs
View file @ e90f356e
...@@ -191,23 +191,32 @@ namespace Mall.Module.Product ...@@ -191,23 +191,32 @@ namespace Mall.Module.Product
item.AttrList = AttrList; item.AttrList = AttrList;
} }
} }
////拼团价格列表
//List<RB_Groupbuy_Activity_Specificationprice_Extend> specificationpriceList = GetGroupbuyActivitySpecificationpriceListModule(new RB_Groupbuy_Activity_Specificationprice_Extend() //拼团阶梯基础设置列表
//{ List<RB_Groupbuy_Activity_Step_Extend> groupStepList = GetGroupBuyActivityListModule(new RB_Groupbuy_Activity_Step_Extend()
// MallBaseId = query.MallBaseId, {
// TenantId = query.TenantId, MallBaseId = query.MallBaseId,
// GoodsId = extModel.GoodId, TenantId = query.TenantId,
//}); GoodId = extModel.GoodId,
////拼团阶梯价格列表 });
//List<RB_Groupbuy_Activity_Step_Extend> groupStepList = GetGroupBuyActivityListModule(new RB_Groupbuy_Activity_Step_Extend() //拼团阶梯价格设置列表
//{ List<RB_Groupbuy_Activity_Step_Price_Extend> StepPriceList = GetGroupbuyActivitySpecificationpriceListModule(new RB_Groupbuy_Activity_Step_Price_Extend()
// MallBaseId = query.MallBaseId, {
// TenantId = query.TenantId, MallBaseId=query.MallBaseId,
// GoodId = extModel.GoodId, TenantId=query.TenantId,
//}); GoodId=extModel.GoodId,
});
if (groupStepList != null && groupStepList.Count > 0)
{
foreach (var item in groupStepList)
{
item.StepPriceList = StepPriceList?.Where(qitem => qitem.StepId == item.StepId)?.ToList() ?? new List<RB_Groupbuy_Activity_Step_Price_Extend>();
}
}
extModel.SpecificationList = specificationList; extModel.SpecificationList = specificationList;
extModel.SpecificationPriceList = specPriceList; extModel.SpecificationPriceList = specPriceList;
// extModel.GroupList = groupStepList; extModel.GroupList = groupStepList;
} }
return extModel; return extModel;
} }
...@@ -272,7 +281,7 @@ namespace Mall.Module.Product ...@@ -272,7 +281,7 @@ namespace Mall.Module.Product
{ {
flag = SetGoodsSpecificationModule(extModel); flag = SetGoodsSpecificationModule(extModel);
//flag = SetGoodGroupStepModule(extModel); flag = SetGoodGroupStepModule(extModel);
} }
return flag; return flag;
} }
...@@ -304,7 +313,6 @@ namespace Mall.Module.Product ...@@ -304,7 +313,6 @@ namespace Mall.Module.Product
specItem.Id = newSpecId; specItem.Id = newSpecId;
flag = newSpecId > 0; flag = newSpecId > 0;
} }
if (specItem.SpecificationValueList != null && specItem.SpecificationValueList.Count > 0) if (specItem.SpecificationValueList != null && specItem.SpecificationValueList.Count > 0)
{ {
foreach (var specValueItem in specItem.SpecificationValueList) foreach (var specValueItem in specItem.SpecificationValueList)
...@@ -378,9 +386,17 @@ namespace Mall.Module.Product ...@@ -378,9 +386,17 @@ namespace Mall.Module.Product
groupItem.TenantId = extModel.TenantId; groupItem.TenantId = extModel.TenantId;
groupItem.MallBaseId = extModel.MallBaseId; groupItem.MallBaseId = extModel.MallBaseId;
groupItem.GoodId = extModel.GoodId; groupItem.GoodId = extModel.GoodId;
var newGroupId = stepRepository.Insert(groupItem); if (groupItem.StepId > 0)
flag = newGroupId > 0; {
if (newGroupId > 0) flag = stepRepository.Update(groupItem);
}
else
{
var newStepId = stepRepository.Insert(groupItem);
groupItem.StepId = newStepId;
flag = newStepId > 0;
}
if (groupItem.StepId > 0)
{ {
if (groupItem.StepPriceList != null && groupItem.StepPriceList.Count > 0) if (groupItem.StepPriceList != null && groupItem.StepPriceList.Count > 0)
{ {
...@@ -390,7 +406,15 @@ namespace Mall.Module.Product ...@@ -390,7 +406,15 @@ namespace Mall.Module.Product
subItem.MallBaseId = extModel.MallBaseId; subItem.MallBaseId = extModel.MallBaseId;
subItem.TenantId = extModel.TenantId; subItem.TenantId = extModel.TenantId;
subItem.GoodId = extModel.GoodId; subItem.GoodId = extModel.GoodId;
var stepPriceId = groupbuy_Activity_Step_PriceRepository.Insert(subItem); subItem.StepId = groupItem.StepId;
if (subItem.Id > 0)
{
flag = groupbuy_Activity_Step_PriceRepository.Update(subItem);
}
else
{
flag = groupbuy_Activity_Step_PriceRepository.Insert(subItem)>0;
}
} }
} }
} }
......
Mall.Repository/User/RB_Member_UserRepository.cs
View file @ e90f356e
...@@ -55,6 +55,12 @@ namespace Mall.Repository.User ...@@ -55,6 +55,12 @@ namespace Mall.Repository.User
if (dmodel.IsDistributor > 0) { if (dmodel.IsDistributor > 0) {
where += $@" and {nameof(RB_Member_User.IsDistributor)}={dmodel.IsDistributor}"; where += $@" and {nameof(RB_Member_User.IsDistributor)}={dmodel.IsDistributor}";
} }
if (!string.IsNullOrEmpty(dmodel.StartTime)) {
where += $@" and {nameof(RB_Member_User.CreateDate)} >='{dmodel.StartTime}'";
}
if (!string.IsNullOrEmpty(dmodel.EndTime)) {
where += $@" and {nameof(RB_Member_User.CreateDate)} <='{dmodel.EndTime} 23:59:59'";
}
if (dmodel.IsEmptyUserPhoto == 1) { if (dmodel.IsEmptyUserPhoto == 1) {
where += $@" and IFNULL({nameof(RB_Member_User.Photo)},'')=''"; where += $@" and IFNULL({nameof(RB_Member_User.Photo)},'')=''";
} }
...@@ -126,6 +132,14 @@ select * from RB_Member_User where {where} order by {orderBy} ...@@ -126,6 +132,14 @@ select * from RB_Member_User where {where} order by {orderBy}
if (!string.IsNullOrEmpty(dmodel.UserIds)) { if (!string.IsNullOrEmpty(dmodel.UserIds)) {
where += $@" and {nameof(RB_Member_User.Id)} in({dmodel.UserIds})"; where += $@" and {nameof(RB_Member_User.Id)} in({dmodel.UserIds})";
} }
if (!string.IsNullOrEmpty(dmodel.StartTime))
{
where += $@" and {nameof(RB_Member_User.CreateDate)} >='{dmodel.StartTime}'";
}
if (!string.IsNullOrEmpty(dmodel.EndTime))
{
where += $@" and {nameof(RB_Member_User.CreateDate)} <='{dmodel.EndTime} 23:59:59'";
}
string sql = $@" string sql = $@"
select * from RB_Member_User where {where} order by CreateDate desc select * from RB_Member_User where {where} order by CreateDate desc
......
Mall.WebApi/Controllers/Product/OrderController.cs
View file @ e90f356e
...@@ -1472,51 +1472,52 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1472,51 +1472,52 @@ namespace Mall.WebApi.Controllers.MallBase
new ExcelColumn(value:Num.ToString()){ Rowspan = OCCount}, new ExcelColumn(value:Num.ToString()){ Rowspan = OCCount},
}, },
ColumnHight = 30 ColumnHight = 30
}; };
int QNum = 0;
foreach (var qitem in demodel.ExcelEnumIds) foreach (var qitem in demodel.ExcelEnumIds)
{ {
switch (qitem) switch (qitem)
{ {
case 1: case 1:
datarow.ExcelRows.Add(new ExcelColumn(value: item.OrderSource.GetEnumName()) { Rowspan = OCCount }); break; datarow.ExcelRows.Add(new ExcelColumn(value: item.OrderSource.GetEnumName()) { Rowspan = OCCount }); QNum++; break;
case 2: case 2:
datarow.ExcelRows.Add(new ExcelColumn(value: item.OrderNo) { Rowspan = OCCount }); break; datarow.ExcelRows.Add(new ExcelColumn(value: item.OrderNo) { Rowspan = OCCount }); QNum++; break;
case 3: case 3:
datarow.ExcelRows.Add(new ExcelColumn(value: item.MerchantsNo) { Rowspan = OCCount }); break; datarow.ExcelRows.Add(new ExcelColumn(value: item.MerchantsNo) { Rowspan = OCCount }); QNum++; break;
case 4: case 4:
datarow.ExcelRows.Add(new ExcelColumn(value: item.UserName) { Rowspan = OCCount }); break; datarow.ExcelRows.Add(new ExcelColumn(value: item.UserName) { Rowspan = OCCount }); QNum++; break;
case 5: case 5:
datarow.ExcelRows.Add(new ExcelColumn(value: item2.GoodsName) { Rowspan = OCCount }); break; datarow.ExcelRows.Add(new ExcelColumn(value: item2.GoodsName) { Rowspan = OCCount }); QNum++; break;
case 6: case 6:
datarow.ExcelRows.Add(new ExcelColumn(value: item2.Specification) { Rowspan = OCCount }); break; datarow.ExcelRows.Add(new ExcelColumn(value: item2.Specification) { Rowspan = OCCount }); QNum++; break;
case 7: case 7:
datarow.ExcelRows.Add(new ExcelColumn(value: (item2.Number ?? 0).ToString()) { Rowspan = OCCount }); break; datarow.ExcelRows.Add(new ExcelColumn(value: (item2.Number ?? 0).ToString()) { Rowspan = OCCount }); QNum++; break;
case 8: case 8:
datarow.ExcelRows.Add(new ExcelColumn(value: item2.ProductCode) { Rowspan = OCCount }); break; datarow.ExcelRows.Add(new ExcelColumn(value: item2.ProductCode) { Rowspan = OCCount }); QNum++; break;
case 10: case 10:
datarow.ExcelRows.Add(new ExcelColumn(value: item.Consignee) { Rowspan = OCCount }); break; datarow.ExcelRows.Add(new ExcelColumn(value: item.Consignee) { Rowspan = OCCount }); QNum++; break;
case 11: case 11:
datarow.ExcelRows.Add(new ExcelColumn(value: item.Mobile) { Rowspan = OCCount }); break; datarow.ExcelRows.Add(new ExcelColumn(value: item.Mobile) { Rowspan = OCCount }); QNum++; break;
case 12: case 12:
datarow.ExcelRows.Add(new ExcelColumn(value: item.ShoppingAddress) { Rowspan = OCCount }); break; datarow.ExcelRows.Add(new ExcelColumn(value: item.ShoppingAddress) { Rowspan = OCCount }); QNum++; break;
case 13: case 13:
datarow.ExcelRows.Add(new ExcelColumn(value: (item2.Original_Price ?? 0).ToString()) { Rowspan = OCCount }); break; datarow.ExcelRows.Add(new ExcelColumn(value: (item2.Original_Price ?? 0).ToString()) { Rowspan = OCCount }); QNum++; break;
case 14: case 14:
datarow.ExcelRows.Add(new ExcelColumn(value: (item2.Final_Price ?? 0).ToString()) { Rowspan = OCCount }); break; datarow.ExcelRows.Add(new ExcelColumn(value: (item2.Final_Price ?? 0).ToString()) { Rowspan = OCCount }); QNum++; break;
case 16: case 16:
datarow.ExcelRows.Add(new ExcelColumn(value: item.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")) { Rowspan = OCCount }); break; datarow.ExcelRows.Add(new ExcelColumn(value: item.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")) { Rowspan = OCCount }); QNum++; break;
case 17: case 17:
datarow.ExcelRows.Add(new ExcelColumn(value: item.OrderStatus.GetEnumName()) { Rowspan = OCCount }); break; datarow.ExcelRows.Add(new ExcelColumn(value: item.OrderStatus.GetEnumName()) { Rowspan = OCCount }); QNum++; break;
case 18: case 18:
datarow.ExcelRows.Add(new ExcelColumn(value: item.PaymentWay.GetEnumName()) { Rowspan = OCCount }); break; datarow.ExcelRows.Add(new ExcelColumn(value: item.PaymentWay.GetEnumName()) { Rowspan = OCCount }); QNum++; break;
case 19: case 19:
datarow.ExcelRows.Add(new ExcelColumn(value: item.OrderStatus > OrderStatusEnum.NonPayment ? "已付款" : "未付款") { Rowspan = OCCount }); break; datarow.ExcelRows.Add(new ExcelColumn(value: item.OrderStatus > OrderStatusEnum.NonPayment ? "已付款" : "未付款") { Rowspan = OCCount }); QNum++; break;
case 20: case 20:
datarow.ExcelRows.Add(new ExcelColumn(value: item.PaymentTime.HasValue ? item.PaymentTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "") { Rowspan = OCCount }); break; datarow.ExcelRows.Add(new ExcelColumn(value: item.PaymentTime.HasValue ? item.PaymentTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "") { Rowspan = OCCount }); QNum++; break;
case 21: case 21:
datarow.ExcelRows.Add(new ExcelColumn(value: item.Remark) { Rowspan = OCCount }); break; datarow.ExcelRows.Add(new ExcelColumn(value: item.Remark) { Rowspan = OCCount }); QNum++; break;
case 22: case 22:
datarow.ExcelRows.Add(new ExcelColumn(value: item.BuyerMessage) { Rowspan = OCCount }); break; datarow.ExcelRows.Add(new ExcelColumn(value: item.BuyerMessage) { Rowspan = OCCount }); QNum++; break;
} }
} }
bool IsOCFirst = true; bool IsOCFirst = true;
...@@ -1534,7 +1535,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1534,7 +1535,7 @@ namespace Mall.WebApi.Controllers.MallBase
}, },
ColumnHight = 30 ColumnHight = 30
}; };
for (var i = 0; i < 19; i++) { for (var i = 0; i < QNum; i++) {
datarow.ExcelRows.Add(new ExcelColumn(value: "") { }); datarow.ExcelRows.Add(new ExcelColumn(value: "") { });
} }
} }
......
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