Skip to content

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

订单导出

parent 9c2270e2
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
Mall.Module.Product/ProductModule.cs
View file @ 96425192
......@@ -1327,14 +1327,14 @@ namespace Mall.Module.Product
if (model.SeparateDistribution == 1)
{
var dcList = model.DistributionCommissionList.Where(x => x.DistributorGrade == disModel.GradeId).ToList();
if ((BasicsModel?.IsCommissionResidue ?? 2) == 1)
{
model.MaxShare = dcList.Max(x => (x.OneCommission ?? 0) + (x.TwoCommission ?? 0) + (x.ThreeCommission ?? 0));
}
else
{
//if ((BasicsModel?.IsCommissionResidue ?? 2) == 1)
//{
// model.MaxShare = dcList.Max(x => (x.OneCommission ?? 0) + (x.TwoCommission ?? 0) + (x.ThreeCommission ?? 0));
//}
//else
//{
model.MaxShare = dcList.Max(x => x.OneCommission ?? 0);
}
//}
// 这里需注意，可能需要分销 是否提所有返佣控制
if (model.SeparateDistributionMoneyType == 1)
{
......
Mall.WebApi/Controllers/Product/OrderController.cs
View file @ 96425192
......@@ -206,7 +206,7 @@ namespace Mall.WebApi.Controllers.MallBase
case 11:
datarow.ExcelRows.Add(new ExcelColumn(value: item.Mobile) { }); break;
case 12:
datarow.ExcelRows.Add(new ExcelColumn(value: item.ShoppingAddress) { }); break;
datarow.ExcelRows.Add(new ExcelColumn(value: (item.DistrictAddress??"")+" " +(item.ShoppingAddress??"")) { }); break;
case 13:
datarow.ExcelRows.Add(new ExcelColumn(value: (item.PreferPrice ?? 0).ToString()) { }); break;
case 14:
......
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