Commit aa51e2a1 by guanzhenshan

调整ebay平台的平台费汇率计算取值错误的问题

parent 06685707
...@@ -84,7 +84,7 @@ namespace Bailun.DC.DailyItemNoProfitRate ...@@ -84,7 +84,7 @@ namespace Bailun.DC.DailyItemNoProfitRate
cn.Open(); cn.Open();
} }
listBaseOrder = cn.Query<dc_mid_itemno_profit_order>($@"select distinct t3.id as order_sku_id,t1.bailun_order_id,t1.origin_order_id,t1.item_id,t1.platform_sku,t1.platform_sku_quantity_ordered,t3.bailun_sku,t3.paid_time,(t3.amount_sales*t1.platform_sku_quantity_ordered) as amount_sales,(t3.cost_product*t1.platform_sku_quantity_ordered) cost_product,(t3.cost_platform_fee*t1.platform_sku_quantity_ordered) cost_platform_fee,(t3.cost_paypal_fee*t1.platform_sku_quantity_ordered) cost_paypal_fee,(t3.cost_fba_fee*t1.platform_sku_quantity_ordered) cost_fba_fee,(t3.cost_first*t1.platform_sku_quantity_ordered) cost_first,(t3.cost_logistics*t1.platform_sku_quantity_ordered) cost_logistics,(t3.cost_handle_platform*t1.platform_sku_quantity_ordered) cost_handle_platform,(t3.cost_handle_bailun*t1.platform_sku_quantity_ordered) cost_handle_bailun,t3.warehouse_code,t3.shipping_status,t3.seller_order_exchange_rate,t1.platform_type,t1.website,t1.bailun_account_id from dc_base_oms_platform_sku t1 listBaseOrder = cn.Query<dc_mid_itemno_profit_order>($@"select distinct t3.id as order_sku_id,t1.bailun_order_id,t1.origin_order_id,t1.item_id,t1.platform_sku,t1.platform_sku_quantity_ordered,t3.bailun_sku,t3.paid_time,(t3.amount_sales*t1.platform_sku_quantity_ordered) as amount_sales,(t3.cost_product*t1.platform_sku_quantity_ordered) cost_product,(t3.cost_platform_fee*t1.platform_sku_quantity_ordered) cost_platform_fee,(t3.cost_paypal_fee*t1.platform_sku_quantity_ordered) cost_paypal_fee,(t3.cost_fba_fee*t1.platform_sku_quantity_ordered) cost_fba_fee,(t3.cost_first*t1.platform_sku_quantity_ordered) cost_first,(t3.cost_logistics*t1.platform_sku_quantity_ordered) cost_logistics,(t3.cost_handle_platform*t1.platform_sku_quantity_ordered) cost_handle_platform,(t3.cost_handle_bailun*t1.platform_sku_quantity_ordered) cost_handle_bailun,t3.warehouse_code,t3.shipping_status,t3.seller_order_exchange_rate,t1.platform_type,t1.website,t1.bailun_account_id,t3.seller_other_exchange_rate from dc_base_oms_platform_sku t1
join dc_base_sku_mapping_online t2 on t1.item_id=t2.item_id and t2.item_sku=t1.platform_sku and t1.website=t2.site join dc_base_sku_mapping_online t2 on t1.item_id=t2.item_id and t2.item_sku=t1.platform_sku and t1.website=t2.site
join dc_base_oms_sku_30 t3 on t1.bailun_order_id=t3.bailun_order_id and t2.sku_code=t3.bailun_sku and t2.account_id=t3.bailun_account_id join dc_base_oms_sku_30 t3 on t1.bailun_order_id=t3.bailun_order_id and t2.sku_code=t3.bailun_sku and t2.account_id=t3.bailun_account_id
where t1.platform_type in ('Ebay','FBA','Amazon') and t3.has_delete=0 and t3.company_id=1 and t1.paid_time>='{start.AddHours(-16).ToString("yyyy-MM-dd")}' and t1.paid_time<'{end.AddHours(16).AddDays(1).ToString("yyyy-MM-dd")}'", null, null, true, 6 * 60).ToList(); where t1.platform_type in ('Ebay','FBA','Amazon') and t3.has_delete=0 and t3.company_id=1 and t1.paid_time>='{start.AddHours(-16).ToString("yyyy-MM-dd")}' and t1.paid_time<'{end.AddHours(16).AddDays(1).ToString("yyyy-MM-dd")}'", null, null, true, 6 * 60).ToList();
...@@ -92,7 +92,7 @@ namespace Bailun.DC.DailyItemNoProfitRate ...@@ -92,7 +92,7 @@ namespace Bailun.DC.DailyItemNoProfitRate
if(listBaseOrder.Count>0) if(listBaseOrder.Count>0)
{ {
var sql = $@"insert dc_mid_itemno_profit_order (day,order_sku_id,bailun_order_id,origin_order_id,item_id,platform_sku,platform_sku_quantity_ordered,count,bailun_sku,paid_time,amount_sales,cost_product,cost_platform_fee,cost_paypal_fee,cost_fba_fee,cost_first,cost_logistics,cost_handle_platform,cost_handle_bailun,warehouse_code,shipping_status,seller_order_exchange_rate,platform_type,website,bailun_account_id,platform_paid_time) values var sql = $@"insert dc_mid_itemno_profit_order (day,order_sku_id,bailun_order_id,origin_order_id,item_id,platform_sku,platform_sku_quantity_ordered,count,bailun_sku,paid_time,amount_sales,cost_product,cost_platform_fee,cost_paypal_fee,cost_fba_fee,cost_first,cost_logistics,cost_handle_platform,cost_handle_bailun,warehouse_code,shipping_status,seller_order_exchange_rate,platform_type,website,bailun_account_id,platform_paid_time,seller_other_exchange_rate) values
"; ";
...@@ -116,7 +116,7 @@ namespace Bailun.DC.DailyItemNoProfitRate ...@@ -116,7 +116,7 @@ namespace Bailun.DC.DailyItemNoProfitRate
//转换为平台站点时间 //转换为平台站点时间
var platform_paid_time = ToPlatformTime(item.website.ToUpper(),item.paid_time); var platform_paid_time = ToPlatformTime(item.website.ToUpper(),item.paid_time);
str += $"('{end.ToString("yyyy-MM-dd")}',{item.order_sku_id},'{item.bailun_order_id}','{item.origin_order_id}','{item.item_id}','{item.platform_sku}',{item.platform_sku_quantity_ordered},{item.count},'{item.bailun_sku}','{item.paid_time.ToString("yyyy-MM-dd HH:mm:ss")}',{item.amount_sales},{item.cost_product},{item.cost_platform_fee},{item.cost_paypal_fee},{item.cost_fba_fee},{item.cost_first},{item.cost_logistics},{item.cost_handle_platform},{item.cost_handle_bailun},'{item.warehouse_code}','{item.shipping_status}','{item.seller_order_exchange_rate}','{item.platform_type}','{item.website}','{item.bailun_account_id}','{platform_paid_time.ToString("yyyy-MM-dd HH:mm:ss")}'),"; str += $"('{end.ToString("yyyy-MM-dd")}',{item.order_sku_id},'{item.bailun_order_id}','{item.origin_order_id}','{item.item_id}','{item.platform_sku}',{item.platform_sku_quantity_ordered},{item.count},'{item.bailun_sku}','{item.paid_time.ToString("yyyy-MM-dd HH:mm:ss")}',{item.amount_sales},{item.cost_product},{item.cost_platform_fee},{item.cost_paypal_fee},{item.cost_fba_fee},{item.cost_first},{item.cost_logistics},{item.cost_handle_platform},{item.cost_handle_bailun},'{item.warehouse_code}','{item.shipping_status}','{item.seller_order_exchange_rate}','{item.platform_type}','{item.website}','{item.bailun_account_id}','{platform_paid_time.ToString("yyyy-MM-dd HH:mm:ss")}',{item.seller_other_exchange_rate}),";
if (index % 1000 == 0 || index == list.Count) if (index % 1000 == 0 || index == list.Count)
{ {
//保存数据 //保存数据
...@@ -224,7 +224,7 @@ namespace Bailun.DC.DailyItemNoProfitRate ...@@ -224,7 +224,7 @@ namespace Bailun.DC.DailyItemNoProfitRate
m.amount_sales = objOrders?.Sum(a => a.amount_sales * a.seller_order_exchange_rate) ?? 0; m.amount_sales = objOrders?.Sum(a => a.amount_sales * a.seller_order_exchange_rate) ?? 0;
m.amount_sales_ad_gmv = listItemAdGMV.Where(a => a.item_id == item)?.Sum(a => a.sales_amount * a.sales_rate) ?? 0; m.amount_sales_ad_gmv = listItemAdGMV.Where(a => a.item_id == item)?.Sum(a => a.sales_amount * a.sales_rate) ?? 0;
m.cost_ad = listAdEbay.Where(a => a.item_id == item)?.Sum(a => a.exchange_rate * a.gross_amount) ?? 0 + listAdAmazon.Where(a => a.asin == item)?.Sum(a => a.cost * a.exchange_rate) ?? 0; m.cost_ad = listAdEbay.Where(a => a.item_id == item)?.Sum(a => a.exchange_rate * a.gross_amount) ?? 0 + listAdAmazon.Where(a => a.asin == item)?.Sum(a => a.cost * a.exchange_rate) ?? 0;
m.cost_sales = objOrders?.Sum(a => a.cost_fba_fee * a.seller_order_exchange_rate + a.cost_first + a.cost_handle_bailun + a.cost_handle_platform + a.cost_logistics + a.cost_paypal_fee * a.seller_order_exchange_rate + a.cost_platform_fee * a.seller_order_exchange_rate + a.cost_product) ?? 0; m.cost_sales = objOrders?.Sum(a => a.cost_fba_fee * a.seller_order_exchange_rate + a.cost_first + a.cost_handle_bailun + a.cost_handle_platform + a.cost_logistics + a.cost_paypal_fee * a.seller_order_exchange_rate + (a.cost_platform_fee * (a.platform_type.ToLower()=="ebay"?a.seller_other_exchange_rate:a.seller_order_exchange_rate)) + a.cost_product) ?? 0;
//广告订单GMV占比 //广告订单GMV占比
objadrate = m.amount_sales > 0 ? m.amount_sales_ad_gmv / m.amount_sales : 0; objadrate = m.amount_sales > 0 ? m.amount_sales_ad_gmv / m.amount_sales : 0;
...@@ -351,7 +351,7 @@ namespace Bailun.DC.DailyItemNoProfitRate ...@@ -351,7 +351,7 @@ namespace Bailun.DC.DailyItemNoProfitRate
m.amount_sales = objOrders?.Sum(a => a.amount_sales * a.seller_order_exchange_rate) ?? 0; m.amount_sales = objOrders?.Sum(a => a.amount_sales * a.seller_order_exchange_rate) ?? 0;
m.amount_sales_ad_gmv = listItemAdGMV.Where(a => a.item_id == item)?.Sum(a => a.sales_amount * a.sales_rate) ?? 0; m.amount_sales_ad_gmv = listItemAdGMV.Where(a => a.item_id == item)?.Sum(a => a.sales_amount * a.sales_rate) ?? 0;
m.cost_ad = listAdEbay.Where(a => a.item_id == item)?.Sum(a => a.exchange_rate * a.gross_amount) ?? 0 + listAdAmazon.Where(a => a.asin == item)?.Sum(a => a.cost * a.exchange_rate) ?? 0; m.cost_ad = listAdEbay.Where(a => a.item_id == item)?.Sum(a => a.exchange_rate * a.gross_amount) ?? 0 + listAdAmazon.Where(a => a.asin == item)?.Sum(a => a.cost * a.exchange_rate) ?? 0;
m.cost_sales = objOrders?.Sum(a => a.cost_fba_fee * a.seller_order_exchange_rate + a.cost_first + a.cost_handle_bailun + a.cost_handle_platform + a.cost_logistics + a.cost_paypal_fee * a.seller_order_exchange_rate + a.cost_platform_fee * a.seller_order_exchange_rate + a.cost_product) ?? 0; m.cost_sales = objOrders?.Sum(a => a.cost_fba_fee * a.seller_order_exchange_rate + a.cost_first + a.cost_handle_bailun + a.cost_handle_platform + a.cost_logistics + a.cost_paypal_fee * a.seller_order_exchange_rate + (a.cost_platform_fee * (a.platform_type.ToLower() == "ebay" ? a.seller_other_exchange_rate : a.seller_order_exchange_rate)) + a.cost_product) ?? 0;
//广告订单GMV占比 //广告订单GMV占比
objadrate = m.amount_sales > 0 ? m.amount_sales_ad_gmv / m.amount_sales : 0; objadrate = m.amount_sales > 0 ? m.amount_sales_ad_gmv / m.amount_sales : 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