Skip to content

D
DataCenter_Core2.1_20190520
Commit 8b7e5c8a by jianshuqin
Options

调整平台利润取数逻辑

parent 93f22b70
Showing with 5 additions and 5 deletions
Bailun.DC.Web/Areas/Reports/Controllers/OrdersController.cs
...@@ -1733,7 +1733,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -1733,7 +1733,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
listRefund = _service.ListPlatformRefund(dtstart, dtend, companyid, platform, website, currency.ToUpper() == "USD", false, producttype, skusource, shippingstrategy, statistictype); //不包含未发货的退款金额 listRefund = _service.ListPlatformRefund(dtstart, dtend, null, platform, website, currency.ToUpper() == "USD", false, producttype, skusource, shippingstrategy, statistictype); //不包含未发货的退款金额
//针对SKU FJH-L-2 做特殊处理 //针对SKU FJH-L-2 做特殊处理
if (producttype.Length > 0) if (producttype.Length > 0)
...@@ -1806,7 +1806,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -1806,7 +1806,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
{ {
string[] originOrderIds = null; string[] originOrderIds = null;
result = _service.ListPlatformProfit(platform, website, start, end, shipstart, shipend, currency.ToUpper() == "USD", companyid, skucategoryids, producttype, skusource, shippingstrategy, statistictype, skunewcategory, null, null, null, null, out originOrderIds); result = _service.ListPlatformProfit(platform, website, start, end, shipstart, shipend, currency.ToUpper() == "USD", companyid, skucategoryids, producttype, skusource, shippingstrategy, statistictype, skunewcategory, null, null, null, null, out originOrderIds);
listRefund = _service.ListPlatformRefund(dtstart, dtend, companyid, platform, website, currency.ToUpper() == "USD", true, producttype, skusource, shippingstrategy, statistictype, originOrderIds); //包含未发货的退款金额 listRefund = _service.ListPlatformRefund(dtstart, dtend, null, platform, website, currency.ToUpper() == "USD", true, producttype, skusource, shippingstrategy, statistictype, originOrderIds); //包含未发货的退款金额
//针对SKU FJH-L-2 做特殊处理 //针对SKU FJH-L-2 做特殊处理
if (producttype.Length > 0) if (producttype.Length > 0)
...@@ -1893,13 +1893,13 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -1893,13 +1893,13 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
result.AddRange(fbaResult); result.AddRange(fbaResult);
} }
listRefund = _service.ListPlatformRefund(dtstart, dtend, companyid, platform, website, currency.ToUpper() == "USD", false, null, null, null, statistictype); //不包含未发货的退款金额 listRefund = _service.ListPlatformRefund(dtstart, dtend, null, platform, website, currency.ToUpper() == "USD", false, null, null, null, statistictype); //不包含未发货的退款金额
} }
else else
{ {
string[] originOrderIds = null; string[] originOrderIds = null;
result = _service.ListPlatformProfit(platform, website, start, end, shipstart, shipend, currency.ToUpper() == "USD", companyid, skucategoryids, null, null, null, statistictype, skunewcategory, null, null, null, null, out originOrderIds); result = _service.ListPlatformProfit(platform, website, start, end, shipstart, shipend, currency.ToUpper() == "USD", null, skucategoryids, null, null, null, statistictype, skunewcategory, null, null, null, null, out originOrderIds);
listRefund = _service.ListPlatformRefund(dtstart, dtend, companyid, platform, website, currency.ToUpper() == "USD", true, null, null, null, statistictype, originOrderIds); //包含未发货的退款金额 listRefund = _service.ListPlatformRefund(dtstart, dtend, null, platform, website, currency.ToUpper() == "USD", true, null, null, null, statistictype, originOrderIds); //包含未发货的退款金额
} }
if (statistictype == 0) if (statistictype == 0)
......
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