Commit 97245f8a by guanzhenshan

调整sku利润接口

parent f78b1d4a
......@@ -22,7 +22,7 @@ namespace Bailun.DC.DailyPayAndIncoming
//{
// var _services = new Services();
// var start = DateTime.Parse("2019-09-01");
// var start = DateTime.Parse("2019-11-07");
// while (start < DateTime.Now)
// {
......
......@@ -71,7 +71,7 @@ namespace Bailun.DC.DailyPayAndIncoming
decimal costTotal = 0;
costTotal = listInterest.Count > 0 ? listInterest.Sum(a => a.RepayInterestRMB):0;
//管理成本 只取付款主体为广州百伦供应链科技有限公司、香港百伦科技有限公司、广州电子服装仓、阳山仓、深圳仓的数据
//管理成本 只取付款主体为广州百伦供应链科技有限公司、香港百伦科技有限公司、广州电子服装仓、阳山仓、深圳仓的数据
list = list.Where(a => a.companyValue == 1 || a.companyValue == 2 || a.companyValue == 5 || a.companyValue == 8 || a.companyValue == 7).ToList();
if (list.Count > 0)
{
......
......@@ -4029,7 +4029,7 @@ namespace Bailun.DC.Services
{
var sqlparam = new DynamicParameters();
var sql = $@"select t1.id,t1.warehouse_code,t1.platform_type,t1.seller_account,t1.bailun_account_id,t1.website,t1.transaction_id,t1.company_id,t1.paid_time,t1.gmt_modified,t1.bailun_sku,t1.origin_order_id,t1.bailun_order_id,((((t1.amount_product-t1.cost_platform_fee)*t1.seller_order_exchange_rate)-t1.cost_logistics-t1.cost_handle_bailun)*t1.bailun_sku_quantity_ordered) as productvalue,(t1.amount_sales*t1.seller_order_exchange_rate*t1.bailun_sku_quantity_ordered) amount_sales,(t1.profit_total*t1.bailun_sku_quantity_ordered) profit_total,t1.bailun_sku_quantity_ordered as platform_sku_quantity_shipped,if((t1.has_delete=1 or t1.bailun_order_status='Canceled'),1,0) has_delete from dc_base_oms_sku t1
var sql = $@"select t1.id,t1.warehouse_code,t1.platform_type,t1.seller_account,t1.bailun_account_id,t1.website,t1.transaction_id,t1.company_id,t1.paid_time,t1.gmt_modified,t1.bailun_sku,t1.origin_order_id,t1.bailun_order_id,((((t1.amount_product-t1.cost_platform_fee)*t1.seller_order_exchange_rate)-t1.cost_logistics-t1.cost_handle_bailun)*t1.bailun_sku_quantity_ordered) as productvalue,(t1.amount_sales*t1.seller_order_exchange_rate*t1.bailun_sku_quantity_ordered) amount_sales,(t1.profit_total*t1.bailun_sku_quantity_ordered) profit_total,t1.bailun_sku_quantity_ordered as platform_sku_quantity_shipped,if((t1.has_delete=1 or t1.bailun_order_status='Canceled'),1,0) has_delete,t1.create_time from dc_base_oms_sku t1
where t1.platform_type = 'FBA' and t1.gmt_modified >= '{start.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.gmt_modified < '{end.ToString("yyyy-MM-dd HH:mm:ss")}'";
if (!string.IsNullOrEmpty(orderno))
......
......@@ -280,7 +280,7 @@ namespace Bailun.DC.Web.Controllers
a.company_id,
pick_order_id = a.bailun_order_id,
a.bailun_account_id,
shipping_time = a.paid_time,
shipping_time = a.create_time,
a.has_delete,
quantity_shipped = a.platform_sku_quantity_shipped,
a.warehouse_code,
......
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