Commit fb5f9198 by guanzhenshan

调整ebay汇损率,改为0.25

parent 9e22a8bb
......@@ -3178,7 +3178,7 @@ namespace Bailun.DC.Services
var sqlparam = new DynamicParameters();
var sql = "select t1.seller_account,(t1.amount_sales*seller_order_exchange_rate) amount_sales,t1.cost_platform_cost as from dc_base_oms_order t1 where t1.bailun_order_status!='Canceled' and t1.platform_type='Ebay' and t1.bailun_order_status!='CantHandle' and t1.has_scalp=0 and t1.has_innersale=0 and t1.bailun_interception_status in ('None','Failed') ";
var sql = "select t1.seller_account,(t1.amount_sales*seller_order_exchange_rate) amount_sales from dc_base_oms_order t1 where t1.bailun_order_status!='Canceled' and t1.platform_type='Ebay' and t1.bailun_order_status!='CantHandle' and t1.has_scalp=0 and t1.has_innersale=0 and t1.bailun_interception_status in ('None','Failed') ";
if (!string.IsNullOrWhiteSpace(account))
......@@ -3211,7 +3211,7 @@ namespace Bailun.DC.Services
cn.Open();
}
var obj = cn.Page<mExchangeLoss>(parameter.pageIndex, parameter.limit, sql, ref total, sqlparam);
var obj = cn.Page<mExchangeLoss>(parameter.pageIndex, parameter.limit, sql, ref total, sqlparam,"",2*60);
return obj.ToList();
}
......@@ -3221,7 +3221,7 @@ namespace Bailun.DC.Services
{
var sqlparam = new DynamicParameters();
var sql = "select sum(t1.amount_sales*t1.seller_order_exchange_rate) amount_sales,sum(t1.cost_platform_cost*t1.seller_order_exchange_rate) cost_platform_cost from dc_base_oms_order t1 where t1.bailun_order_status!='Canceled' and t1.platform_type='Ebay' and t1.bailun_order_status!='CantHandle' and t1.has_scalp=0 and t1.has_innersale=0 and t1.bailun_interception_status in ('None','Failed') ";
var sql = "select sum(t1.amount_sales*t1.seller_order_exchange_rate) amount_sales from dc_base_oms_order t1 where t1.bailun_order_status!='Canceled' and t1.platform_type='Ebay' and t1.bailun_order_status!='CantHandle' and t1.has_scalp=0 and t1.has_innersale=0 and t1.bailun_interception_status in ('None','Failed') ";
if (!string.IsNullOrWhiteSpace(account))
......
......@@ -1255,9 +1255,9 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
amount_sales = a.amount_sales.ToString("N2"),
//gross_amount = a.gross_amount.ToString("N2"),
a.seller_account,
exchangeloss_rate = 5,
exchangeloss_rate = 2.5,
//exchangeloss_amount = ((a.amount_sales-a.gross_amount)*(decimal)0.025).ToString("N2")
exchangeloss_amount = (a.amount_sales*(decimal)0.005).ToString("N2"),
exchangeloss_amount = (a.amount_sales*(decimal)0.025).ToString("N2"),
});
......@@ -1270,7 +1270,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
seller_account = "总计",
amount_sales = countObj.amount_sales.ToString("N2"),
//gross_amount = countObj.gross_amount.ToString("N2"),
exchangeloss_amount = (countObj.amount_sales * (decimal)0.005).ToString("N2")
exchangeloss_amount = (countObj.amount_sales * (decimal)0.025).ToString("N2")
}
});
}
......
......@@ -76,7 +76,7 @@
},
{ field: 'amount_sales', title: '销售额', width: '130', iscount: true },
//{ field: 'gross_amount', title: '平台总费用', width: '140', iscount: true },
{ field: 'exchangeloss_rate', title: '汇损率', width: '100' },
{ field: 'exchangeloss_rate', title: '汇损率%', width: '100' },
{ field: 'exchangeloss_amount', title: '汇损金额', width: '120', iscount: true }
];
......
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