Commit 2c453bc8 by guanzhenshan

增加站点

parent 72718138
...@@ -17,6 +17,10 @@ namespace Bailun.DC.Models ...@@ -17,6 +17,10 @@ namespace Bailun.DC.Models
/// </summary> /// </summary>
public string platform_type { get; set; } public string platform_type { get; set; }
/// <summary>
/// 站点
/// </summary>
public string website { get; set; }
/// <summary> /// <summary>
/// 币种 /// 币种
......
...@@ -8,6 +8,8 @@ namespace Bailun.DC.MonthShippingIncoming.Model ...@@ -8,6 +8,8 @@ namespace Bailun.DC.MonthShippingIncoming.Model
{ {
public string platform_type { get; set; } public string platform_type { get; set; }
public string website { get; set; }
public string order_currency { get; set; } public string order_currency { get; set; }
public string financecategoryname { get; set; } public string financecategoryname { get; set; }
......
...@@ -55,7 +55,7 @@ namespace Bailun.DC.MonthShippingIncoming ...@@ -55,7 +55,7 @@ namespace Bailun.DC.MonthShippingIncoming
cn.Open(); cn.Open();
} }
var sql = $@"select sum(t2.amount_sales*t1.quantity_shipped) as amount_sales,if(t6.financecategoryname is null,'',t6.financecategoryname) as financecategoryname,t2.order_currency,t2.platform_type from dc_base_oms_pick t1 var sql = $@"select sum(t2.amount_sales*t1.quantity_shipped) as amount_sales,if(t6.financecategoryname is null,'',t6.financecategoryname) as financecategoryname,t2.order_currency,t2.platform_type,t2.website from dc_base_oms_pick t1
join dc_base_oms_sku t2 on t1.bailun_order_id = t2.bailun_order_id and t1.bailun_sku=t2.bailun_sku and t2.bailun_order_status != 'Canceled' and t2.has_scalp = 0 and ((t2.platform_type!='FBA' and t2.bailun_order_status!='CantHandle') or t2.platform_type='FBA') and t2.has_scalp = 0 and t2.has_innersale = 0 and t2.has_delete=0 and t2.company_id=1 join dc_base_oms_sku t2 on t1.bailun_order_id = t2.bailun_order_id and t1.bailun_sku=t2.bailun_sku and t2.bailun_order_status != 'Canceled' and t2.has_scalp = 0 and ((t2.platform_type!='FBA' and t2.bailun_order_status!='CantHandle') or t2.platform_type='FBA') and t2.has_scalp = 0 and t2.has_innersale = 0 and t2.has_delete=0 and t2.company_id=1
left join dc_base_sku t5 on t2.bailun_sku=t5.bailun_sku left join dc_base_sku t5 on t2.bailun_sku=t5.bailun_sku
left join dc_base_sku_finance_category t6 on t6.bailuncategoryid=t5.bailun_category_id left join dc_base_sku_finance_category t6 on t6.bailuncategoryid=t5.bailun_category_id
...@@ -72,17 +72,18 @@ namespace Bailun.DC.MonthShippingIncoming ...@@ -72,17 +72,18 @@ namespace Bailun.DC.MonthShippingIncoming
financecategoryname = item.financecategoryname, financecategoryname = item.financecategoryname,
month = day.ToString("yyyy-MM"), month = day.ToString("yyyy-MM"),
platform_type = item.platform_type, platform_type = item.platform_type,
website = item.website
}); });
} }
} }
if(list.Count>0) if(list.Count>0)
{ {
var sql = "insert dc_month_shipping_incoming (amount,createtime,currency,financecategoryname,month,platform_type) values "; var sql = "insert dc_month_shipping_incoming (amount,createtime,currency,financecategoryname,month,platform_type,website) values ";
foreach(var item in list) foreach(var item in list)
{ {
sql += $"({item.amount},'{item.createtime.ToString("yyyy-MM-dd HH:mm:ss")}','{item.currency}','{item.financecategoryname}','{item.month}','{item.platform_type}'),"; sql += $"({item.amount},'{item.createtime.ToString("yyyy-MM-dd HH:mm:ss")}','{item.currency}','{item.financecategoryname}','{item.month}','{item.platform_type}','{item.website}'),";
} }
sql = sql.Substring(0, sql.Length - 1); sql = sql.Substring(0, sql.Length - 1);
......
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