Skip to content

D
DataCenter_Core2.1_20190520
Commit 3af74199 by guanzhenshan
Options

订单数据增加公司id过滤

parent 04fc998f
Showing with 282 additions and 84 deletions
Bailun.DC.Services/OrdersServices.cs
...@@ -23,7 +23,7 @@ namespace Bailun.DC.Services ...@@ -23,7 +23,7 @@ namespace Bailun.DC.Services
/// <param name="end"></param> /// <param name="end"></param>
/// <param name="total"></param> /// <param name="total"></param>
/// <returns></returns> /// <returns></returns>
public List<dc_base_oms_order> ListPlatformCost(BtTableParameter parameter,string platform,DateTime? start,DateTime? end,string website,string account,string warehousetype,string warehousecode,ref int total) public List<dc_base_oms_order> ListPlatformCost(BtTableParameter parameter,string platform,DateTime? start,DateTime? end,string website,string account,string warehousetype,string warehousecode,int? companyid,ref int total)
{ {
var sql = "select t1.* from dc_base_oms_order t1"; var sql = "select t1.* from dc_base_oms_order t1";
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
...@@ -42,8 +42,13 @@ namespace Bailun.DC.Services ...@@ -42,8 +42,13 @@ namespace Bailun.DC.Services
sql += " group by tb.bailun_order_id limit 1) t2 on t1.bailun_order_id=t2.bailun_order_id "; sql += " group by tb.bailun_order_id limit 1) t2 on t1.bailun_order_id=t2.bailun_order_id ";
} }
sql += " where t1.bailun_order_status!='Canceled' and t1.bailun_order_status!='CantHandle' and t1.has_scalp=0 and t1.has_innersale=0"; sql += " where t1.bailun_order_status!='Canceled' and t1.bailun_order_status!='CantHandle' and t1.has_scalp=0 and t1.has_innersale=0 ";
if (companyid.HasValue && companyid.Value > 0)
{
sql += "and t1.company_id = " + companyid.Value; //增加公司id判断
}
if (!string.IsNullOrEmpty(platform)) if (!string.IsNullOrEmpty(platform))
{ {
sql += " and t1.platform_type=@platform_type"; sql += " and t1.platform_type=@platform_type";
...@@ -90,7 +95,7 @@ namespace Bailun.DC.Services ...@@ -90,7 +95,7 @@ namespace Bailun.DC.Services
} }
} }
public dc_base_oms_order ListPlatformCostCount(string platform, DateTime? start, DateTime? end, string website, string account,string warehousetype,string warehousecode) public dc_base_oms_order ListPlatformCostCount(string platform, DateTime? start, DateTime? end, string website, string account,string warehousetype,string warehousecode,int? companyid)
{ {
var sql = "select sum(amount_sales*seller_order_exchange_rate) amount_sales,sum((if(platform_type='Ebay',seller_other_exchange_rate,seller_order_exchange_rate))*cost_platform_fee) as cost_platform_fee,sum(cost_fba_fee*seller_order_exchange_rate) cost_fba_fee,sum(cost_promotion*seller_order_exchange_rate) cost_promotion,sum(cost_paypal_fee*seller_order_exchange_rate) cost_paypal_fee,sum(cost_tail) cost_tail,sum(cost_handle_bailun) cost_handle_bailun,sum(amount_shipping*seller_order_exchange_rate) amount_shipping from dc_base_oms_order t1 "; var sql = "select sum(amount_sales*seller_order_exchange_rate) amount_sales,sum((if(platform_type='Ebay',seller_other_exchange_rate,seller_order_exchange_rate))*cost_platform_fee) as cost_platform_fee,sum(cost_fba_fee*seller_order_exchange_rate) cost_fba_fee,sum(cost_promotion*seller_order_exchange_rate) cost_promotion,sum(cost_paypal_fee*seller_order_exchange_rate) cost_paypal_fee,sum(cost_tail) cost_tail,sum(cost_handle_bailun) cost_handle_bailun,sum(amount_shipping*seller_order_exchange_rate) amount_shipping from dc_base_oms_order t1 ";
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
...@@ -111,6 +116,11 @@ namespace Bailun.DC.Services ...@@ -111,6 +116,11 @@ namespace Bailun.DC.Services
sql += " where t1.bailun_order_status!='Canceled' and t1.bailun_order_status!='CantHandle' and t1.has_scalp=0 and t1.has_innersale=0"; sql += " where t1.bailun_order_status!='Canceled' and t1.bailun_order_status!='CantHandle' and t1.has_scalp=0 and t1.has_innersale=0";
if(companyid.HasValue && companyid.Value>0)
{
sql += "and t1.company_id = " + companyid.Value; //增加公司id判断
}
if (!string.IsNullOrEmpty(platform)) if (!string.IsNullOrEmpty(platform))
{ {
sql += " and platform_type=@platform_type"; sql += " and platform_type=@platform_type";
...@@ -166,7 +176,7 @@ namespace Bailun.DC.Services ...@@ -166,7 +176,7 @@ namespace Bailun.DC.Services
/// <param name="end">付款结束时间</param> /// <param name="end">付款结束时间</param>
/// <param name="total">符合条件的记录数</param> /// <param name="total">符合条件的记录数</param>
/// <returns></returns> /// <returns></returns>
public List<dc_base_oms_order> ListAmazonStatistics(BtTableParameter parameter, string account, string website, DateTime start, DateTime end,string warehoursetype,string warehousecode, ref int total) public List<dc_base_oms_order> ListAmazonStatistics(BtTableParameter parameter, string account, string website, DateTime start, DateTime end,string warehoursetype,string warehousecode,int? companyid, ref int total)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
...@@ -195,23 +205,27 @@ namespace Bailun.DC.Services ...@@ -195,23 +205,27 @@ namespace Bailun.DC.Services
} }
} }
var fromsql = " where paid_time>='" + start.ToString("yyyy-MM-dd") + "' and paid_time<'" + end.AddDays(1).ToString("yyyy-MM-dd") + "' and platform_type='Amazon' and bailun_order_status!='Canceled' and has_scalp=0 and has_innersale=0 "; var fromsql = " where t1.paid_time>='" + start.ToString("yyyy-MM-dd") + "' and t1.paid_time<'" + end.AddDays(1).ToString("yyyy-MM-dd") + "' and t1.platform_type='Amazon' and t1.bailun_order_status!='Canceled' and t1.has_scalp=0 and t1.has_innersale=0 ";
if (companyid.HasValue && companyid.Value > 0)
{
fromsql += "and t1.company_id = " + companyid.Value; //增加公司id判断
}
if (!string.IsNullOrWhiteSpace(account)) if (!string.IsNullOrWhiteSpace(account))
{ {
fromsql += " and seller_account=@seller_account"; fromsql += " and t1.seller_account=@seller_account";
sqlparam.Add("seller_account", account); sqlparam.Add("seller_account", account);
} }
if (!string.IsNullOrWhiteSpace(website)) if (!string.IsNullOrWhiteSpace(website))
{ {
fromsql += " and website=@website"; fromsql += " and t1.website=@website";
sqlparam.Add("website", website); sqlparam.Add("website", website);
} }
var prefromsql = fromsql; var prefromsql = fromsql;
fromsql += " and t1.bailun_payment_status!='Canceled' and t1.bailun_order_status!='CantHandle'"; fromsql += " and t1.bailun_payment_status!='Canceled' and t1.bailun_order_status!='CantHandle'";
fromsql += " group by seller_account,website,platform_type"; fromsql += " group by t1.seller_account,t1.website,t1.platform_type";
if (!string.IsNullOrWhiteSpace(parameter.sort)) if (!string.IsNullOrWhiteSpace(parameter.sort))
{ {
...@@ -259,7 +273,7 @@ namespace Bailun.DC.Services ...@@ -259,7 +273,7 @@ namespace Bailun.DC.Services
/// <param name="end">付款结束时间</param> /// <param name="end">付款结束时间</param>
/// <param name="total">符合条件的记录数</param> /// <param name="total">符合条件的记录数</param>
/// <returns></returns> /// <returns></returns>
public dc_base_oms_order ListAmazonStatisticsCount(string account, string website, DateTime start, DateTime end,string warehoursetype,string warehousecode) public dc_base_oms_order ListAmazonStatisticsCount(string account, string website, DateTime start, DateTime end,string warehoursetype,string warehousecode,int? companyid)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
...@@ -288,17 +302,22 @@ namespace Bailun.DC.Services ...@@ -288,17 +302,22 @@ namespace Bailun.DC.Services
} }
} }
var fromsql = " where paid_time>='" + start.ToString("yyyy-MM-dd") + "' and paid_time<'" + end.AddDays(1).ToString("yyyy-MM-dd") + "' and platform_type='Amazon' and bailun_order_status!='Canceled' and has_scalp=0 and has_innersale=0 "; var fromsql = " where t1.paid_time>='" + start.ToString("yyyy-MM-dd") + "' and t1.paid_time<'" + end.AddDays(1).ToString("yyyy-MM-dd") + "' and t1.platform_type='Amazon' and t1.bailun_order_status!='Canceled' and t1.has_scalp=0 and t1.has_innersale=0 ";
if (companyid.HasValue && companyid.Value > 0)
{
fromsql += " t1.company_id="+companyid.Value; //增加公司id过滤
}
if (!string.IsNullOrWhiteSpace(account)) if (!string.IsNullOrWhiteSpace(account))
{ {
fromsql += " and seller_account=@seller_account"; fromsql += " and t1.seller_account=@seller_account";
sqlparam.Add("seller_account", account); sqlparam.Add("seller_account", account);
} }
if (!string.IsNullOrWhiteSpace(website)) if (!string.IsNullOrWhiteSpace(website))
{ {
fromsql += " and website=@website"; fromsql += " and t1.website=@website";
sqlparam.Add("website", website); sqlparam.Add("website", website);
} }
...@@ -336,7 +355,7 @@ namespace Bailun.DC.Services ...@@ -336,7 +355,7 @@ namespace Bailun.DC.Services
/// <param name="end">付款结束时间</param> /// <param name="end">付款结束时间</param>
/// <param name="total">符合条件的记录数</param> /// <param name="total">符合条件的记录数</param>
/// <returns></returns> /// <returns></returns>
public List<Models.Orders.mAmazonStatistics> ListFBAStatistics(BtTableParameter parameter, string account, string website, DateTime start, DateTime end, ref int total) public List<Models.Orders.mAmazonStatistics> ListFBAStatistics(BtTableParameter parameter, string account, string website, DateTime start, DateTime end,int? companyid, ref int total)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
...@@ -355,6 +374,11 @@ namespace Bailun.DC.Services ...@@ -355,6 +374,11 @@ namespace Bailun.DC.Services
sqlparam.Add("website", website); sqlparam.Add("website", website);
} }
if (companyid.HasValue && companyid.Value > 0)
{
sql += " and company_id=" + companyid.Value; //增加公司id过滤
}
sql += " group by seller_account,website,platform_type"; sql += " group by seller_account,website,platform_type";
if (!string.IsNullOrWhiteSpace(parameter.sort)) if (!string.IsNullOrWhiteSpace(parameter.sort))
...@@ -384,7 +408,7 @@ namespace Bailun.DC.Services ...@@ -384,7 +408,7 @@ namespace Bailun.DC.Services
/// <param name="website">站点</param> /// <param name="website">站点</param>
/// <param name="start">付款开始时间</param> /// <param name="start">付款开始时间</param>
/// <param name="end">付款结束时间</param> /// <param name="end">付款结束时间</param>
public Models.Orders.mAmazonStatistics ListFBAStatisticsCount(string account, string website, DateTime start, DateTime end) public Models.Orders.mAmazonStatistics ListFBAStatisticsCount(string account, string website, DateTime start, DateTime end,int? companyid)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
...@@ -401,6 +425,12 @@ namespace Bailun.DC.Services ...@@ -401,6 +425,12 @@ namespace Bailun.DC.Services
sql += " and website=@website"; sql += " and website=@website";
sqlparam.Add("website", website); sqlparam.Add("website", website);
} }
if (companyid.HasValue && companyid.Value > 0)
{
sql += " and company_id" + companyid.Value;
}
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString)) using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
{ {
...@@ -430,13 +460,18 @@ namespace Bailun.DC.Services ...@@ -430,13 +460,18 @@ namespace Bailun.DC.Services
/// <param name="sku">sku编码</param> /// <param name="sku">sku编码</param>
/// <param name="total">符合条件的记录数</param> /// <param name="total">符合条件的记录数</param>
/// <returns></returns> /// <returns></returns>
public List<Models.Orders.dc_base_oms_order> ListOrders(BtTableParameter parameter, string platform, string website, string account, DateTime? start, DateTime? end, string orderno, string sku, ref int total) public List<Models.Orders.dc_base_oms_order> ListOrders(BtTableParameter parameter, string platform, string website, string account, DateTime? start, DateTime? end, string orderno, string sku,int? companyid, ref int total)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
var sql = "select t1.origin_order_id,t1.platform_type,t1.website,t1.seller_account,t1.platform_order_type,t1.bailun_order_status,t1.bailun_payment_status,t1.bailun_shipping_status,t1.order_currency,(t1.amount_total*t1.seller_order_exchange_rate) amount_total,(t1.amount_shipping*t1.seller_order_exchange_rate) amount_shipping,(t1.amount_product*t1.seller_order_exchange_rate) amount_product,(t1.amount_adjustment*t1.seller_order_exchange_rate) amount_adjustment,(t1.cost_promotion*t1.seller_order_exchange_rate) cost_promotion,((if(t1.platform_type='Ebay',t1.seller_other_exchange_rate,t1.seller_order_exchange_rate))*t1.cost_platform_fee) cost_platform_fee,t1.cost_product,t1.cost_first,t1.cost_package,(t1.cost_fba_fee*t1.seller_order_exchange_rate) cost_fba_fee,t1.cost_total,(t1.profit_total) profit_total,t1.profit_rate,t1.create_time,t1.order_update_time from dc_base_oms_order t1"; var sql = "select t1.origin_order_id,t1.platform_type,t1.website,t1.seller_account,t1.platform_order_type,t1.bailun_order_status,t1.bailun_payment_status,t1.bailun_shipping_status,t1.order_currency,(t1.amount_total*t1.seller_order_exchange_rate) amount_total,(t1.amount_shipping*t1.seller_order_exchange_rate) amount_shipping,(t1.amount_product*t1.seller_order_exchange_rate) amount_product,(t1.amount_adjustment*t1.seller_order_exchange_rate) amount_adjustment,(t1.cost_promotion*t1.seller_order_exchange_rate) cost_promotion,((if(t1.platform_type='Ebay',t1.seller_other_exchange_rate,t1.seller_order_exchange_rate))*t1.cost_platform_fee) cost_platform_fee,t1.cost_product,t1.cost_first,t1.cost_package,(t1.cost_fba_fee*t1.seller_order_exchange_rate) cost_fba_fee,t1.cost_total,(t1.profit_total) profit_total,t1.profit_rate,t1.create_time,t1.order_update_time from dc_base_oms_order t1";
var strwhere = " where t1.bailun_order_status!='Canceled' and t1.bailun_order_status!='CantHandle' and t1.has_scalp=0 and t1.has_innersale=0 "; var strwhere = " where t1.bailun_order_status!='Canceled' and t1.bailun_order_status!='CantHandle' and t1.has_scalp=0 and t1.has_innersale=0 ";
if (companyid.HasValue && companyid.Value>0)
{
strwhere += " and t1.company_id=" + companyid.Value; //增加公司id过滤
}
if (!string.IsNullOrWhiteSpace(platform)) if (!string.IsNullOrWhiteSpace(platform))
{ {
if (platform.ToUpper() == "AMAZON") if (platform.ToUpper() == "AMAZON")
...@@ -529,13 +564,18 @@ namespace Bailun.DC.Services ...@@ -529,13 +564,18 @@ namespace Bailun.DC.Services
/// <param name="orderno">平台单号</param> /// <param name="orderno">平台单号</param>
/// <param name="sku">sku编码</param> /// <param name="sku">sku编码</param>
/// <returns></returns> /// <returns></returns>
public Models.Orders.dc_base_oms_order ListOrdersCount(string platform, string website, string account, DateTime? start, DateTime? end, string orderno, string sku) public Models.Orders.dc_base_oms_order ListOrdersCount(string platform, string website, string account, DateTime? start, DateTime? end, string orderno, string sku,int? companyid)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
var sql = "select sum(t1.amount_total*seller_order_exchange_rate) amount_total,sum(t1.amount_shipping*seller_order_exchange_rate) amount_shipping,sum(t1.amount_product*seller_order_exchange_rate) amount_product,sum(t1.amount_adjustment*seller_order_exchange_rate) amount_adjustment,sum(t1.cost_promotion*seller_order_exchange_rate) cost_promotion,sum((if(t1.platform_type='FBA',t1.seller_other_exchange_rate,t1.seller_order_exchange_rate))*t1.cost_platform_fee) cost_platform_fee,sum(t1.cost_product) cost_product,sum(t1.cost_first) cost_first,sum(t1.cost_package) cost_package,sum(t1.cost_fba_fee*seller_order_exchange_rate) cost_fba_fee,sum(t1.cost_total) cost_total,sum(t1.profit_total) profit_total from dc_base_oms_order t1"; var sql = "select sum(t1.amount_total*seller_order_exchange_rate) amount_total,sum(t1.amount_shipping*seller_order_exchange_rate) amount_shipping,sum(t1.amount_product*seller_order_exchange_rate) amount_product,sum(t1.amount_adjustment*seller_order_exchange_rate) amount_adjustment,sum(t1.cost_promotion*seller_order_exchange_rate) cost_promotion,sum((if(t1.platform_type='FBA',t1.seller_other_exchange_rate,t1.seller_order_exchange_rate))*t1.cost_platform_fee) cost_platform_fee,sum(t1.cost_product) cost_product,sum(t1.cost_first) cost_first,sum(t1.cost_package) cost_package,sum(t1.cost_fba_fee*seller_order_exchange_rate) cost_fba_fee,sum(t1.cost_total) cost_total,sum(t1.profit_total) profit_total from dc_base_oms_order t1";
var strwhere = " where t1.bailun_order_status!='Canceled' and t1.bailun_order_status!='CantHandle' and t1.has_scalp=0 and t1.has_innersale=0 "; var strwhere = " where t1.bailun_order_status!='Canceled' and t1.bailun_order_status!='CantHandle' and t1.has_scalp=0 and t1.has_innersale=0 ";
if (companyid.HasValue && companyid.Value > 0)
{
strwhere += " and t1.company_id=" + companyid.Value; //增加公司id过滤
}
if (!string.IsNullOrWhiteSpace(platform)) if (!string.IsNullOrWhiteSpace(platform))
{ {
if (platform.ToUpper() == "AMAZON") if (platform.ToUpper() == "AMAZON")
...@@ -622,7 +662,7 @@ namespace Bailun.DC.Services ...@@ -622,7 +662,7 @@ namespace Bailun.DC.Services
/// <param name="orderno">订单号</param> /// <param name="orderno">订单号</param>
/// <param name="total">符合条件的记录数</param> /// <param name="total">符合条件的记录数</param>
/// <returns></returns> /// <returns></returns>
public List<Models.Orders.dc_base_oms_sku> ListFinanceFee(BtTableParameter parameter,string platform, int feetype, int feecharacter, string account, DateTime? start, DateTime? end, string orderno, ref int total) public List<Models.Orders.dc_base_oms_sku> ListFinanceFee(BtTableParameter parameter,string platform, int feetype, int feecharacter, string account, DateTime? start, DateTime? end, string orderno,int? companyid, ref int total)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
var sql = "select origin_order_id,platform_type,website,seller_account,platform_order_type,bailun_sku,amount_product,cost_first,amount_shipping,cost_promotion,cost_shipping,cost_fba_fee,cost_platform_fee,cost_package,amount_total,cost_total+cost_shipping as cost_total,paid_time,seller_order_exchange_rate,finance_order_exchange_rate from dc_base_oms_sku where bailun_order_status!='Canceled' and bailun_order_status!='CantHandle' and has_scalp=0 and has_innersale=0 "; var sql = "select origin_order_id,platform_type,website,seller_account,platform_order_type,bailun_sku,amount_product,cost_first,amount_shipping,cost_promotion,cost_shipping,cost_fba_fee,cost_platform_fee,cost_package,amount_total,cost_total+cost_shipping as cost_total,paid_time,seller_order_exchange_rate,finance_order_exchange_rate from dc_base_oms_sku where bailun_order_status!='Canceled' and bailun_order_status!='CantHandle' and has_scalp=0 and has_innersale=0 ";
...@@ -665,6 +705,11 @@ namespace Bailun.DC.Services ...@@ -665,6 +705,11 @@ namespace Bailun.DC.Services
sqlparam.Add("paid_time_end", end.Value.AddDays(1)); sqlparam.Add("paid_time_end", end.Value.AddDays(1));
} }
if (companyid.HasValue && companyid.Value > 0)
{
sql += " and company_id=" + companyid.Value; //增加公司id过滤
}
if (!string.IsNullOrWhiteSpace(parameter.sort)) if (!string.IsNullOrWhiteSpace(parameter.sort))
{ {
sql += " order by t1." + parameter.sort; sql += " order by t1." + parameter.sort;
...@@ -700,11 +745,16 @@ namespace Bailun.DC.Services ...@@ -700,11 +745,16 @@ namespace Bailun.DC.Services
/// <param name="end">付款结束时间</param> /// <param name="end">付款结束时间</param>
/// <param name="orderno">订单号</param> /// <param name="orderno">订单号</param>
/// <returns></returns> /// <returns></returns>
public Models.Orders.dc_base_oms_sku ListFinanceFeeCount(string platform, int feetype, int feecharacter, string account, DateTime? start, DateTime? end, string orderno) public Models.Orders.dc_base_oms_sku ListFinanceFeeCount(string platform, int feetype, int feecharacter, string account, DateTime? start, DateTime? end, string orderno,int? companyid)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
var sql = "select sum(amount_product) amount_product,sum(cost_first) cost_first,sum(amount_shipping) amount_shipping,sum(cost_promotion) cost_promotion,sum(cost_shipping) cost_shipping,sum(cost_fba_fee) cost_fba_fee,sum(cost_platform_fee) cost_platform_fee,sum(cost_package) cost_package,sum(amount_total) amount_total,sum(cost_total+cost_shipping) as cost_total from dc_base_oms_sku where bailun_order_status!='Canceled' and bailun_order_status!='CantHandle' and has_scalp=0 and has_innersale=0 "; var sql = "select sum(amount_product) amount_product,sum(cost_first) cost_first,sum(amount_shipping) amount_shipping,sum(cost_promotion) cost_promotion,sum(cost_shipping) cost_shipping,sum(cost_fba_fee) cost_fba_fee,sum(cost_platform_fee) cost_platform_fee,sum(cost_package) cost_package,sum(amount_total) amount_total,sum(cost_total+cost_shipping) as cost_total from dc_base_oms_sku where bailun_order_status!='Canceled' and bailun_order_status!='CantHandle' and has_scalp=0 and has_innersale=0 ";
if (companyid.HasValue && companyid.Value > 0)
{
sql += " and company_id=" + companyid.Value; //增加公司id过滤
}
if (!string.IsNullOrWhiteSpace(platform)) if (!string.IsNullOrWhiteSpace(platform))
{ {
if (platform.ToUpper() == "AMAZON") if (platform.ToUpper() == "AMAZON")
...@@ -774,11 +824,16 @@ namespace Bailun.DC.Services ...@@ -774,11 +824,16 @@ namespace Bailun.DC.Services
/// <param name="orderno"></param> /// <param name="orderno"></param>
/// <param name="total"></param> /// <param name="total"></param>
/// <returns></returns> /// <returns></returns>
public List<Models.Orders.mFBAAbnormalOrder> ListFbaAbnormalOrder(BtTableParameter parameter, string account, string website, DateTime? start, DateTime? end, string orderno, ref int total) public List<Models.Orders.mFBAAbnormalOrder> ListFbaAbnormalOrder(BtTableParameter parameter, string account, string website, DateTime? start, DateTime? end, string orderno,int? companyid, ref int total)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
var strwhere = "select t1.origin_order_id,t1.platform_type,t1.website,t1.seller_account,t1.bailun_sku,t1.order_currency,t1.cost_fba_fee,(t1.fba_fee_rmb*t1.seller_order_exchange_rate) fba_fee_rmb,t2.average_fba_fee,t2.min_fba_fee,t2.max_fba_fee,t1.create_time,t1.seller_order_exchange_rate from dc_base_oms_sku t1 join dc_mid_fba_fee_avg t2 on t1.bailun_sku=t2.bailun_sku and t1.website=t2.website where t1.bailun_order_status!='Canceled' and t1.bailun_order_status!='CantHandle' and t1.has_scalp=0 and t1.has_innersale=0 and t1.platform_type in ('Amazon','FBA') and t1.has_fba_exception=1"; var strwhere = "select t1.origin_order_id,t1.platform_type,t1.website,t1.seller_account,t1.bailun_sku,t1.order_currency,t1.cost_fba_fee,(t1.fba_fee_rmb*t1.seller_order_exchange_rate) fba_fee_rmb,t2.average_fba_fee,t2.min_fba_fee,t2.max_fba_fee,t1.create_time,t1.seller_order_exchange_rate from dc_base_oms_sku t1 join dc_mid_fba_fee_avg t2 on t1.bailun_sku=t2.bailun_sku and t1.website=t2.website where t1.bailun_order_status!='Canceled' and t1.bailun_order_status!='CantHandle' and t1.has_scalp=0 and t1.has_innersale=0 and t1.platform_type in ('Amazon','FBA') and t1.has_fba_exception=1";
if (companyid.HasValue && companyid.Value > 0)
{
strwhere += " and t1.company_id=" + companyid.Value; //增加公司id过滤
}
if (!string.IsNullOrWhiteSpace(website)) if (!string.IsNullOrWhiteSpace(website))
{ {
strwhere += " and t1.website=@website"; strwhere += " and t1.website=@website";
...@@ -833,11 +888,16 @@ namespace Bailun.DC.Services ...@@ -833,11 +888,16 @@ namespace Bailun.DC.Services
} }
public List<Models.Orders.dc_base_oms_order> ListPlatformFeeAbnormal(BtTableParameter parameter, string platform, string account, string website, string orderno, DateTime? start, DateTime? end, ref int total) public List<Models.Orders.dc_base_oms_order> ListPlatformFeeAbnormal(BtTableParameter parameter, string platform, string account, string website, string orderno, DateTime? start, DateTime? end,int? companyid, ref int total)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
var strwhere = "select origin_order_id,bailun_order_id,seller_account,amount_product,cost_platform_fee,(cost_platform_fee/amount_product) platform_fee_rate,platform_type,website,create_time from dc_base_oms_order where bailun_order_status!='Canceled' and bailun_order_status!='CantHandle' and has_scalp=0 and has_innersale=0 and has_platform_exception=1 "; var strwhere = "select origin_order_id,bailun_order_id,seller_account,amount_product,cost_platform_fee,(cost_platform_fee/amount_product) platform_fee_rate,platform_type,website,create_time from dc_base_oms_order where bailun_order_status!='Canceled' and bailun_order_status!='CantHandle' and has_scalp=0 and has_innersale=0 and has_platform_exception=1 ";
if (companyid.HasValue && companyid.Value > 0)
{
strwhere += " and company_id=" + companyid.Value; //增加公司id过滤
}
if (!string.IsNullOrWhiteSpace(platform)) if (!string.IsNullOrWhiteSpace(platform))
{ {
if (platform.ToUpper() == "AMAZON") if (platform.ToUpper() == "AMAZON")
...@@ -917,11 +977,16 @@ namespace Bailun.DC.Services ...@@ -917,11 +977,16 @@ namespace Bailun.DC.Services
/// <param name="start"></param> /// <param name="start"></param>
/// <param name="end"></param> /// <param name="end"></param>
/// <returns></returns> /// <returns></returns>
public Models.Orders.dc_base_oms_order ListPlatformFeeAbnormalCount(string platform, string account, string website, string orderno, DateTime? start, DateTime? end) public Models.Orders.dc_base_oms_order ListPlatformFeeAbnormalCount(string platform, string account, string website, string orderno, DateTime? start, DateTime? end,int? companyid)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
var strwhere = "select sum(amount_product) amount_product,sum(cost_platform_fee) cost_platform_fee from dc_base_oms_order where bailun_order_status!='Canceled' and bailun_order_status!='CantHandle' and has_scalp=0 and has_innersale=0 and has_platform_exception=1 "; var strwhere = "select sum(amount_product) amount_product,sum(cost_platform_fee) cost_platform_fee from dc_base_oms_order where bailun_order_status!='Canceled' and bailun_order_status!='CantHandle' and has_scalp=0 and has_innersale=0 and has_platform_exception=1 ";
if (companyid.HasValue && companyid.Value > 0)
{
strwhere += " and company_id=" + companyid.Value; //增加公司id过滤
}
if (!string.IsNullOrWhiteSpace(platform)) if (!string.IsNullOrWhiteSpace(platform))
{ {
if (platform.ToUpper() == "AMAZON") if (platform.ToUpper() == "AMAZON")
...@@ -987,7 +1052,7 @@ namespace Bailun.DC.Services ...@@ -987,7 +1052,7 @@ namespace Bailun.DC.Services
/// <param name="start">付款开始时间</param> /// <param name="start">付款开始时间</param>
/// <param name="end">付款结束时间</param> /// <param name="end">付款结束时间</param>
/// <returns></returns> /// <returns></returns>
public List<Models.Orders.dc_base_oms_sku> ListPlatformProfit(string platform, DateTime? start, DateTime? end,DateTime? shipstart,DateTime? shipend,bool isUSD, int companyid) public List<Models.Orders.dc_base_oms_sku> ListPlatformProfit(string platform, DateTime? start, DateTime? end,DateTime? shipstart,DateTime? shipend,bool isUSD, int? companyid)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
var sql = "select tb.platform_type,count(tb.bailun_order_id) order_count,sum(tb.amount_sales*"+(isUSD? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + ") as amount_sales,sum(tb.cost_platform_fee*(if(tb.platform_type='Ebay'," + (isUSD ? "tb.other_to_usd_exchange_rate" : "tb.seller_other_exchange_rate") + "," + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + "))) as cost_platform_fee,sum(cost_first*"+ (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") as cost_first,sum(cost_tail*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_tail,sum(cost_handle_bailun*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_handle_bailun,sum(cost_handle_platform*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_handle_platform,sum(amount_refund*" + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + ") amount_refund,sum(cost_product*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_product,sum(profit_total*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") profit_total,(sum(profit_total*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ")/sum(tb.amount_sales*" + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + ")) profit_rate,count(amount_prepaid>0 or null) as noshippingcount,sum(amount_prepaid*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") amount_prepaid from dc_base_oms_order tb "; var sql = "select tb.platform_type,count(tb.bailun_order_id) order_count,sum(tb.amount_sales*"+(isUSD? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + ") as amount_sales,sum(tb.cost_platform_fee*(if(tb.platform_type='Ebay'," + (isUSD ? "tb.other_to_usd_exchange_rate" : "tb.seller_other_exchange_rate") + "," + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + "))) as cost_platform_fee,sum(cost_first*"+ (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") as cost_first,sum(cost_tail*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_tail,sum(cost_handle_bailun*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_handle_bailun,sum(cost_handle_platform*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_handle_platform,sum(amount_refund*" + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + ") amount_refund,sum(cost_product*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_product,sum(profit_total*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") profit_total,(sum(profit_total*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ")/sum(tb.amount_sales*" + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + ")) profit_rate,count(amount_prepaid>0 or null) as noshippingcount,sum(amount_prepaid*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") amount_prepaid from dc_base_oms_order tb ";
...@@ -998,7 +1063,11 @@ namespace Bailun.DC.Services ...@@ -998,7 +1063,11 @@ namespace Bailun.DC.Services
} }
sql += " where tb.bailun_order_status!='Canceled' and tb.bailun_order_status!='CantHandle' and tb.has_scalp=0 and tb.has_innersale=0 "; sql += " where tb.bailun_order_status!='Canceled' and tb.bailun_order_status!='CantHandle' and tb.has_scalp=0 and tb.has_innersale=0 ";
//sql += " and tb.company_id=" + companyid; //按公司区分
if (companyid.HasValue && companyid.Value > 0)
{
sql += " and tb.company_id=" + companyid.Value; //增加公司id过滤
}
if (!string.IsNullOrWhiteSpace(platform)) if (!string.IsNullOrWhiteSpace(platform))
{ {
...@@ -1052,7 +1121,7 @@ namespace Bailun.DC.Services ...@@ -1052,7 +1121,7 @@ namespace Bailun.DC.Services
/// <param name="shipstart">发货开始时间</param> /// <param name="shipstart">发货开始时间</param>
/// <param name="shipend">发货结束时间</param> /// <param name="shipend">发货结束时间</param>
/// <returns></returns> /// <returns></returns>
public List<Models.Orders.dc_base_oms_sku> ListPlatformProfitByShipTime(string platform, DateTime? start, DateTime? end, DateTime? shipstart, DateTime? shipend, bool isUSD,int companyid) public List<Models.Orders.dc_base_oms_sku> ListPlatformProfitByShipTime(string platform, DateTime? start, DateTime? end, DateTime? shipstart, DateTime? shipend, bool isUSD,int? companyid)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
var sql = "select tb.platform_type,count(tb.bailun_order_id) order_count,sum(tb.amount_sales*" + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + ") as amount_sales,sum(tb.cost_platform_fee*(if(tb.platform_type='Ebay'," + (isUSD ? "tb.other_to_usd_exchange_rate" : "tb.seller_other_exchange_rate") + "," + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + "))) as cost_platform_fee,sum(cost_first*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") as cost_first,sum(cost_tail*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_tail,sum(cost_handle_bailun*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_handle_bailun,sum(cost_handle_platform*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_handle_platform,sum(amount_refund*" + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + ") amount_refund,sum(cost_product*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_product,sum(profit_total*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") profit_total,(sum(profit_total*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ")/sum(tb.amount_sales*" + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + ")) profit_rate,count(amount_prepaid>0 or null) as noshippingcount,sum(amount_prepaid*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") amount_prepaid from dc_base_oms_order tb "; var sql = "select tb.platform_type,count(tb.bailun_order_id) order_count,sum(tb.amount_sales*" + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + ") as amount_sales,sum(tb.cost_platform_fee*(if(tb.platform_type='Ebay'," + (isUSD ? "tb.other_to_usd_exchange_rate" : "tb.seller_other_exchange_rate") + "," + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + "))) as cost_platform_fee,sum(cost_first*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") as cost_first,sum(cost_tail*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_tail,sum(cost_handle_bailun*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_handle_bailun,sum(cost_handle_platform*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_handle_platform,sum(amount_refund*" + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + ") amount_refund,sum(cost_product*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_product,sum(profit_total*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") profit_total,(sum(profit_total*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ")/sum(tb.amount_sales*" + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + ")) profit_rate,count(amount_prepaid>0 or null) as noshippingcount,sum(amount_prepaid*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") amount_prepaid from dc_base_oms_order tb ";
...@@ -1071,13 +1140,20 @@ namespace Bailun.DC.Services ...@@ -1071,13 +1140,20 @@ namespace Bailun.DC.Services
sql += " and shipping_time<'"+shipend.Value.AddDays(1).ToString("yyyy-MM-dd")+"'"; sql += " and shipping_time<'"+shipend.Value.AddDays(1).ToString("yyyy-MM-dd")+"'";
} }
//sql += " company_id="+companyid; //按公司区分 if (companyid.HasValue && companyid.Value > 0)
{
sql += " and company_id=" + companyid.Value; //增加公司id过滤
}
sql += " group by bailun_order_id "; sql += " group by bailun_order_id ";
sql += " ) t2 on tb.bailun_order_id=t2.bailun_order_id "; sql += " ) t2 on tb.bailun_order_id=t2.bailun_order_id ";
sql += " where tb.bailun_order_status!='Canceled' and tb.has_scalp=0 and tb.bailun_order_status!='CantHandle' and tb.has_scalp=0 and tb.has_innersale=0 "; sql += " where tb.bailun_order_status!='Canceled' and tb.has_scalp=0 and tb.bailun_order_status!='CantHandle' and tb.has_scalp=0 and tb.has_innersale=0 ";
//sql += " and tb.company_id=" + companyid; //按公司区分
if (companyid.HasValue && companyid.Value > 0)
{
sql += " and tb.company_id=" + companyid.Value; //增加公司id过滤
}
if (!string.IsNullOrWhiteSpace(platform)) if (!string.IsNullOrWhiteSpace(platform))
{ {
...@@ -1120,13 +1196,18 @@ namespace Bailun.DC.Services ...@@ -1120,13 +1196,18 @@ namespace Bailun.DC.Services
/// <param name="parameter"></param> /// <param name="parameter"></param>
/// <param name="total"></param> /// <param name="total"></param>
/// <returns></returns> /// <returns></returns>
public List<Models.Orders.mPlatformProfit> ListPlatformProfitByWebSite(string platform, DateTime? start, DateTime? end, BtTableParameter parameter, ref int total) public List<Models.Orders.mPlatformProfit> ListPlatformProfitByWebSite(string platform, DateTime? start, DateTime? end, BtTableParameter parameter,int? companyid, ref int total)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
var precolumn = "select website,platform_type as platform,sum(amount_prepaid) amount_prepaid from dc_base_oms_sku where bailun_order_status!='Canceled' and bailun_order_status!='CantHandle' "; var precolumn = "select website,platform_type as platform,sum(amount_prepaid) amount_prepaid from dc_base_oms_sku where bailun_order_status!='Canceled' and bailun_order_status!='CantHandle' ";
var sql = "select platform_type as platform,website,sum(amount_sales*seller_order_exchange_rate*bailun_sku_quantity_shipped) saleamount,count(bailun_order_id) ordercount,sum(cost_platform_fee*seller_order_exchange_rate*bailun_sku_quantity_shipped) platformfee,(sum(amount_sales*seller_order_exchange_rate*bailun_sku_quantity_shipped)/count(bailun_order_id)) customerprice,sum(profit_total*bailun_sku_quantity_shipped) profit,(sum(profit_total)/sum(amount_sales*seller_order_exchange_rate)) profitrate,sum(amount_refund*seller_order_exchange_rate*bailun_sku_quantity_shipped) returnamount,(sum(amount_refund)/sum(amount_sales)) returnamountrate,sum(cost_first*bailun_sku_quantity_shipped) cost_first,sum(cost_tail*bailun_sku_quantity_shipped) cost_tail,sum(cost_handle_bailun*bailun_sku_quantity_shipped) cost_handle_bailun,sum(cost_handle_platform*bailun_sku_quantity_shipped) cost_handle_platform from dc_base_oms_sku where bailun_order_status!='Canceled' and bailun_order_status!='CantHandle' and has_scalp=0 and has_innersale=0 and bailun_sku_quantity_shipped>0"; var sql = "select platform_type as platform,website,sum(amount_sales*seller_order_exchange_rate*bailun_sku_quantity_shipped) saleamount,count(bailun_order_id) ordercount,sum(cost_platform_fee*seller_order_exchange_rate*bailun_sku_quantity_shipped) platformfee,(sum(amount_sales*seller_order_exchange_rate*bailun_sku_quantity_shipped)/count(bailun_order_id)) customerprice,sum(profit_total*bailun_sku_quantity_shipped) profit,(sum(profit_total)/sum(amount_sales*seller_order_exchange_rate)) profitrate,sum(amount_refund*seller_order_exchange_rate*bailun_sku_quantity_shipped) returnamount,(sum(amount_refund)/sum(amount_sales)) returnamountrate,sum(cost_first*bailun_sku_quantity_shipped) cost_first,sum(cost_tail*bailun_sku_quantity_shipped) cost_tail,sum(cost_handle_bailun*bailun_sku_quantity_shipped) cost_handle_bailun,sum(cost_handle_platform*bailun_sku_quantity_shipped) cost_handle_platform from dc_base_oms_sku where bailun_order_status!='Canceled' and bailun_order_status!='CantHandle' and has_scalp=0 and has_innersale=0 and bailun_sku_quantity_shipped>0";
if (companyid.HasValue && companyid.Value > 0)
{
sql += " and company_id=" + companyid.Value; //增加公司id过滤
}
if (!string.IsNullOrWhiteSpace(platform)) if (!string.IsNullOrWhiteSpace(platform))
{ {
sql += " and platform_type=@platform_type"; sql += " and platform_type=@platform_type";
...@@ -1191,12 +1272,17 @@ namespace Bailun.DC.Services ...@@ -1191,12 +1272,17 @@ namespace Bailun.DC.Services
/// <param name="parameter"></param> /// <param name="parameter"></param>
/// <param name="total"></param> /// <param name="total"></param>
/// <returns></returns> /// <returns></returns>
public Models.Orders.mPlatformProfit ListPlatformProfitByWebSiteCount(string platform, DateTime? start, DateTime? end, BtTableParameter parameter, ref int total) public Models.Orders.mPlatformProfit ListPlatformProfitByWebSiteCount(string platform, DateTime? start, DateTime? end, BtTableParameter parameter,int? companyid, ref int total)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
var sql = "select sum(amount_sales*seller_order_exchange_rate*bailun_sku_quantity_shipped) saleamount,count(bailun_order_id) ordercount,sum(cost_platform_fee*seller_order_exchange_rate*bailun_sku_quantity_shipped) platformfee,(sum(amount_sales*seller_order_exchange_rate*bailun_sku_quantity_shipped)/count(bailun_order_id)) customerprice,sum(profit_total*bailun_sku_quantity_shipped) profit,(sum(profit_total)/sum(amount_sales*seller_order_exchange_rate)) profitrate,sum(amount_refund*seller_order_exchange_rate*bailun_sku_quantity_shipped) returnamount,(sum(amount_refund)/sum(amount_sales)) returnamountrate,sum(cost_first*bailun_sku_quantity_shipped) cost_first,sum(cost_tail*bailun_sku_quantity_shipped) cost_tail,sum(cost_handle_bailun*bailun_sku_quantity_shipped) cost_handle_bailun,sum(cost_handle_platform*bailun_sku_quantity_shipped) cost_handle_platform from dc_base_oms_sku where bailun_order_status!='Canceled' and bailun_order_status!='CantHandle' and has_scalp=0 and has_innersale=0 and bailun_sku_quantity_shipped>0"; var sql = "select sum(amount_sales*seller_order_exchange_rate*bailun_sku_quantity_shipped) saleamount,count(bailun_order_id) ordercount,sum(cost_platform_fee*seller_order_exchange_rate*bailun_sku_quantity_shipped) platformfee,(sum(amount_sales*seller_order_exchange_rate*bailun_sku_quantity_shipped)/count(bailun_order_id)) customerprice,sum(profit_total*bailun_sku_quantity_shipped) profit,(sum(profit_total)/sum(amount_sales*seller_order_exchange_rate)) profitrate,sum(amount_refund*seller_order_exchange_rate*bailun_sku_quantity_shipped) returnamount,(sum(amount_refund)/sum(amount_sales)) returnamountrate,sum(cost_first*bailun_sku_quantity_shipped) cost_first,sum(cost_tail*bailun_sku_quantity_shipped) cost_tail,sum(cost_handle_bailun*bailun_sku_quantity_shipped) cost_handle_bailun,sum(cost_handle_platform*bailun_sku_quantity_shipped) cost_handle_platform from dc_base_oms_sku where bailun_order_status!='Canceled' and bailun_order_status!='CantHandle' and has_scalp=0 and has_innersale=0 and bailun_sku_quantity_shipped>0";
var precolumn = "select sum(amount_prepaid) amount_prepaid from dc_base_oms_sku where bailun_order_status!='Canceled' and bailun_order_status!='CantHandle' and has_scalp=0 and has_innersale=0 "; var precolumn = "select sum(amount_prepaid) amount_prepaid from dc_base_oms_sku where bailun_order_status!='Canceled' and bailun_order_status!='CantHandle' and has_scalp=0 and has_innersale=0 ";
if (companyid.HasValue && companyid.Value > 0)
{
sql += " and company_id=" + companyid.Value; //增加公司id过滤
}
if (!string.IsNullOrWhiteSpace(platform)) if (!string.IsNullOrWhiteSpace(platform))
{ {
sql += " and platform_type=@platform_type"; sql += " and platform_type=@platform_type";
...@@ -1248,7 +1334,7 @@ namespace Bailun.DC.Services ...@@ -1248,7 +1334,7 @@ namespace Bailun.DC.Services
/// <param name="orderno">百伦单号</param> /// <param name="orderno">百伦单号</param>
/// <param name="total">符合条件的记录数</param> /// <param name="total">符合条件的记录数</param>
/// <returns></returns> /// <returns></returns>
public List<Models.Orders.dc_base_oms_order> ListPlatformProfitOrders(BtTableParameter parameter, string platform, string website,string account, DateTime? start, DateTime? end,DateTime? shipstart,DateTime? shipend, string orderno, ref int total) public List<Models.Orders.dc_base_oms_order> ListPlatformProfitOrders(BtTableParameter parameter, string platform, string website,string account, DateTime? start, DateTime? end,DateTime? shipstart,DateTime? shipend, string orderno,int? companyid, ref int total)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
var sql = "select t1.platform_type,t1.website,t1.origin_order_id,t1.bailun_order_id,t1.seller_account,t1.order_currency,(t1.amount_sales*t1.seller_order_exchange_rate) amount_sales,(t1.amount_product*t1.seller_order_exchange_rate) amount_product,(t1.amount_shipping*t1.seller_order_exchange_rate) amount_shipping,(t1.amount_tax*t1.seller_order_exchange_rate) amount_tax,(t1.amount_adjustment*t1.seller_order_exchange_rate) amount_adjustment,(t1.amount_gift_wrap*t1.seller_order_exchange_rate) amount_gift_wrap,(t1.amount_refund*t1.seller_order_exchange_rate) amount_refund,(t1.cost_total) cost_total,(t1.cost_promotion*t1.seller_order_exchange_rate) cost_promotion,(t1.cost_platform_fee*t1.seller_order_exchange_rate) cost_platform_fee,(t1.cost_product) cost_product,(t1.cost_shipping) cost_shipping,(t1.cost_package*t1.seller_order_exchange_rate) cost_package,(t1.cost_fba_fee*t1.seller_order_exchange_rate) cost_fba_fee,(t1.cost_paypal_fee*t1.seller_order_exchange_rate) cost_paypal_fee,(t1.cost_refund_commisson*t1.seller_order_exchange_rate) cost_refund_commisson,(t1.cost_handle_bailun) cost_handle_bailun,(t1.cost_handle_platform) cost_handle_platform,(t1.cost_tail) cost_tail,(t1.cost_first) cost_first,(t1.profit_total) profit_total,((t1.profit_total)/(t1.amount_sales*t1.seller_order_exchange_rate)) profit_rate,t1.create_time,t1.paid_time,t1.seller_order_exchange_rate,t1.seller_other_exchange_rate,(t1.amount_prepaid) amount_prepaid,t1.cost_logistics from dc_base_oms_order t1 "; var sql = "select t1.platform_type,t1.website,t1.origin_order_id,t1.bailun_order_id,t1.seller_account,t1.order_currency,(t1.amount_sales*t1.seller_order_exchange_rate) amount_sales,(t1.amount_product*t1.seller_order_exchange_rate) amount_product,(t1.amount_shipping*t1.seller_order_exchange_rate) amount_shipping,(t1.amount_tax*t1.seller_order_exchange_rate) amount_tax,(t1.amount_adjustment*t1.seller_order_exchange_rate) amount_adjustment,(t1.amount_gift_wrap*t1.seller_order_exchange_rate) amount_gift_wrap,(t1.amount_refund*t1.seller_order_exchange_rate) amount_refund,(t1.cost_total) cost_total,(t1.cost_promotion*t1.seller_order_exchange_rate) cost_promotion,(t1.cost_platform_fee*t1.seller_order_exchange_rate) cost_platform_fee,(t1.cost_product) cost_product,(t1.cost_shipping) cost_shipping,(t1.cost_package*t1.seller_order_exchange_rate) cost_package,(t1.cost_fba_fee*t1.seller_order_exchange_rate) cost_fba_fee,(t1.cost_paypal_fee*t1.seller_order_exchange_rate) cost_paypal_fee,(t1.cost_refund_commisson*t1.seller_order_exchange_rate) cost_refund_commisson,(t1.cost_handle_bailun) cost_handle_bailun,(t1.cost_handle_platform) cost_handle_platform,(t1.cost_tail) cost_tail,(t1.cost_first) cost_first,(t1.profit_total) profit_total,((t1.profit_total)/(t1.amount_sales*t1.seller_order_exchange_rate)) profit_rate,t1.create_time,t1.paid_time,t1.seller_order_exchange_rate,t1.seller_other_exchange_rate,(t1.amount_prepaid) amount_prepaid,t1.cost_logistics from dc_base_oms_order t1 ";
...@@ -1267,6 +1353,11 @@ namespace Bailun.DC.Services ...@@ -1267,6 +1353,11 @@ namespace Bailun.DC.Services
sqlparam.Add("shipend", shipend.Value.AddDays(1)); sqlparam.Add("shipend", shipend.Value.AddDays(1));
} }
if (companyid.HasValue && companyid.Value > 0)
{
sql += " and company_id=" + companyid.Value; //增加公司id过滤
}
sql += " group by bailun_order_id) t2 on t1.bailun_order_id=t2.bailun_order_id "; sql += " group by bailun_order_id) t2 on t1.bailun_order_id=t2.bailun_order_id ";
} }
...@@ -1302,7 +1393,13 @@ namespace Bailun.DC.Services ...@@ -1302,7 +1393,13 @@ namespace Bailun.DC.Services
sql += " and t1.seller_account=@seller_account"; sql += " and t1.seller_account=@seller_account";
sqlparam.Add("seller_account", account); sqlparam.Add("seller_account", account);
} }
if (companyid.HasValue && companyid.Value > 0)
{
sql += " and t1.company_id=" + companyid.Value; //增加公司id过滤
}
if (!string.IsNullOrEmpty(parameter.sort)) if (!string.IsNullOrEmpty(parameter.sort))
{ {
...@@ -1332,7 +1429,7 @@ namespace Bailun.DC.Services ...@@ -1332,7 +1429,7 @@ namespace Bailun.DC.Services
/// <param name="end"></param> /// <param name="end"></param>
/// <param name="orderno"></param> /// <param name="orderno"></param>
/// <returns></returns> /// <returns></returns>
public Models.Orders.dc_base_oms_order ListPlatformProfitOrdersCount(string platform, string website,string account, DateTime? start, DateTime? end,DateTime? shipstart,DateTime? shipend, string orderno) public Models.Orders.dc_base_oms_order ListPlatformProfitOrdersCount(string platform, string website,string account, DateTime? start, DateTime? end,DateTime? shipstart,DateTime? shipend, string orderno,int? companyid)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
var sql = "select sum(t1.amount_sales*t1.seller_order_exchange_rate) amount_sales,sum(t1.amount_product*t1.seller_order_exchange_rate) amount_product,sum(t1.amount_shipping*t1.seller_order_exchange_rate) amount_shipping,sum(t1.amount_tax*t1.seller_order_exchange_rate) amount_tax,sum(t1.amount_adjustment*t1.seller_order_exchange_rate) amount_adjustment,sum(t1.amount_gift_wrap*t1.seller_order_exchange_rate) amount_gift_wrap,sum(t1.amount_refund*t1.seller_order_exchange_rate) amount_refund,sum(t1.cost_total) cost_total,sum(t1.cost_promotion*t1.seller_order_exchange_rate) cost_promotion,sum(t1.cost_platform_fee*t1.seller_order_exchange_rate) cost_platform_fee,sum(t1.cost_product) cost_product,sum(t1.cost_shipping) cost_shipping,sum(t1.cost_package*t1.seller_order_exchange_rate) cost_package,sum(t1.cost_fba_fee*t1.seller_order_exchange_rate) cost_fba_fee,sum(t1.cost_paypal_fee*t1.seller_order_exchange_rate) cost_paypal_fee,sum(t1.cost_refund_commisson*t1.seller_order_exchange_rate) cost_refund_commisson,sum(t1.cost_handle_bailun) cost_handle_bailun,sum(t1.cost_handle_platform) cost_handle_platform,sum(t1.cost_tail) cost_tail,sum(t1.cost_first) cost_first,sum(t1.profit_total) profit_total,(sum(t1.profit_total)/sum(t1.amount_sales*t1.seller_order_exchange_rate)) profit_rate,sum(t1.amount_prepaid) amount_prepaid,sum(t1.cost_logistics) cost_logistics from dc_base_oms_order t1 "; var sql = "select sum(t1.amount_sales*t1.seller_order_exchange_rate) amount_sales,sum(t1.amount_product*t1.seller_order_exchange_rate) amount_product,sum(t1.amount_shipping*t1.seller_order_exchange_rate) amount_shipping,sum(t1.amount_tax*t1.seller_order_exchange_rate) amount_tax,sum(t1.amount_adjustment*t1.seller_order_exchange_rate) amount_adjustment,sum(t1.amount_gift_wrap*t1.seller_order_exchange_rate) amount_gift_wrap,sum(t1.amount_refund*t1.seller_order_exchange_rate) amount_refund,sum(t1.cost_total) cost_total,sum(t1.cost_promotion*t1.seller_order_exchange_rate) cost_promotion,sum(t1.cost_platform_fee*t1.seller_order_exchange_rate) cost_platform_fee,sum(t1.cost_product) cost_product,sum(t1.cost_shipping) cost_shipping,sum(t1.cost_package*t1.seller_order_exchange_rate) cost_package,sum(t1.cost_fba_fee*t1.seller_order_exchange_rate) cost_fba_fee,sum(t1.cost_paypal_fee*t1.seller_order_exchange_rate) cost_paypal_fee,sum(t1.cost_refund_commisson*t1.seller_order_exchange_rate) cost_refund_commisson,sum(t1.cost_handle_bailun) cost_handle_bailun,sum(t1.cost_handle_platform) cost_handle_platform,sum(t1.cost_tail) cost_tail,sum(t1.cost_first) cost_first,sum(t1.profit_total) profit_total,(sum(t1.profit_total)/sum(t1.amount_sales*t1.seller_order_exchange_rate)) profit_rate,sum(t1.amount_prepaid) amount_prepaid,sum(t1.cost_logistics) cost_logistics from dc_base_oms_order t1 ";
...@@ -1351,6 +1448,11 @@ namespace Bailun.DC.Services ...@@ -1351,6 +1448,11 @@ namespace Bailun.DC.Services
sqlparam.Add("shipend", shipend.Value.AddDays(1)); sqlparam.Add("shipend", shipend.Value.AddDays(1));
} }
if (companyid.HasValue && companyid.Value > 0)
{
sql += " and company_id=" + companyid.Value; //增加公司id过滤
}
sql += " group by bailun_order_id) t2 on t1.bailun_order_id=t2.bailun_order_id "; sql += " group by bailun_order_id) t2 on t1.bailun_order_id=t2.bailun_order_id ";
} }
...@@ -1387,6 +1489,11 @@ namespace Bailun.DC.Services ...@@ -1387,6 +1489,11 @@ namespace Bailun.DC.Services
sqlparam.Add("seller_account", account); sqlparam.Add("seller_account", account);
} }
if (companyid.HasValue && companyid.Value > 0)
{
sql += " and t1.company_id=" + companyid.Value; //增加公司id过滤
}
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString)) using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
{ {
if (cn.State == System.Data.ConnectionState.Closed) if (cn.State == System.Data.ConnectionState.Closed)
...@@ -1412,7 +1519,7 @@ namespace Bailun.DC.Services ...@@ -1412,7 +1519,7 @@ namespace Bailun.DC.Services
/// <param name="total">符合条件的记录数</param> /// <param name="total">符合条件的记录数</param>
/// <param name="isFBA">是否FBA订单</param> /// <param name="isFBA">是否FBA订单</param>
/// <returns></returns> /// <returns></returns>
public List<Models.Orders.mSkuOrder> ListSkuOrder(BtTableParameter parameter, string warehousetype, string warehouse, string seller, DateTime? start, DateTime? end, string orderno, string sku,string orderstatus,string shippingstatus, ref int total,int isFBA) public List<Models.Orders.mSkuOrder> ListSkuOrder(BtTableParameter parameter, string warehousetype, string warehouse, string seller, DateTime? start, DateTime? end, string orderno, string sku,string orderstatus,string shippingstatus, ref int total,int isFBA,int? companyid)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
var sqlwhere = ""; var sqlwhere = "";
...@@ -1423,6 +1530,11 @@ namespace Bailun.DC.Services ...@@ -1423,6 +1530,11 @@ namespace Bailun.DC.Services
sqlwhere += " where t1.bailun_order_status != 'Canceled' and t1.bailun_order_status!='CantHandle' and t1.has_scalp=0 and t1.has_innersale=0 "; sqlwhere += " where t1.bailun_order_status != 'Canceled' and t1.bailun_order_status!='CantHandle' and t1.has_scalp=0 and t1.has_innersale=0 ";
if (companyid.HasValue && companyid.Value > 0)
{
sqlwhere += " and t1.company_id=" + companyid.Value; //增加公司id过滤
}
sqlwhere += " and t1.platform_type"+(isFBA==1?"":"!")+"='FBA'"; sqlwhere += " and t1.platform_type"+(isFBA==1?"":"!")+"='FBA'";
if (!string.IsNullOrWhiteSpace(warehousetype)) if (!string.IsNullOrWhiteSpace(warehousetype))
...@@ -1521,7 +1633,7 @@ namespace Bailun.DC.Services ...@@ -1521,7 +1633,7 @@ namespace Bailun.DC.Services
/// <param name="total">符合条件的记录数</param> /// <param name="total">符合条件的记录数</param>
/// <param name="isFBA">是否FBA订单</param> /// <param name="isFBA">是否FBA订单</param>
/// <returns></returns> /// <returns></returns>
public Models.Orders.mSkuOrder ListSkuOrderCount(string warehousetype, string warehouse, string seller, DateTime? start, DateTime? end, string orderno, string sku, string orderstatus, string shippingstatus, int isFBA) public Models.Orders.mSkuOrder ListSkuOrderCount(string warehousetype, string warehouse, string seller, DateTime? start, DateTime? end, string orderno, string sku, string orderstatus, string shippingstatus, int isFBA,int? companyid)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
var sqlwhere = ""; var sqlwhere = "";
...@@ -1532,6 +1644,11 @@ namespace Bailun.DC.Services ...@@ -1532,6 +1644,11 @@ namespace Bailun.DC.Services
sqlwhere += " where t1.bailun_order_status != 'Canceled' and t1.bailun_order_status!='CantHandle' and t1.has_scalp=0 and t1.has_innersale=0 "; sqlwhere += " where t1.bailun_order_status != 'Canceled' and t1.bailun_order_status!='CantHandle' and t1.has_scalp=0 and t1.has_innersale=0 ";
if (companyid.HasValue && companyid.Value > 0)
{
sqlwhere += " and t1.company_id=" + companyid.Value; //增加公司id过滤
}
sqlwhere += " and t1.platform_type" + (isFBA == 1 ? "" : "!") + "='FBA'"; sqlwhere += " and t1.platform_type" + (isFBA == 1 ? "" : "!") + "='FBA'";
if (!string.IsNullOrWhiteSpace(warehousetype)) if (!string.IsNullOrWhiteSpace(warehousetype))
...@@ -1623,12 +1740,17 @@ namespace Bailun.DC.Services ...@@ -1623,12 +1740,17 @@ namespace Bailun.DC.Services
/// <param name="sku">sku编码</param> /// <param name="sku">sku编码</param>
/// <param name="total">符合条件的记录数</param> /// <param name="total">符合条件的记录数</param>
/// <returns></returns> /// <returns></returns>
public List<Models.Orders.mSkuSaleCount> ListSkuSaleCount(BtTableParameter parameter, string platform, string account, string website, string warehouse, DateTime? start, DateTime? end, string sku, ref int total) public List<Models.Orders.mSkuSaleCount> ListSkuSaleCount(BtTableParameter parameter, string platform, string account, string website, string warehouse, DateTime? start, DateTime? end, string sku,int? companyid, ref int total)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
var strwhere = ""; var strwhere = "";
var sql = "select platform_type,bailun_sku,warehouse_name,count(origin_order_id) ordercount,sum(bailun_sku_quantity_ordered) count,sum(bailun_sku_quantity_shipped) shippingcount from dc_base_oms_sku where bailun_order_status!='Canceled' and warehouse_code!='' and bailun_order_status!='CantHandle' and has_scalp=0 and has_innersale=0 "; var sql = "select platform_type,bailun_sku,warehouse_name,count(origin_order_id) ordercount,sum(bailun_sku_quantity_ordered) count,sum(bailun_sku_quantity_shipped) shippingcount from dc_base_oms_sku where bailun_order_status!='Canceled' and warehouse_code!='' and bailun_order_status!='CantHandle' and has_scalp=0 and has_innersale=0 ";
if (companyid.HasValue && companyid.Value > 0)
{
sql += " and company_id=" + companyid.Value; //增加公司id过滤
}
if (!string.IsNullOrWhiteSpace(platform)) if (!string.IsNullOrWhiteSpace(platform))
{ {
strwhere += " and platform_type=@platform_type"; strwhere += " and platform_type=@platform_type";
...@@ -1704,12 +1826,17 @@ namespace Bailun.DC.Services ...@@ -1704,12 +1826,17 @@ namespace Bailun.DC.Services
/// <param name="end">付款结束时间</param> /// <param name="end">付款结束时间</param>
/// <param name="sku">sku编码</param> /// <param name="sku">sku编码</param>
/// <returns></returns> /// <returns></returns>
public Models.Orders.mSkuSaleCount ListSkuSaleCounts(string platform, string account, string website, string warehouse, DateTime? start, DateTime? end, string sku) public Models.Orders.mSkuSaleCount ListSkuSaleCounts(string platform, string account, string website, string warehouse, DateTime? start, DateTime? end, string sku,int? companyid)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
var strwhere = ""; var strwhere = "";
var sql = "select count(origin_order_id) ordercount,sum(bailun_sku_quantity_ordered) count,sum(bailun_sku_quantity_shipped) shippingcount from dc_base_oms_sku where bailun_order_status!='Canceled' and bailun_order_status!='CantHandle' and has_scalp=0 and has_innersale=0 and warehouse_code!='' "; var sql = "select count(origin_order_id) ordercount,sum(bailun_sku_quantity_ordered) count,sum(bailun_sku_quantity_shipped) shippingcount from dc_base_oms_sku where bailun_order_status!='Canceled' and bailun_order_status!='CantHandle' and has_scalp=0 and has_innersale=0 and warehouse_code!='' ";
if (companyid.HasValue && companyid.Value > 0)
{
sql += " and company_id=" + companyid.Value; //增加公司id过滤
}
if (!string.IsNullOrWhiteSpace(platform)) if (!string.IsNullOrWhiteSpace(platform))
{ {
strwhere += " and platform_type=@platform_type"; strwhere += " and platform_type=@platform_type";
...@@ -1785,7 +1912,7 @@ namespace Bailun.DC.Services ...@@ -1785,7 +1912,7 @@ namespace Bailun.DC.Services
/// <param name="warehousecode">发货仓库编码</param> /// <param name="warehousecode">发货仓库编码</param>
/// <param name="total"></param> /// <param name="total"></param>
/// <returns></returns> /// <returns></returns>
public List<Models.Orders.dc_base_oms_order> ListEbayStatistics(BtTableParameter parameter, string website, string account, DateTime? start, DateTime? end, string warehousetype, string warehousecode, ref int total) public List<Models.Orders.dc_base_oms_order> ListEbayStatistics(BtTableParameter parameter, string website, string account, DateTime? start, DateTime? end, string warehousetype, string warehousecode,int? companyid, ref int total)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
...@@ -1816,6 +1943,11 @@ namespace Bailun.DC.Services ...@@ -1816,6 +1943,11 @@ namespace Bailun.DC.Services
var fromsql = " where platform_type='Ebay' and bailun_order_status!='Canceled' and bailun_order_status!='CantHandle' and has_scalp=0 and has_innersale=0"; var fromsql = " where platform_type='Ebay' and bailun_order_status!='Canceled' and bailun_order_status!='CantHandle' and has_scalp=0 and has_innersale=0";
if (companyid.HasValue && companyid.Value > 0)
{
fromsql += " and company_id=" + companyid.Value; //增加公司id过滤
}
if (!string.IsNullOrWhiteSpace(account)) if (!string.IsNullOrWhiteSpace(account))
{ {
fromsql += " and t1.seller_account=@seller_account"; fromsql += " and t1.seller_account=@seller_account";
...@@ -1887,7 +2019,7 @@ namespace Bailun.DC.Services ...@@ -1887,7 +2019,7 @@ namespace Bailun.DC.Services
/// <param name="warehousetype"></param> /// <param name="warehousetype"></param>
/// <param name="warehousecode"></param> /// <param name="warehousecode"></param>
/// <returns></returns> /// <returns></returns>
public Models.Orders.dc_base_oms_order ListEbayStatisticsCount(string website, string account, DateTime? start, DateTime? end, string warehousetype, string warehousecode) public Models.Orders.dc_base_oms_order ListEbayStatisticsCount(string website, string account, DateTime? start, DateTime? end, string warehousetype, string warehousecode,int? companyid)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
...@@ -1897,6 +2029,11 @@ namespace Bailun.DC.Services ...@@ -1897,6 +2029,11 @@ namespace Bailun.DC.Services
//var sql = @"select t1.platform_type,t1.seller_account,t1.website,sum(t1.amount_product*t1.seller_order_exchange_rate) 'amount_product',sum(t1.cost_product) 'cost_product',sum(t1.cost_platform_fee*t1.seller_other_exchange_rate) 'cost_platform_fee',sum(t1.cost_first) 'cost_first',count(t1.id) 'order_count',sum(t1.cost_total) 'cost_total',sum(t1.cost_shipping) 'cost_shipping',sum(t1.profit_total) 'profit_total',(sum(t1.profit_total)/sum(t1.amount_total*t1.seller_order_exchange_rate)) 'profit_rate',sum(t1.amount_prepaid) amount_prepaid,sum(t1.amount_refund*t1.seller_order_exchange_rate) amount_refund from dc_base_oms_order t1"; //var sql = @"select t1.platform_type,t1.seller_account,t1.website,sum(t1.amount_product*t1.seller_order_exchange_rate) 'amount_product',sum(t1.cost_product) 'cost_product',sum(t1.cost_platform_fee*t1.seller_other_exchange_rate) 'cost_platform_fee',sum(t1.cost_first) 'cost_first',count(t1.id) 'order_count',sum(t1.cost_total) 'cost_total',sum(t1.cost_shipping) 'cost_shipping',sum(t1.profit_total) 'profit_total',(sum(t1.profit_total)/sum(t1.amount_total*t1.seller_order_exchange_rate)) 'profit_rate',sum(t1.amount_prepaid) amount_prepaid,sum(t1.amount_refund*t1.seller_order_exchange_rate) amount_refund from dc_base_oms_order t1";
var sqlwhere = " where platform_type='Ebay' and bailun_order_status!='Canceled' and bailun_order_status!='CantHandle' and has_scalp=0 and has_innersale=0"; var sqlwhere = " where platform_type='Ebay' and bailun_order_status!='Canceled' and bailun_order_status!='CantHandle' and has_scalp=0 and has_innersale=0";
if (companyid.HasValue && companyid.Value > 0)
{
sqlwhere += " and company_id=" + companyid.Value; //增加公司id过滤
}
if (!string.IsNullOrEmpty(warehousetype) || (!string.IsNullOrEmpty(warehousetype) && !string.IsNullOrEmpty(warehousecode))) if (!string.IsNullOrEmpty(warehousetype) || (!string.IsNullOrEmpty(warehousetype) && !string.IsNullOrEmpty(warehousecode)))
{ {
sql += " join dc_base_oms_pick t2 on t1.origin_order_id=t2.origin_order_id " + (!string.IsNullOrEmpty(warehousecode) ? " and t2.warehouse_code=@warehousecode" : ""); sql += " join dc_base_oms_pick t2 on t1.origin_order_id=t2.origin_order_id " + (!string.IsNullOrEmpty(warehousecode) ? " and t2.warehouse_code=@warehousecode" : "");
...@@ -1979,7 +2116,7 @@ namespace Bailun.DC.Services ...@@ -1979,7 +2116,7 @@ namespace Bailun.DC.Services
/// <param name="warehousecode"></param> /// <param name="warehousecode"></param>
/// <param name=""></param> /// <param name=""></param>
/// <returns></returns> /// <returns></returns>
public List<dc_base_oms_order> ListEbayStatisticsByWebsite(BtTableParameter request, string website, string account, DateTime? start, DateTime? end, string warehousetype, string warehousecode,ref int total) public List<dc_base_oms_order> ListEbayStatisticsByWebsite(BtTableParameter request, string website, string account, DateTime? start, DateTime? end, string warehousetype, string warehousecode,int? companyid,ref int total)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
...@@ -2010,6 +2147,11 @@ namespace Bailun.DC.Services ...@@ -2010,6 +2147,11 @@ namespace Bailun.DC.Services
var fromsql = " where platform_type='Ebay' and bailun_order_status!='Canceled' and bailun_order_status!='CantHandle' and has_scalp=0 and has_innersale=0 "; var fromsql = " where platform_type='Ebay' and bailun_order_status!='Canceled' and bailun_order_status!='CantHandle' and has_scalp=0 and has_innersale=0 ";
if (companyid.HasValue && companyid.Value > 0)
{
fromsql += " and company_id=" + companyid.Value; //增加公司id过滤
}
if (!string.IsNullOrWhiteSpace(account)) if (!string.IsNullOrWhiteSpace(account))
{ {
fromsql += " and t1.seller_account=@seller_account"; fromsql += " and t1.seller_account=@seller_account";
...@@ -2090,7 +2232,7 @@ namespace Bailun.DC.Services ...@@ -2090,7 +2232,7 @@ namespace Bailun.DC.Services
join dc_ebay_report_uk_config t3 on t3.type=1 and t1.seller_account=t3.config_value join dc_ebay_report_uk_config t3 on t3.type=1 and t1.seller_account=t3.config_value
join dc_ebay_report_uk_config t4 on t2.logistics_order_id = t4.config_value join dc_ebay_report_uk_config t4 on t2.logistics_order_id = t4.config_value
where t1.platform_type='Ebay' and t1.website='uk' and t1.bailun_payment_status!='Canceled' where t1.platform_type='Ebay' and t1.website='uk' and t1.bailun_payment_status!='Canceled'
and t1.paid_time>='{start.ToString("yyyy-MM-dd")}' and t1.paid_time<'{end.AddDays(1).ToString("yyyy-MM-dd")}' ) t1"; and t1.paid_time>='{start.ToString("yyyy-MM-dd")}' and t1.paid_time<'{end.AddDays(1).ToString("yyyy-MM-dd")}') t1";
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString)) using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
...@@ -2270,10 +2412,10 @@ namespace Bailun.DC.Services ...@@ -2270,10 +2412,10 @@ namespace Bailun.DC.Services
/// <param name="end"></param> /// <param name="end"></param>
/// <param name="total"></param> /// <param name="total"></param>
/// <returns></returns> /// <returns></returns>
public List<dc_base_oms_order> ListDepositReceived(BtTableParameter request, string platform, string website, string account, DateTime? start, DateTime? end, ref int total,ref dc_base_oms_order m) public List<dc_base_oms_order> ListDepositReceived(BtTableParameter request, string platform, string website, string account, DateTime? start, DateTime? end,int? companyid, ref int total,ref dc_base_oms_order m)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
var sql = "select origin_order_id,bailun_order_id,platform_type,website,seller_account,paid_time,(amount_sales*seller_order_exchange_rate) amount_sales,(amount_shipping*seller_order_exchange_rate) amount_shipping,(amount_product*seller_order_exchange_rate) amount_product,(amount_tax*seller_order_exchange_rate) amount_tax,(amount_adjustment*seller_order_exchange_rate) amount_adjustment,(amount_gift_wrap*seller_order_exchange_rate) amount_gift_wrap,(amount_refund*seller_order_exchange_rate) amount_refund,amount_prepaid,(cost_promotion*seller_order_exchange_rate) cost_promotion,(cost_platform_fee*seller_order_exchange_rate) cost_platform_fee,cost_product,cost_shipping,cost_package,(cost_fba_fee*seller_order_exchange_rate) cost_fba_fee,(cost_paypal_fee*seller_order_exchange_rate) cost_paypal_fee,(cost_refund_commisson*seller_order_exchange_rate) cost_refund_commisson,cost_handle_bailun,cost_handle_platform,cost_tail,cost_first,profit_total,profit_rate,(cost_total) cost_total from dc_base_oms_order where bailun_order_status='Handling' and bailun_shipping_status!='TotalShipping' and amount_prepaid>0"; var sql = "select origin_order_id,bailun_order_id,platform_type,website,seller_account,paid_time,(amount_sales*seller_order_exchange_rate) amount_sales,(amount_shipping*seller_order_exchange_rate) amount_shipping,(amount_product*seller_order_exchange_rate) amount_product,(amount_tax*seller_order_exchange_rate) amount_tax,(amount_adjustment*seller_order_exchange_rate) amount_adjustment,(amount_gift_wrap*seller_order_exchange_rate) amount_gift_wrap,(amount_refund*seller_order_exchange_rate) amount_refund,amount_prepaid,(cost_promotion*seller_order_exchange_rate) cost_promotion,(cost_platform_fee*seller_order_exchange_rate) cost_platform_fee,cost_product,cost_shipping,cost_package,(cost_fba_fee*seller_order_exchange_rate) cost_fba_fee,(cost_paypal_fee*seller_order_exchange_rate) cost_paypal_fee,(cost_refund_commisson*seller_order_exchange_rate) cost_refund_commisson,cost_handle_bailun,cost_handle_platform,cost_tail,cost_first,profit_total,profit_rate,(cost_total) cost_total from dc_base_oms_order where bailun_order_status='Handling' and bailun_shipping_status!='TotalShipping' and amount_prepaid>0 and has_scalp=0 and has_innersale=0";
var sqlcount = "select sum(amount_sales*seller_order_exchange_rate) amount_sales,sum(amount_shipping*seller_order_exchange_rate) amount_shipping,sum(amount_product*seller_order_exchange_rate) amount_product,sum(amount_tax*seller_order_exchange_rate) amount_tax,sum(amount_adjustment*seller_order_exchange_rate) amount_adjustment,sum(amount_gift_wrap*seller_order_exchange_rate) amount_gift_wrap,sum(amount_refund*seller_order_exchange_rate) amount_refund,sum(amount_prepaid) amount_prepaid,sum(cost_promotion*seller_order_exchange_rate) cost_promotion,sum(cost_platform_fee*seller_order_exchange_rate) cost_platform_fee,sum(cost_product) cost_product,sum(cost_shipping) cost_shipping,sum(cost_package) cost_package,sum(cost_fba_fee*seller_order_exchange_rate) cost_fba_fee,sum(cost_paypal_fee*seller_order_exchange_rate) cost_paypal_fee,sum(cost_refund_commisson*seller_order_exchange_rate) cost_refund_commisson,sum(cost_handle_bailun) cost_handle_bailun,sum(cost_handle_platform) cost_handle_platform,sum(cost_tail) cost_tail,sum(cost_first) cost_first,sum(profit_total) profit_total,sum(cost_total) cost_total from dc_base_oms_order where bailun_order_status='Handling' and bailun_shipping_status!='TotalShipping' and has_scalp=0 and has_innersale=0 and amount_prepaid>0"; var sqlcount = "select sum(amount_sales*seller_order_exchange_rate) amount_sales,sum(amount_shipping*seller_order_exchange_rate) amount_shipping,sum(amount_product*seller_order_exchange_rate) amount_product,sum(amount_tax*seller_order_exchange_rate) amount_tax,sum(amount_adjustment*seller_order_exchange_rate) amount_adjustment,sum(amount_gift_wrap*seller_order_exchange_rate) amount_gift_wrap,sum(amount_refund*seller_order_exchange_rate) amount_refund,sum(amount_prepaid) amount_prepaid,sum(cost_promotion*seller_order_exchange_rate) cost_promotion,sum(cost_platform_fee*seller_order_exchange_rate) cost_platform_fee,sum(cost_product) cost_product,sum(cost_shipping) cost_shipping,sum(cost_package) cost_package,sum(cost_fba_fee*seller_order_exchange_rate) cost_fba_fee,sum(cost_paypal_fee*seller_order_exchange_rate) cost_paypal_fee,sum(cost_refund_commisson*seller_order_exchange_rate) cost_refund_commisson,sum(cost_handle_bailun) cost_handle_bailun,sum(cost_handle_platform) cost_handle_platform,sum(cost_tail) cost_tail,sum(cost_first) cost_first,sum(profit_total) profit_total,sum(cost_total) cost_total from dc_base_oms_order where bailun_order_status='Handling' and bailun_shipping_status!='TotalShipping' and has_scalp=0 and has_innersale=0 and amount_prepaid>0";
if (!string.IsNullOrEmpty(platform)) if (!string.IsNullOrEmpty(platform))
...@@ -2307,6 +2449,12 @@ namespace Bailun.DC.Services ...@@ -2307,6 +2449,12 @@ namespace Bailun.DC.Services
sqlparam.Add("paid_time_end", end.Value.AddDays(1).ToString("yyyy-MM-dd")); sqlparam.Add("paid_time_end", end.Value.AddDays(1).ToString("yyyy-MM-dd"));
} }
if (companyid.HasValue && companyid.Value > 0)
{
sql += " and company_id=" + companyid.Value; //增加公司id过滤
sqlcount += " and company_id=" + companyid.Value;
}
if (!string.IsNullOrEmpty(request.sort)) if (!string.IsNullOrEmpty(request.sort))
{ {
sql += " order by "+request.sort+" "+request.order; sql += " order by "+request.sort+" "+request.order;
...@@ -2509,11 +2657,16 @@ namespace Bailun.DC.Services ...@@ -2509,11 +2657,16 @@ namespace Bailun.DC.Services
/// <param name="end">付款结束时间</param> /// <param name="end">付款结束时间</param>
/// <param name="total">符合条件的记录数</param> /// <param name="total">符合条件的记录数</param>
/// <returns></returns> /// <returns></returns>
public List<dc_base_oms_platform_sku> ListOrderPlatformSku(int page, int pagesize, DateTime? start, DateTime? end, string platform, ref int total) public List<dc_base_oms_platform_sku> ListOrderPlatformSku(int page, int pagesize, DateTime? start, DateTime? end, string platform,int? companyid, ref int total)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
var sql = "select origin_order_id,platform_type,website,order_currency,seller_order_exchange_rate,platform_sku_quantity_ordered,platform_sku_unit_price,item_id,platform_sku from dc_base_oms_platform_sku where has_delete=0 and has_scalp=0 and bailun_order_status!='Canceled' "; var sql = "select origin_order_id,platform_type,website,order_currency,seller_order_exchange_rate,platform_sku_quantity_ordered,platform_sku_unit_price,item_id,platform_sku from dc_base_oms_platform_sku where has_delete=0 and has_scalp=0 and bailun_order_status!='Canceled' ";
if (companyid.HasValue && companyid.Value > 0)
{
sql += " and company_id=" + companyid.Value; //增加公司id过滤
}
if (start.HasValue) if (start.HasValue)
{ {
sql += " and paid_time>='" + start.Value.ToString("yyyy-MM-dd HH:mm:ss") + "'"; sql += " and paid_time>='" + start.Value.ToString("yyyy-MM-dd HH:mm:ss") + "'";
...@@ -2544,8 +2697,7 @@ namespace Bailun.DC.Services ...@@ -2544,8 +2697,7 @@ namespace Bailun.DC.Services
#endregion #endregion
#region 人员相关统计 #region 人员相关统计
/// <summary> /// <summary>
...@@ -2554,11 +2706,16 @@ namespace Bailun.DC.Services ...@@ -2554,11 +2706,16 @@ namespace Bailun.DC.Services
/// <param name="start">付款开始时间</param> /// <param name="start">付款开始时间</param>
/// <param name="end">付款结束时间</param> /// <param name="end">付款结束时间</param>
/// <returns></returns> /// <returns></returns>
public List<mSalerProfit> ListSalerProfit(DateTime? start, DateTime? end) public List<mSalerProfit> ListSalerProfit(DateTime? start, DateTime? end,int? companyid)
{ {
var sql = "select seller_id,seller_account,sum(profit_total) profit_total from dc_base_oms_order where has_scalp=0 and has_innersale=0 and bailun_order_status!='Canceled'"; var sql = "select seller_id,seller_account,sum(profit_total) profit_total from dc_base_oms_order where has_scalp=0 and has_innersale=0 and bailun_order_status!='Canceled'";
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
if (companyid.HasValue && companyid.Value > 0)
{
sql += " and company_id=" + companyid.Value; //增加公司id过滤
}
if (start.HasValue) if (start.HasValue)
{ {
......
Bailun.DC.Web/Areas/Reports/Controllers/OrdersController.cs
...@@ -44,14 +44,15 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -44,14 +44,15 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="start"></param> /// <param name="start"></param>
/// <param name="end"></param> /// <param name="end"></param>
/// <returns></returns> /// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
public string ListPlatformCostJson(BtTableParameter parameter, string platform, DateTime? start, DateTime? end,string website,string account,string warehousetype,string warehousecode) public string ListPlatformCostJson(BtTableParameter parameter, string platform, DateTime? start, DateTime? end,string website,string account,string warehousetype,string warehousecode)
{ {
var companyid = HttpContextHelper.Current?.User.GetCompanyId().ToInt32(); var companyid = HttpContextHelper.Current?.User.GetCompanyId().ToInt32();
var total = 0; var total = 0;
var obj = new Services.OrdersServices().ListPlatformCost(parameter, platform, start, end,website,account,warehousetype,warehousecode, ref total); var obj = new Services.OrdersServices().ListPlatformCost(parameter, platform, start, end,website,account,warehousetype,warehousecode, companyid, ref total);
var countM = new Services.OrdersServices().ListPlatformCostCount(platform, start, end,website,account, warehousetype, warehousecode); var countM = new Services.OrdersServices().ListPlatformCostCount(platform, start, end,website,account, warehousetype, warehousecode, companyid);
var list = obj.Select(p => new { var list = obj.Select(p => new {
p.origin_order_id, p.origin_order_id,
...@@ -130,17 +131,20 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -130,17 +131,20 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="start">付款开始时间</param> /// <param name="start">付款开始时间</param>
/// <param name="end">付款结束时间</param> /// <param name="end">付款结束时间</param>
/// <returns></returns> /// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
public string ListAmazonSaleStatisticsJson(BtTableParameter parameter, string sellaccount, string website, DateTime start, DateTime end,string warehousetype, string warehousecode) public string ListAmazonSaleStatisticsJson(BtTableParameter parameter, string sellaccount, string website, DateTime start, DateTime end,string warehousetype, string warehousecode)
{ {
var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
var total = 0; var total = 0;
var service = new Services.OrdersServices(); var service = new Services.OrdersServices();
var objwithdraw = new Services.PlatformSiteServices().GetPlatformLossWithdraw().Where(a => a.english_name == "Amazon").FirstOrDefault(); var objwithdraw = new Services.PlatformSiteServices().GetPlatformLossWithdraw().Where(a => a.english_name == "Amazon").FirstOrDefault();
var list = service.ListAmazonStatistics(parameter, sellaccount, website, start, end, warehousetype,warehousecode, ref total); var list = service.ListAmazonStatistics(parameter, sellaccount, website, start, end, warehousetype,warehousecode,companyid, ref total);
var countM = service.ListAmazonStatisticsCount(sellaccount, website, start, end,warehousetype,warehousecode); var countM = service.ListAmazonStatisticsCount(sellaccount, website, start, end,warehousetype,warehousecode,companyid);
countM.website = "总计："; countM.website = "总计：";
countM.amount_sales = Math.Round(countM.amount_sales, 2, MidpointRounding.AwayFromZero); countM.amount_sales = Math.Round(countM.amount_sales, 2, MidpointRounding.AwayFromZero);
countM.cost_product = Math.Round(countM.cost_product, 2, MidpointRounding.AwayFromZero); countM.cost_product = Math.Round(countM.cost_product, 2, MidpointRounding.AwayFromZero);
...@@ -221,15 +225,17 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -221,15 +225,17 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="start">开始时间</param> /// <param name="start">开始时间</param>
/// <param name="end">结束时间</param> /// <param name="end">结束时间</param>
/// <returns></returns> /// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
public string ListFBASaleStatisticsJson(BtTableParameter parameter, string sellaccount, string website, DateTime start, DateTime end) public string ListFBASaleStatisticsJson(BtTableParameter parameter, string sellaccount, string website, DateTime start, DateTime end)
{ {
var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
var total = 0; var total = 0;
var service = new Services.OrdersServices(); var service = new Services.OrdersServices();
var objwithdraw = new Services.PlatformSiteServices().GetPlatformLossWithdraw().Where(a => a.english_name == "Amazon").FirstOrDefault(); var objwithdraw = new Services.PlatformSiteServices().GetPlatformLossWithdraw().Where(a => a.english_name == "Amazon").FirstOrDefault();
var list = service.ListFBAStatistics(parameter, sellaccount, website, start, end, ref total); var list = service.ListFBAStatistics(parameter, sellaccount, website, start, end,companyid, ref total);
var countM = service.ListFBAStatisticsCount(sellaccount, website, start, end); var countM = service.ListFBAStatisticsCount(sellaccount, website, start, end,companyid);
countM.website = "总计："; countM.website = "总计：";
countM.amount_product = Math.Round(countM.amount_product, 2, MidpointRounding.AwayFromZero); countM.amount_product = Math.Round(countM.amount_product, 2, MidpointRounding.AwayFromZero);
countM.cost_count = Math.Round(countM.cost_count, 2, MidpointRounding.AwayFromZero); countM.cost_count = Math.Round(countM.cost_count, 2, MidpointRounding.AwayFromZero);
...@@ -331,13 +337,15 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -331,13 +337,15 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="orderno">平台订单号</param> /// <param name="orderno">平台订单号</param>
/// <param name="sku">sku编码</param> /// <param name="sku">sku编码</param>
/// <returns></returns> /// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
public string ListOrderJson(BtTableParameter parameter, string platform, string account, string website, DateTime? start, DateTime? end,string orderno,string sku) public string ListOrderJson(BtTableParameter parameter, string platform, string account, string website, DateTime? start, DateTime? end,string orderno,string sku)
{ {
var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
var total = 0; var total = 0;
var service = new Services.OrdersServices(); var service = new Services.OrdersServices();
var obj = service.ListOrders(parameter, platform, website, account, start, end, orderno, sku, ref total); var obj = service.ListOrders(parameter, platform, website, account, start, end, orderno, sku,companyid, ref total);
var countM = service.ListOrdersCount(platform, website, account, start, end, orderno, sku); var countM = service.ListOrdersCount(platform, website, account, start, end, orderno, sku,companyid);
countM.amount_adjustment = Math.Round(countM.amount_adjustment, 2, MidpointRounding.AwayFromZero); countM.amount_adjustment = Math.Round(countM.amount_adjustment, 2, MidpointRounding.AwayFromZero);
countM.amount_gift_wrap = Math.Round(countM.amount_gift_wrap, 2, MidpointRounding.AwayFromZero); countM.amount_gift_wrap = Math.Round(countM.amount_gift_wrap, 2, MidpointRounding.AwayFromZero);
countM.amount_product = Math.Round(countM.amount_product, 2, MidpointRounding.AwayFromZero); countM.amount_product = Math.Round(countM.amount_product, 2, MidpointRounding.AwayFromZero);
...@@ -416,13 +424,15 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -416,13 +424,15 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="end"></param> /// <param name="end"></param>
/// <param name="orderno"></param> /// <param name="orderno"></param>
/// <returns></returns> /// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
public string FinanceFeeJson(BtTableParameter parameter, string platform, int feetype, int feecharacter, string account, DateTime? start, DateTime? end, string orderno) public string FinanceFeeJson(BtTableParameter parameter, string platform, int feetype, int feecharacter, string account, DateTime? start, DateTime? end, string orderno)
{ {
var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
var total = 0; var total = 0;
var service = new Services.OrdersServices(); var service = new Services.OrdersServices();
var obj = service.ListFinanceFee(parameter, platform, feetype, feecharacter, account, start, end, orderno, ref total); var obj = service.ListFinanceFee(parameter, platform, feetype, feecharacter, account, start, end, orderno,companyid, ref total);
var countM = service.ListFinanceFeeCount(platform, feetype, feecharacter, account, start, end, orderno); var countM = service.ListFinanceFeeCount(platform, feetype, feecharacter, account, start, end, orderno,companyid);
countM.amount_adjustment = Math.Round(countM.amount_adjustment, 2, MidpointRounding.AwayFromZero); countM.amount_adjustment = Math.Round(countM.amount_adjustment, 2, MidpointRounding.AwayFromZero);
countM.amount_gift_wrap = Math.Round(countM.amount_gift_wrap, 2, MidpointRounding.AwayFromZero); countM.amount_gift_wrap = Math.Round(countM.amount_gift_wrap, 2, MidpointRounding.AwayFromZero);
countM.amount_product = Math.Round(countM.amount_product, 2, MidpointRounding.AwayFromZero); countM.amount_product = Math.Round(countM.amount_product, 2, MidpointRounding.AwayFromZero);
...@@ -491,10 +501,13 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -491,10 +501,13 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="start">付款开始时间</param> /// <param name="start">付款开始时间</param>
/// <param name="end">付款结束时间</param> /// <param name="end">付款结束时间</param>
/// <returns></returns> /// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
public string FBAabnormalOrderJson(BtTableParameter parameter, string account, string website, string orderno, DateTime? start, DateTime? end) public string FBAabnormalOrderJson(BtTableParameter parameter, string account, string website, string orderno, DateTime? start, DateTime? end)
{ {
var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
var total = 0; var total = 0;
var obj = new Services.OrdersServices().ListFbaAbnormalOrder(parameter, account, website, start, end, orderno, ref total); var obj = new Services.OrdersServices().ListFbaAbnormalOrder(parameter, account, website, start, end, orderno,companyid, ref total);
var list = obj.Select(p => new { var list = obj.Select(p => new {
average_fba_fee = p.average_fba_fee>0?p.average_fba_fee.ToString("N2") :"0", average_fba_fee = p.average_fba_fee>0?p.average_fba_fee.ToString("N2") :"0",
...@@ -537,13 +550,15 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -537,13 +550,15 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="start"></param> /// <param name="start"></param>
/// <param name="end"></param> /// <param name="end"></param>
/// <returns></returns> /// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
public string PlatformFeeAbnormalJson(BtTableParameter parameter,string platform,string account,string website,string orderno,DateTime? start,DateTime? end) public string PlatformFeeAbnormalJson(BtTableParameter parameter,string platform,string account,string website,string orderno,DateTime? start,DateTime? end)
{ {
var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
var total = 0; var total = 0;
var service = new Services.OrdersServices(); var service = new Services.OrdersServices();
var obj = service.ListPlatformFeeAbnormal(parameter, platform, account, website, orderno, start, end, ref total); var obj = service.ListPlatformFeeAbnormal(parameter, platform, account, website, orderno, start, end,companyid, ref total);
var countM = service.ListPlatformFeeAbnormalCount(platform, account, website, orderno, start, end); var countM = service.ListPlatformFeeAbnormalCount(platform, account, website, orderno, start, end,companyid);
countM.amount_product = Math.Round(countM.amount_product, 2, MidpointRounding.AwayFromZero); countM.amount_product = Math.Round(countM.amount_product, 2, MidpointRounding.AwayFromZero);
countM.cost_platform_fee = Math.Round(countM.cost_platform_fee, 2, MidpointRounding.AwayFromZero); countM.cost_platform_fee = Math.Round(countM.cost_platform_fee, 2, MidpointRounding.AwayFromZero);
countM.seller_account = "总计："; countM.seller_account = "总计：";
...@@ -589,15 +604,15 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -589,15 +604,15 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
if (shipstart.HasValue || shipend.HasValue) if (shipstart.HasValue || shipend.HasValue)
{ {
result = new Services.OrdersServices().ListPlatformProfitByShipTime(platform, start, end, shipstart, shipend, currency.ToUpper() == "USD",companyid??0); result = new Services.OrdersServices().ListPlatformProfitByShipTime(platform, start, end, shipstart, shipend, currency.ToUpper() == "USD",companyid);
var fbaResult = new Services.OrdersServices().ListPlatformProfit(string.IsNullOrEmpty(platform) ? "FBA" : "", shipstart, shipend, null, null, currency.ToUpper() == "USD", companyid ?? 0); var fbaResult = new Services.OrdersServices().ListPlatformProfit(string.IsNullOrEmpty(platform) ? "FBA" : "", shipstart, shipend, null, null, currency.ToUpper() == "USD", companyid);
result.AddRange(fbaResult); result.AddRange(fbaResult);
} }
else else
{ {
result = new Services.OrdersServices().ListPlatformProfit(platform, start, end, shipstart, shipend,currency.ToUpper()=="USD",companyid??0); result = new Services.OrdersServices().ListPlatformProfit(platform, start, end, shipstart, shipend,currency.ToUpper()=="USD",companyid);
} }
if (result.Count > 0) if (result.Count > 0)
...@@ -679,13 +694,15 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -679,13 +694,15 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="end"></param> /// <param name="end"></param>
/// <param name="parameter"></param> /// <param name="parameter"></param>
/// <returns></returns> /// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
public string PlatformProfitCountByWebSiteJson(string platform, DateTime? start, DateTime? end,BtTableParameter parameter) public string PlatformProfitCountByWebSiteJson(string platform, DateTime? start, DateTime? end,BtTableParameter parameter)
{ {
var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
var total = 0; var total = 0;
var service = new Services.OrdersServices(); var service = new Services.OrdersServices();
var result = service.ListPlatformProfitByWebSite(platform, start, end,parameter,ref total); var result = service.ListPlatformProfitByWebSite(platform, start, end,parameter,companyid,ref total);
var countM = service.ListPlatformProfitByWebSiteCount(platform, start, end, parameter, ref total); var countM = service.ListPlatformProfitByWebSiteCount(platform, start, end, parameter,companyid, ref total);
countM.website = "合计："; countM.website = "合计：";
countM.cost_first = Math.Round(countM.cost_first, 2, MidpointRounding.AwayFromZero); countM.cost_first = Math.Round(countM.cost_first, 2, MidpointRounding.AwayFromZero);
countM.cost_handle_bailun = Math.Round(countM.cost_handle_bailun, 2, MidpointRounding.AwayFromZero); countM.cost_handle_bailun = Math.Round(countM.cost_handle_bailun, 2, MidpointRounding.AwayFromZero);
...@@ -772,13 +789,15 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -772,13 +789,15 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="end">付款结束时间</param> /// <param name="end">付款结束时间</param>
/// <param name="orderno">百伦订单号</param> /// <param name="orderno">百伦订单号</param>
/// <returns></returns> /// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
public string ListOrderDetailJson(BtTableParameter parameter,string platform,string website,string account,DateTime? start,DateTime? end,string orderno,DateTime? shipstart,DateTime? shipend) public string ListOrderDetailJson(BtTableParameter parameter,string platform,string website,string account,DateTime? start,DateTime? end,string orderno,DateTime? shipstart,DateTime? shipend)
{ {
var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
var total = 0; var total = 0;
var service = new Services.OrdersServices(); var service = new Services.OrdersServices();
var obj = service.ListPlatformProfitOrders(parameter, platform, website, account, start, end,shipstart,shipend,orderno, ref total); var obj = service.ListPlatformProfitOrders(parameter, platform, website, account, start, end,shipstart,shipend,orderno,companyid, ref total);
var countM = service.ListPlatformProfitOrdersCount(platform, website, account, start, end, shipstart, shipend, orderno); var countM = service.ListPlatformProfitOrdersCount(platform, website, account, start, end, shipstart, shipend, orderno,companyid);
countM.bailun_order_id = "总计"; countM.bailun_order_id = "总计";
countM.amount_sales = Math.Round(countM.amount_sales, 2, MidpointRounding.AwayFromZero); countM.amount_sales = Math.Round(countM.amount_sales, 2, MidpointRounding.AwayFromZero);
...@@ -856,9 +875,10 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -856,9 +875,10 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
public ActionResult ExportListOrderDetail(string platform, string website, string account, DateTime? start, DateTime? end, string orderno, DateTime? shipstart, DateTime? shipend) public ActionResult ExportListOrderDetail(string platform, string website, string account, DateTime? start, DateTime? end, string orderno, DateTime? shipstart, DateTime? shipend)
{ {
var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
var total = 0; var total = 0;
var service = new Services.OrdersServices(); var service = new Services.OrdersServices();
var obj = service.ListPlatformProfitOrders(new BtTableParameter { offset=1,limit=500000}, platform, website, account, start, end, shipstart, shipend, orderno, ref total); var obj = service.ListPlatformProfitOrders(new BtTableParameter { offset=1,limit=500000}, platform, website, account, start, end, shipstart, shipend, orderno,companyid, ref total);
var list = obj.Select(p => new var list = obj.Select(p => new
{ {
...@@ -961,12 +981,14 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -961,12 +981,14 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="orderno">订单号</param> /// <param name="orderno">订单号</param>
/// <param name="sku">sku编码</param> /// <param name="sku">sku编码</param>
/// <returns></returns> /// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
public string SkuOrderListJson(BtTableParameter parameter, string warehousetype, string warehousecode,string seller,DateTime? start,DateTime? end, string orderstatus, string shippingstatus, string orderno, string sku,int isfba) public string SkuOrderListJson(BtTableParameter parameter, string warehousetype, string warehousecode,string seller,DateTime? start,DateTime? end, string orderstatus, string shippingstatus, string orderno, string sku,int isfba)
{ {
var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
var total = 0; var total = 0;
var service = new Services.OrdersServices(); var service = new Services.OrdersServices();
var obj = service.ListSkuOrder(parameter, warehousetype, warehousecode, seller, start, end, orderno, sku, orderstatus, shippingstatus, ref total, isfba); var obj = service.ListSkuOrder(parameter, warehousetype, warehousecode, seller, start, end, orderno, sku, orderstatus, shippingstatus, ref total, isfba,companyid);
var countM = service.ListSkuOrderCount(warehousetype, warehousecode, seller, start, end, orderno, sku, orderstatus, shippingstatus, isfba); var countM = service.ListSkuOrderCount(warehousetype, warehousecode, seller, start, end, orderno, sku, orderstatus, shippingstatus, isfba,companyid);
countM.sku_image = "总计："; countM.sku_image = "总计：";
...@@ -986,13 +1008,15 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -986,13 +1008,15 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// 订单汇总数据 /// 订单汇总数据
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
public string OrderSaleCountJson(BtTableParameter parameter,string platform,string account,string website,string warehousecode, DateTime? start,DateTime? end,string sku) public string OrderSaleCountJson(BtTableParameter parameter,string platform,string account,string website,string warehousecode, DateTime? start,DateTime? end,string sku)
{ {
var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
var total = 0; var total = 0;
var service = new Services.OrdersServices(); var service = new Services.OrdersServices();
var obj = service.ListSkuSaleCount(parameter, platform, account, website, warehousecode, start, end, sku, ref total); var obj = service.ListSkuSaleCount(parameter, platform, account, website, warehousecode, start, end, sku,companyid, ref total);
var countM = service.ListSkuSaleCounts(platform, account, website, warehousecode, start, end, sku); var countM = service.ListSkuSaleCounts(platform, account, website, warehousecode, start, end, sku,companyid);
countM.warehouse_name = "总计："; countM.warehouse_name = "总计：";
return JsonConvert.SerializeObject(new { total = total, rows = obj,count_row = countM }); return JsonConvert.SerializeObject(new { total = total, rows = obj,count_row = countM });
...@@ -1022,6 +1046,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -1022,6 +1046,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="warehousetype"></param> /// <param name="warehousetype"></param>
/// <param name="warehousecode"></param> /// <param name="warehousecode"></param>
/// <returns></returns> /// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
public string EbaySaleStatisticsJson(BtTableParameter parameter, string selleraccount, string website, DateTime start, DateTime end, string warehousetype, string warehousecode) public string EbaySaleStatisticsJson(BtTableParameter parameter, string selleraccount, string website, DateTime start, DateTime end, string warehousetype, string warehousecode)
{ {
var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32(); var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
...@@ -1035,9 +1060,9 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -1035,9 +1060,9 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
withdrawpercent = objwithdraw.Loss_withdrawal_percent.Value; withdrawpercent = objwithdraw.Loss_withdrawal_percent.Value;
} }
var list = services.ListEbayStatistics(parameter, website, selleraccount, start, end, warehousetype, warehousecode, ref total); var list = services.ListEbayStatistics(parameter, website, selleraccount, start, end, warehousetype, warehousecode,companyid, ref total);
var countM = services.ListEbayStatisticsCount(website, selleraccount, start, end, warehousetype, warehousecode); var countM = services.ListEbayStatisticsCount(website, selleraccount, start, end, warehousetype, warehousecode,companyid);
countM.seller_account = "总计："; countM.seller_account = "总计：";
countM.amount_sales = Math.Round(countM.amount_sales, 2, MidpointRounding.AwayFromZero); countM.amount_sales = Math.Round(countM.amount_sales, 2, MidpointRounding.AwayFromZero);
...@@ -1137,8 +1162,10 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -1137,8 +1162,10 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="warehousetype">仓库类型</param> /// <param name="warehousetype">仓库类型</param>
/// <param name="warehousecode">仓库编码</param> /// <param name="warehousecode">仓库编码</param>
/// <returns></returns> /// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
public string EbayStatisticsByWebsiteJson(BtTableParameter request, string website, string selleraccount, DateTime start, DateTime end, string warehousetype, string warehousecode) public string EbayStatisticsByWebsiteJson(BtTableParameter request, string website, string selleraccount, DateTime start, DateTime end, string warehousetype, string warehousecode)
{ {
var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
var total = 0; var total = 0;
var _services = new Services.OrdersServices(); var _services = new Services.OrdersServices();
var objwithdraw = new Services.PlatformSiteServices().GetPlatformLossWithdraw().Where(a => a.english_name == "Ebay").FirstOrDefault(); var objwithdraw = new Services.PlatformSiteServices().GetPlatformLossWithdraw().Where(a => a.english_name == "Ebay").FirstOrDefault();
...@@ -1148,9 +1175,9 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -1148,9 +1175,9 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
withdrawpercent = objwithdraw.Loss_withdrawal_percent.Value; withdrawpercent = objwithdraw.Loss_withdrawal_percent.Value;
} }
var obj = _services.ListEbayStatisticsByWebsite(request,website,selleraccount,start,end,warehousetype,warehousecode,ref total); var obj = _services.ListEbayStatisticsByWebsite(request,website,selleraccount,start,end,warehousetype,warehousecode,companyid,ref total);
var countM = _services.ListEbayStatisticsCount(website, selleraccount, start, end, warehousetype, warehousecode); var countM = _services.ListEbayStatisticsCount(website, selleraccount, start, end, warehousetype, warehousecode,companyid);
countM.website = "总计："; countM.website = "总计：";
countM.amount_sales = Math.Round(countM.amount_sales, 2, MidpointRounding.AwayFromZero); countM.amount_sales = Math.Round(countM.amount_sales, 2, MidpointRounding.AwayFromZero);
...@@ -1304,12 +1331,13 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -1304,12 +1331,13 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="start"></param> /// <param name="start"></param>
/// <param name="end"></param> /// <param name="end"></param>
/// <returns></returns> /// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
public string DepositReceivedJson(BtTableParameter request, string platform, string website, string account, DateTime? start, DateTime? end) public string DepositReceivedJson(BtTableParameter request, string platform, string website, string account, DateTime? start, DateTime? end)
{ {
var total = 0; var total = 0;
var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
var countM = new Models.Orders.dc_base_oms_order(); var countM = new Models.Orders.dc_base_oms_order();
var obj = new Services.OrdersServices().ListDepositReceived(request, platform, website, account, start, end, ref total, ref countM); var obj = new Services.OrdersServices().ListDepositReceived(request, platform, website, account, start, end, companyid, ref total, ref countM);
var list = obj.Select(a => new { var list = obj.Select(a => new {
a.origin_order_id, a.origin_order_id,
......
Bailun.DC.Web/Controllers/ApiController.cs
...@@ -115,10 +115,10 @@ namespace Bailun.DC.Web.Controllers ...@@ -115,10 +115,10 @@ namespace Bailun.DC.Web.Controllers
/// <param name="end">结束时间</param> /// <param name="end">结束时间</param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public JsonResult ListPlatformSkuSales(int page, int pagesize, DateTime? start, DateTime? end,string platform) public JsonResult ListPlatformSkuSales(int page, int pagesize, DateTime? start, DateTime? end,string platform,int companyid)
{ {
var total = 0; var total = 0;
var obj = new Services.OrdersServices().ListOrderPlatformSku(page, pagesize, start, end,platform, ref total); var obj = new Services.OrdersServices().ListOrderPlatformSku(page, pagesize, start, end,platform,companyid, ref total);
var list = obj.Select(a => new { var list = obj.Select(a => new {
a.origin_order_id, //平台订单号 a.origin_order_id, //平台订单号
...@@ -166,9 +166,9 @@ namespace Bailun.DC.Web.Controllers ...@@ -166,9 +166,9 @@ namespace Bailun.DC.Web.Controllers
/// <param name="end">结束时间</param> /// <param name="end">结束时间</param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public JsonResult ListSalerProfit(DateTime? start, DateTime? end) public JsonResult ListSalerProfit(DateTime? start, DateTime? end,int companyid)
{ {
var list = new Services.OrdersServices().ListSalerProfit(start, end); var list = new Services.OrdersServices().ListSalerProfit(start, end,companyid);
return Json(list); return Json(list);
} }
......
Bailun.DC.Web/Pages/Index.cshtml
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<script src="css/hplus/js/jquery.min.js?v=2.1.4"></script> <script src="css/hplus/js/jquery.min.js?v=2.1.4"></script>
<script src="~/js/jquery.cookie.js" type="text/javascript"></script> <script src="~/js/jquery.cookie.js" type="text/javascript"></script>
<script src="~/js/common.js?20190606001" type="text/javascript"></script> <script src="~/js/common.js?20190609001" type="text/javascript"></script>
</head> </head>
<body class="fixed-sidebar full-height-layout gray-bg" style="overflow:hidden"> <body class="fixed-sidebar full-height-layout gray-bg" style="overflow:hidden">
......
Bailun.DC.Web/Startup.cs
...@@ -7,6 +7,7 @@ using Bailun.ServiceFabric.Extension; ...@@ -7,6 +7,7 @@ using Bailun.ServiceFabric.Extension;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Features;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.AspNetCore.Mvc.Infrastructure;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
...@@ -34,11 +35,18 @@ namespace Bailun.DC.Web ...@@ -34,11 +35,18 @@ namespace Bailun.DC.Web
options.MinimumSameSitePolicy = SameSiteMode.None; options.MinimumSameSitePolicy = SameSiteMode.None;
}); });
services.Configure<FormOptions>(options =>
{
options.ValueLengthLimit = 1024 * 1024 * 100;
options.ValueCountLimit = int.MaxValue;
});
//עsession //עsession
//services.AddSession(); //services.AddSession();
services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1); services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
services.TryAddSingleton<IHttpContextAccessor, HttpContextAccessor>(); services.TryAddSingleton<IHttpContextAccessor, HttpContextAccessor>();
} }
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline. // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
......
Bailun.DC.Web/wwwroot/js/common.js
...@@ -10,6 +10,12 @@ function OnlyTable(tableId, aoColumn, actionUrl, serverParams,tbParams,dataParam ...@@ -10,6 +10,12 @@ function OnlyTable(tableId, aoColumn, actionUrl, serverParams,tbParams,dataParam
$btTable.bootstrapTable({ $btTable.bootstrapTable({
url: actionUrl, url: actionUrl,
//toolbar: "#toolbar", //toolbar: "#toolbar",
ajaxOptions:{
beforeSend: function (xhr) {
xhr.setRequestHeader('Authorization', $.cookie("token"))
}
},
sidePagination: "server",//设置在哪进行分页，默认”client”，可选”server”，如果设置 “server”，则必须设置url或者重写ajax方法 sidePagination: "server",//设置在哪进行分页，默认”client”，可选”server”，如果设置 “server”，则必须设置url或者重写ajax方法
pagination: true,//底部工具栏是否显示分页条 pagination: true,//底部工具栏是否显示分页条
striped: true,//是否显示列表背景色 striped: true,//是否显示列表背景色
...@@ -211,14 +217,12 @@ $.submit = function (data) { ...@@ -211,14 +217,12 @@ $.submit = function (data) {
url: data.url, url: data.url,
type: data.type||'GET', type: data.type||'GET',
data: data.paramData, data: data.paramData,
headers: { Authorization: $.cookie("token")},
beforeSend: function (request) { beforeSend: function (request) {
if (!data.noloading) if (!data.noloading)
{ {
//load_index = layer.load(); //load_index = layer.load();
} }
request.setRequestHeader("Authorization", $.cookie("token"));
}, },
success: function (result) { success: function (result) {
try { try {
...@@ -305,6 +309,7 @@ function login() { ...@@ -305,6 +309,7 @@ function login() {
if (token != '') { if (token != '') {
$.cookie('token', token, { expires: 1 }); $.cookie('token', token, { expires: 1 });
window.location = baseUrl;
} }
else { else {
token = $.cookie('token'); token = $.cookie('token');
......
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