Skip to content

D
DataCenter_Core2.1_20190520
Commit 831c15b7 by DESKTOP-732ATD8\BLT
Options

增加功能:Shopify 广告费

parent 4564d742
Showing with 133 additions and 126 deletions
Bailun.DC.Services/OrdersServices.cs
......@@ -620,7 +620,7 @@ namespace Bailun.DC.Services
cn.Open();
}
var obj = cn.Page<Models.Orders.mAmazonStatistics>(parameter.pageIndex, parameter.limit, sql, ref total, sqlparam,"",2*60);
var obj = cn.Page<Models.Orders.mAmazonStatistics>(parameter.pageIndex, parameter.limit, sql, ref total, sqlparam, "", 2 * 60);
return obj.AsList();
}
......@@ -694,7 +694,7 @@ namespace Bailun.DC.Services
cn.Open();
}
var obj = cn.QueryFirst<Models.Orders.mAmazonStatistics>(sql, sqlparam,null,2*60);
var obj = cn.QueryFirst<Models.Orders.mAmazonStatistics>(sql, sqlparam, null, 2 * 60);
return obj;
}
......@@ -1511,7 +1511,7 @@ namespace Bailun.DC.Services
/// <param name="start">付款开始时间</param>
/// <param name="end">付款结束时间</param>
/// <returns></returns>
public List<Models.Orders.dc_base_oms_sku> ListPlatformProfit(string platform, string website, DateTime? start, DateTime? end, DateTime? shipstart, DateTime? shipend, bool isUSD, int? companyid, string skucategoryids, DateTime? createstart=null,DateTime? createend=null)
public List<Models.Orders.dc_base_oms_sku> ListPlatformProfit(string platform, string website, DateTime? start, DateTime? end, DateTime? shipstart, DateTime? shipend, bool isUSD, int? companyid, string skucategoryids, DateTime? createstart = null, DateTime? createend = null)
{
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(tb.cost_first*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") as cost_first,sum(tb.cost_logistics*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_tail,sum(tb.cost_handle_bailun*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_handle_bailun,sum(tb.cost_handle_platform*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_handle_platform,sum(tb.amount_refund*" + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + ") amount_refund,sum(tb.cost_fba_fee*" + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + ") cost_fba_fee,sum(tb.cost_paypal_fee*" + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + ") cost_paypal_fee,sum(tb.amount_shipping*" + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + ") amount_shipping,sum(tb.cost_promotion*" + (isUSD ? "tb.order_to_usd_exchange_rate" : "tb.seller_order_exchange_rate") + ") cost_promotion,sum(tb.cost_product*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") cost_product,sum(tb.profit_total*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") profit_total,(sum(tb.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((tb.amount_prepaid>0 and tb.bailun_order_status!='Finished') or null) as noshippingcount,sum(tb.amount_prepaid*" + (isUSD ? "tb.cny_to_usd_exchange_rate" : "1") + ") amount_prepaid from dc_base_oms_order tb ";
......@@ -1555,20 +1555,20 @@ namespace Bailun.DC.Services
if (!string.IsNullOrWhiteSpace(platform))
{
sql += " and t3.platform_type='"+ platform + "'";
sql += " and t3.platform_type='" + platform + "'";
}
if (!string.IsNullOrWhiteSpace(website))
{
sql += " and t3.website='"+website+"'";
sql += " and t3.website='" + website + "'";
}
if (start.HasValue)
{
sql += " and t3.paid_time>='"+start.Value.ToString("yyyy-MM-dd")+"'";
sql += " and t3.paid_time>='" + start.Value.ToString("yyyy-MM-dd") + "'";
}
if (end.HasValue)
{
sql += " and t3.paid_time<'"+end.Value.AddDays(1).ToString("yyyy-MM-dd")+"'";
sql += " and t3.paid_time<'" + end.Value.AddDays(1).ToString("yyyy-MM-dd") + "'";
}
sql += ") t33 on tb.bailun_order_id=t33.bailun_order_id";
......@@ -1652,15 +1652,15 @@ namespace Bailun.DC.Services
/// <param name="start">付款开始时间</param>
/// <param name="end">付款结束时间</param>
/// <returns></returns>
public List<Models.Orders.dc_base_oms_sku> ListPlatformProfit(string platform, string website, DateTime? start, DateTime? end, DateTime? shipstart, DateTime? shipend, bool isUSD, int? companyid, string skucategoryids, int[] producttype, int? skusource, int? shippingstrategy,int statistictype,int? skunewcategoryid,DateTime? createstart = null, DateTime? createend = null)
public List<Models.Orders.dc_base_oms_sku> ListPlatformProfit(string platform, string website, DateTime? start, DateTime? end, DateTime? shipstart, DateTime? shipend, bool isUSD, int? companyid, string skucategoryids, int[] producttype, int? skusource, int? shippingstrategy, int statistictype, int? skunewcategoryid, DateTime? createstart = null, DateTime? createend = null)
{
var str_statistic_col = "tb.platform_type";
if(statistictype==1) //sku品类
if (statistictype == 1) //sku品类
{
str_statistic_col = "t60.bailun_category_id as platform_type";
}
else if(statistictype==2) //sku来源
else if (statistictype == 2) //sku来源
{
str_statistic_col = "t60.source as platform_type";
}
......@@ -1732,9 +1732,9 @@ namespace Bailun.DC.Services
{
sql += " join dc_base_sku t10 on tb.bailun_sku=t10.bailun_sku ";
if (producttype.Count()>0)
if (producttype.Count() > 0)
{
sql += " and t10.product_type in (" + string.Join(",",producttype)+") ";
sql += " and t10.product_type in (" + string.Join(",", producttype) + ") ";
}
if (skusource.HasValue)
......@@ -1891,7 +1891,7 @@ namespace Bailun.DC.Services
/// <param name="shipstart">发货开始时间</param>
/// <param name="shipend">发货结束时间</param>
/// <returns></returns>
public List<Models.Orders.dc_base_oms_sku> ListPlatformProfitByShipTime(string platform, string website, DateTime? start, DateTime? end, DateTime? shipstart, DateTime? shipend, bool isUSD, int? companyid, string skucategoryids, int[] producttype, int? skusource, int? shippingstrategy,int statistictype, int? skunewcategoryid)
public List<Models.Orders.dc_base_oms_sku> ListPlatformProfitByShipTime(string platform, string website, DateTime? start, DateTime? end, DateTime? shipstart, DateTime? shipend, bool isUSD, int? companyid, string skucategoryids, int[] producttype, int? skusource, int? shippingstrategy, int statistictype, int? skunewcategoryid)
{
var str_statistic_col = "t2.platform_type";
......@@ -1933,7 +1933,7 @@ namespace Bailun.DC.Services
}
}
sql += " where t0.has_delete=0 and t0.shipping_status = 'TotalShipping'"+ tempsql;
sql += " where t0.has_delete=0 and t0.shipping_status = 'TotalShipping'" + tempsql;
if (companyid.HasValue && companyid.Value > 0)
{
......@@ -1982,12 +1982,12 @@ namespace Bailun.DC.Services
if (producttype.Count() > 0)
{
sql += " and t10.product_type in ("+string.Join(",", producttype)+") ";
sql += " and t10.product_type in (" + string.Join(",", producttype) + ") ";
}
if (skusource.HasValue)
{
sql += " and t10.source="+skusource;
sql += " and t10.source=" + skusource;
}
}
......@@ -3343,7 +3343,7 @@ namespace Bailun.DC.Services
/// <param name="total"></param>
/// <param name="feetype">费用类型</param>
/// <returns></returns>
public List<dc_base_finance_ebay> ListEbayFee(BtTableParameter parameter, int? companyid, DateTime? start, DateTime? end, ref int total, string[] feetype, string[] description, string orderno, string account,string itemid)
public List<dc_base_finance_ebay> ListEbayFee(BtTableParameter parameter, int? companyid, DateTime? start, DateTime? end, ref int total, string[] feetype, string[] description, string orderno, string account, string itemid)
{
var sqlparam = new DynamicParameters();
var sql = "select t1.id,t1.account_entry_type,t1.description,t1.bj_date as gmt_date,t1.gross_amount,t1.item_id,t1.net_amount,t1.vat_percent,t1.order_line_id,t1.currency,t1.exchange_rate,(t1.exchange_rate*t1.gross_amount) gross_amount_rmb,t2.account_name,t1.memo,t1.ref_number from dc_base_finance_ebay t1 ";
......@@ -3444,7 +3444,7 @@ namespace Bailun.DC.Services
/// <param name="total"></param>
/// <param name="feetype"></param>
/// <returns></returns>
public dc_base_finance_ebay EbayFeeCount(int? companyid, DateTime? start, DateTime? end, string[] feetype,string[] description, string orderno, string account,bool isUSD,string itemid, int[] producttype, int? skusource, int? shippingstrategy,string platform, string website)
public dc_base_finance_ebay EbayFeeCount(int? companyid, DateTime? start, DateTime? end, string[] feetype, string[] description, string orderno, string account, bool isUSD, string itemid, int[] producttype, int? skusource, int? shippingstrategy, string platform, string website)
{
if (platform != null && platform.ToLower() != "ebay")
{
......@@ -3452,7 +3452,7 @@ namespace Bailun.DC.Services
}
var sqlparam = new DynamicParameters();
var sql = $"select sum(t1.gross_amount) gross_amount,sum(t1.net_amount) net_amount,sum(t1.{(isUSD? "exchange_rate_usd" : "exchange_rate")}*t1.gross_amount) gross_amount_rmb from dc_base_finance_ebay t1 ";
var sql = $"select sum(t1.gross_amount) gross_amount,sum(t1.net_amount) net_amount,sum(t1.{(isUSD ? "exchange_rate_usd" : "exchange_rate")}*t1.gross_amount) gross_amount_rmb from dc_base_finance_ebay t1 ";
if (!string.IsNullOrWhiteSpace(account))
{
......@@ -3496,7 +3496,7 @@ namespace Bailun.DC.Services
if (!string.IsNullOrEmpty(website))
{
sql += " join dc_base_company_account t20 on t20.account_id = t1.account_id and t20.company_id=1 and t20.status=1 and t20.site_en='"+website+"'";
sql += " join dc_base_company_account t20 on t20.account_id = t1.account_id and t20.company_id=1 and t20.status=1 and t20.site_en='" + website + "'";
}
sql += " where t1.id!=0 ";
......@@ -3564,7 +3564,7 @@ namespace Bailun.DC.Services
/// <param name="total"></param>
/// <param name="feetype"></param>
/// <returns></returns>
public List<dc_base_finance_ebay> EbayFeeCount(int? companyid, DateTime? start, DateTime? end, string[] feetype, string[] description, string orderno, string account, bool isUSD, string itemid, int[] producttype, int? skusource, int? shippingstrategy, int statistictype,string platform,string website)
public List<dc_base_finance_ebay> EbayFeeCount(int? companyid, DateTime? start, DateTime? end, string[] feetype, string[] description, string orderno, string account, bool isUSD, string itemid, int[] producttype, int? skusource, int? shippingstrategy, int statistictype, string platform, string website)
{
if (platform != null && platform.ToLower() != "ebay")
{
......@@ -3582,7 +3582,7 @@ namespace Bailun.DC.Services
}
//Add by Allan at 20200320
if ((producttype != null && producttype.Count() > 0) || skusource.HasValue || shippingstrategy.HasValue || statistictype!=0)
if ((producttype != null && producttype.Count() > 0) || skusource.HasValue || shippingstrategy.HasValue || statistictype != 0)
{
var s = "";
if (statistictype == 1) //sku产品类型
......@@ -3905,7 +3905,7 @@ namespace Bailun.DC.Services
cn.Open();
}
var obj = cn.Page<mExchangeLoss>(parameter.pageIndex, parameter.limit, sql, ref total, sqlparam,"",2*60);
var obj = cn.Page<mExchangeLoss>(parameter.pageIndex, parameter.limit, sql, ref total, sqlparam, "", 2 * 60);
return obj.ToList();
}
......@@ -3949,7 +3949,7 @@ namespace Bailun.DC.Services
cn.Open();
}
var obj = cn.QueryFirstOrDefault<mExchangeLoss>(sql,sqlparam);
var obj = cn.QueryFirstOrDefault<mExchangeLoss>(sql, sqlparam);
return obj;
}
}
......@@ -3964,7 +3964,7 @@ namespace Bailun.DC.Services
//区分合并订单和不合并订单
var sql = $@"select t2.order_currency as currency,t1.transaction_id,sum(t1.amount_sales*t1.bailun_sku_quantity_ordered) sales_amount_sku,sum(bailun_sku_quantity_ordered) count_sales,sum(t1.bailun_sku_quantity_shipped) count_shipping from dc_base_oms_sku t1
join dc_base_oms_order t2 on t1.origin_order_id=t2.origin_order_id and t2.bailun_merge_status!='Merged'
where t1.transaction_id in ('{string.Join("','",transactions)}') and t1.has_delete=0
where t1.transaction_id in ('{string.Join("','", transactions)}') and t1.has_delete=0
group by t1.transaction_id
union all
select t2.order_currency as currency,t2.transaction_id,sum(t1.amount_sales*t1.bailun_sku_quantity_ordered) sales_amount_sku,sum(bailun_sku_quantity_ordered) count_sales,sum(t1.bailun_sku_quantity_shipped) count_shipping from dc_base_oms_sku t1
......@@ -3999,7 +3999,7 @@ namespace Bailun.DC.Services
/// <param name="platform">平台类型</param>
/// <param name="timetype">1:创建时间，2：付款时间</param>
/// <returns></returns>
public List<Models.Ebay.mEbaySkuSales> ListEbaySkuSalesCount(int page, int pagesize, DateTime start, DateTime end, string[] skus, string platform,int timetype=1)
public List<Models.Ebay.mEbaySkuSales> ListEbaySkuSalesCount(int page, int pagesize, DateTime start, DateTime end, string[] skus, string platform, int timetype = 1)
{
var sql = $@"select t1.platform_type,t1.website,t1.bailun_sku,sum(t1.bailun_sku_quantity_ordered) as bailun_sku_quantity_ordered,sum(t1.bailun_sku_quantity_ordered*t1.amount_sales*t1.seller_order_exchange_rate) as amount_sales from dc_base_oms_sku t1
where bailun_order_status!='Canceled' and has_scalp=0 and has_delete=0 and has_innersale=0 and has_innersale=0 ";
......@@ -4028,7 +4028,7 @@ namespace Bailun.DC.Services
if (skus.Length > 0)
{
sql += $" and bailun_sku in ('{string.Join("','",skus)}')";
sql += $" and bailun_sku in ('{string.Join("','", skus)}')";
}
sql += " group by t1.bailun_sku,t1.website,t1.platform_type";
......@@ -4040,7 +4040,7 @@ namespace Bailun.DC.Services
cn.Open();
}
var obj = cn.Query<Models.Ebay.mEbaySkuSales>(sql+" limit "+(page-1)*pagesize+","+pagesize, null, null, true, 2 * 60).ToList();
var obj = cn.Query<Models.Ebay.mEbaySkuSales>(sql + " limit " + (page - 1) * pagesize + "," + pagesize, null, null, true, 2 * 60).ToList();
return obj;
}
......@@ -4104,7 +4104,7 @@ namespace Bailun.DC.Services
/// <param name="start"></param>
/// <param name="end"></param>
/// <returns></returns>
public List<DateTime> ListSaleCountChangeDate(DateTime start,DateTime end)
public List<DateTime> ListSaleCountChangeDate(DateTime start, DateTime end)
{
var sql = $@"select distinct DATE_FORMAT(t1.purchase_create_time,'%Y-%m-%d') from dc_base_oms_sku as t1 where (t1.gmt_modified >= '{start.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.gmt_modified <='{end.ToString("yyyy-MM-dd HH:mm:ss")}') or (
(t1.has_delete = 1 or t1.has_scalp = 1) and t1.gmt_modified >= '{start.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.gmt_modified <='{end.ToString("yyyy-MM-dd HH:mm:ss")}')";
......@@ -4146,19 +4146,19 @@ namespace Bailun.DC.Services
if (!string.IsNullOrEmpty(skucode))
{
sqlwhere += " and t2.product_inner_code='"+skucode+"'";
sqlwhere += " and t2.product_inner_code='" + skucode + "'";
//sqlparam.Add("skucode", skucode);
}
if (!string.IsNullOrEmpty(orderno))
{
sqlwhere += " and t1.origin_order_id='"+orderno+"'";
sqlwhere += " and t1.origin_order_id='" + orderno + "'";
}
var strOrder = "";
if (!string.IsNullOrEmpty(parameter.sort))
{
strOrder += " order by "+parameter.sort+" "+parameter.order;
strOrder += " order by " + parameter.sort + " " + parameter.order;
}
sqlwhere += "group by t1.origin_order_id,t2.product_inner_code ";
......@@ -4170,9 +4170,9 @@ namespace Bailun.DC.Services
cn.Open();
}
var obj = cn.Query<mInnerCodeProfit>(sql + sqlwhere+ strOrder + (" limit "+ (parameter.pageIndex-1)*parameter.limit+","+parameter.limit), sqlparam, null, true, 2 * 60);
var obj = cn.Query<mInnerCodeProfit>(sql + sqlwhere + strOrder + (" limit " + (parameter.pageIndex - 1) * parameter.limit + "," + parameter.limit), sqlparam, null, true, 2 * 60);
total = cn.QueryFirstOrDefault<int>("select count(*) from (select t2.product_inner_code,t1.origin_order_id,t1.platform_type,t1.website " + sqlwhere + ") tb",sqlparam);
total = cn.QueryFirstOrDefault<int>("select count(*) from (select t2.product_inner_code,t1.origin_order_id,t1.platform_type,t1.website " + sqlwhere + ") tb", sqlparam);
return obj.ToList();
}
......@@ -4215,7 +4215,7 @@ namespace Bailun.DC.Services
cn.Open();
}
var obj = cn.QueryFirstOrDefault<mInnerCodeProfit>(sql + sqlwhere ,sqlparam, null,2*60);
var obj = cn.QueryFirstOrDefault<mInnerCodeProfit>(sql + sqlwhere, sqlparam, null, 2 * 60);
return obj;
}
......@@ -4282,7 +4282,7 @@ namespace Bailun.DC.Services
/// <param name="warehousecode">发货仓库编码</param>
/// <param name="total"></param>
/// <returns></returns>
public List<Models.Orders.dc_base_oms_order> ListPlatformStatistics(BtTableParameter parameter, string platform,string website, string account, DateTime? start, DateTime? end, string warehousetype, string warehousecode, int? companyid, ref int total, string skucategoryids)
public List<Models.Orders.dc_base_oms_order> ListPlatformStatistics(BtTableParameter parameter, string platform, string website, string account, DateTime? start, DateTime? end, string warehousetype, string warehousecode, int? companyid, ref int total, string skucategoryids)
{
var sqlparam = new DynamicParameters();
......@@ -4734,7 +4734,7 @@ namespace Bailun.DC.Services
/// <param name="sku">sku编码</param>
/// <param name="total">符合条件的记录数</param>
/// <returns></returns>
public List<dc_mid_skudeliver_weighdiff> ListWeighDiff(BtTableParameter request, DateTime? start, DateTime? end, int? min, int? max, string sku, ref int total,string warehousetype,string warehousecode)
public List<dc_mid_skudeliver_weighdiff> ListWeighDiff(BtTableParameter request, DateTime? start, DateTime? end, int? min, int? max, string sku, ref int total, string warehousetype, string warehousecode)
{
var sqlparam = new DynamicParameters();
var sql = @"select t1.*,t3.warehouse_name from dc_mid_skudeliver_weighdiff t1 ";
......@@ -4930,7 +4930,7 @@ namespace Bailun.DC.Services
/// <param name="end"></param>
/// <param name="total"></param>
/// <returns></returns>
public List<dc_base_oms_sku> ListOrderSkuProfit(int page, int pagesize, DateTime start, DateTime end,string orderno)
public List<dc_base_oms_sku> ListOrderSkuProfit(int page, int pagesize, DateTime start, DateTime end, string orderno)
{
var sqlparam = new DynamicParameters();
......@@ -4951,7 +4951,7 @@ namespace Bailun.DC.Services
cn.Open();
}
var obj = cn.Query<dc_base_oms_sku>(sql,sqlparam,null,true,2 * 60);
var obj = cn.Query<dc_base_oms_sku>(sql, sqlparam, null, true, 2 * 60);
return obj.ToList();
}
......@@ -4976,7 +4976,7 @@ namespace Bailun.DC.Services
if (!string.IsNullOrEmpty(orderno))
{
sql += " and t1.bailun_order_id=@orderno";
sqlparam.Add("orderno",orderno);
sqlparam.Add("orderno", orderno);
}
sql += $"{" limit " + (page - 1) * pagesize + "," + pagesize}";
......@@ -5079,7 +5079,7 @@ namespace Bailun.DC.Services
sqlparam.Add("platform", platform);
}
sql += " group by platform_type,website,platform_sku limit "+(page-1)*pagesize+","+pagesize;
sql += " group by platform_type,website,platform_sku limit " + (page - 1) * pagesize + "," + pagesize;
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString_read))
{
......@@ -5088,7 +5088,7 @@ namespace Bailun.DC.Services
cn.Open();
}
var obj = cn.Query<dc_base_oms_platform_sku>(sql,sqlparam);
var obj = cn.Query<dc_base_oms_platform_sku>(sql, sqlparam);
return obj.AsList();
}
......@@ -5198,7 +5198,7 @@ namespace Bailun.DC.Services
/// <param name="orderno">平台订单号</param>
/// <param name="total">符合条件的记录数</param>
/// <returns></returns>
public List<dc_base_crm_refund> ListOrderReturn(BtTableParameter parameter, DateTime? start, DateTime? end, DateTime? paytimestart, DateTime? paytimeend, int? companyid, string platform, string website, string orderno,int? shippingstatus, ref int total)
public List<dc_base_crm_refund> ListOrderReturn(BtTableParameter parameter, DateTime? start, DateTime? end, DateTime? paytimestart, DateTime? paytimeend, int? companyid, string platform, string website, string orderno, int? shippingstatus, ref int total)
{
var sqlparam = new DynamicParameters();
......@@ -5287,7 +5287,7 @@ namespace Bailun.DC.Services
if (paytimeend.HasValue)
{
sql += " and paid_time<@paytimeend";
sqlparam.Add("paytimeend",paytimeend.Value.AddDays(1));
sqlparam.Add("paytimeend", paytimeend.Value.AddDays(1));
}
sql += ") t2 on t1.origin_order_id=t2.origin_order_id";
......@@ -5516,7 +5516,7 @@ namespace Bailun.DC.Services
cn.Open();
}
var obj = cn.Query<dc_base_crm_refund>(sql,sqlparam,null,true,2*60);
var obj = cn.Query<dc_base_crm_refund>(sql, sqlparam, null, true, 2 * 60);
return obj.AsList();
}
......@@ -5618,7 +5618,7 @@ namespace Bailun.DC.Services
sql += ") t2 on t1.origin_order_id=t2.origin_order_id";
}
sql += " where t1.is_deleted=0 and t1.is_freeze=0 and t1.company_id="+companyid.Value;
sql += " where t1.is_deleted=0 and t1.is_freeze=0 and t1.company_id=" + companyid.Value;
if (start.HasValue)
{
......@@ -5674,7 +5674,7 @@ namespace Bailun.DC.Services
cn.Open();
}
var obj = cn.QueryFirstOrDefault<dc_base_crm_refund>(sql,sqlparam,null,2*60);
var obj = cn.QueryFirstOrDefault<dc_base_crm_refund>(sql, sqlparam, null, 2 * 60);
return obj;
}
......@@ -5691,7 +5691,7 @@ namespace Bailun.DC.Services
/// <param name="website"></param>
/// <param name="isUSD"></param>
/// <returns></returns>
public List<dc_base_oms_order> ListPlatformRefund(DateTime? start, DateTime? end, int? companyid, string platform, string website, bool isUSD,bool containNotShipping, int[] producttype, int? skusource, int? shippingstrategy,int statistictype)
public List<dc_base_oms_order> ListPlatformRefund(DateTime? start, DateTime? end, int? companyid, string platform, string website, bool isUSD, bool containNotShipping, int[] producttype, int? skusource, int? shippingstrategy, int statistictype)
{
var str_statistic_col = "t1.platform_type";
......@@ -5705,15 +5705,15 @@ namespace Bailun.DC.Services
}
var sqlparam = new DynamicParameters();
var sql = $"select {str_statistic_col},{(isUSD? "sum(t1.amount_refund_usd)" : "sum(t1.amount_refund_rmb)")} as amount_refund from dc_base_crm_refund t1 ";
var sql = $"select {str_statistic_col},{(isUSD ? "sum(t1.amount_refund_usd)" : "sum(t1.amount_refund_rmb)")} as amount_refund from dc_base_crm_refund t1 ";
if ((producttype!=null && producttype.Count()>0) || skusource.HasValue || shippingstrategy.HasValue || statistictype!=0)
if ((producttype != null && producttype.Count() > 0) || skusource.HasValue || shippingstrategy.HasValue || statistictype != 0)
{
sql += " join dc_base_sku t10 on t1.bailun_sku=t10.bailun_sku ";
if (producttype!=null && producttype.Count()>0)
if (producttype != null && producttype.Count() > 0)
{
sql += " and t10.bailun_category_id in (" + string.Join(",",producttype)+") ";
sql += " and t10.bailun_category_id in (" + string.Join(",", producttype) + ") ";
}
if (skusource.HasValue)
......@@ -5774,7 +5774,7 @@ namespace Bailun.DC.Services
if (companyid.HasValue && companyid.Value != 0)
{
sql += " and t1.company_id="+companyid.Value;
sql += " and t1.company_id=" + companyid.Value;
}
if (!string.IsNullOrWhiteSpace(platform))
......@@ -5823,7 +5823,7 @@ namespace Bailun.DC.Services
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString_read))
{
if(cn.State== System.Data.ConnectionState.Closed)
if (cn.State == System.Data.ConnectionState.Closed)
{
cn.Open();
}
......@@ -5840,7 +5840,7 @@ namespace Bailun.DC.Services
/// <param name="start">退款开始时间</param>
/// <param name="end">退款结束时间</param>
/// <returns></returns>
public List<mRefundForFinance> ListRefundForFinance(DateTime start,DateTime end)
public List<mRefundForFinance> ListRefundForFinance(DateTime start, DateTime end)
{
//var sql = $@"select * from (
// select distinct t1.platform_type,CONCAT('`',t1.origin_order_id) as origin_order_id,t1.refund_time,t1.amount_refund,t1.order_currency as currency,t1.shipping_status,t1.bailun_sku,t4.financecategoryname,t2.shipping_time,t1.order_total_amount,t6.order_currency,t6.website,t6.transaction_id as trancation_id,t1.amount_refund_rmb
......@@ -5871,7 +5871,7 @@ namespace Bailun.DC.Services
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString_read))
{
if(cn.State== System.Data.ConnectionState.Closed)
if (cn.State == System.Data.ConnectionState.Closed)
{
cn.Open();
}
......@@ -5879,9 +5879,10 @@ namespace Bailun.DC.Services
var obj = cn.Query<mRefundForFinance>(sql).ToList();
var listNotEbayOrderInfo = cn.Query<dc_base_oms_order>($"select platform_type,website,order_currency,origin_order_id,transaction_id from dc_base_oms_order where platform_type!='Ebay' and origin_order_id in ('{string.Join("','", obj.Where(a => a.platform_type.ToLower() != "ebay").Select(a => a.origin_order_id))}')").ToList();
var listEbayOrderInfo = cn.Query<dc_base_oms_order>($"select platform_type,website,order_currency,origin_order_id,transaction_id from dc_base_oms_order where platform_type='Ebay' and transaction_id in ('{string.Join("','", obj.Where(a=>a.platform_type.ToLower()=="ebay").Select(a => a.origin_order_id))}')").ToList();
var listEbayOrderInfo = cn.Query<dc_base_oms_order>($"select platform_type,website,order_currency,origin_order_id,transaction_id from dc_base_oms_order where platform_type='Ebay' and transaction_id in ('{string.Join("','", obj.Where(a => a.platform_type.ToLower() == "ebay").Select(a => a.origin_order_id))}')").ToList();
obj.ForEach(a => {
obj.ForEach(a =>
{
if (a.platform_type.ToLower() == "ebay")
{
var objOrder = listEbayOrderInfo.Where(o => o.transaction_id == a.origin_order_id).FirstOrDefault();
......@@ -5927,7 +5928,7 @@ namespace Bailun.DC.Services
/// <param name="companyid"></param>
/// <param name="total"></param>
/// <returns></returns>
public List<dc_base_finance_amazon_ad_product> ListAmazonADSku(BtTableParameter parameter, string account, DateTime? start, DateTime? end, int? companyid,int? type, ref int total)
public List<dc_base_finance_amazon_ad_product> ListAmazonADSku(BtTableParameter parameter, string account, DateTime? start, DateTime? end, int? companyid, int? type, ref int total)
{
var sqlparam = new DynamicParameters();
var sql = "select t2.account_name,t1.sku,t1.currency,cost,(cost*exchange_rate) cost_rmb,report_date,type from dc_base_finance_amazon_ad_product t1 join dc_base_company_account t2 on t1.account_id=t2.account_id ";
......@@ -5958,9 +5959,9 @@ namespace Bailun.DC.Services
sqlparam.Add("end", end.Value.AddDays(1));
}
if(type.HasValue)
if (type.HasValue)
{
sql += " and t1.type="+type.Value;
sql += " and t1.type=" + type.Value;
}
if (!string.IsNullOrEmpty(parameter.sort))
......@@ -5991,7 +5992,7 @@ namespace Bailun.DC.Services
/// <param name="companyid"></param>
/// <param name="total"></param>
/// <returns></returns>
public List<dc_base_finance_amazon_ad_product> ListAmazonADSku(string account, DateTime? start, DateTime? end, int? companyid,int? type)
public List<dc_base_finance_amazon_ad_product> ListAmazonADSku(string account, DateTime? start, DateTime? end, int? companyid, int? type)
{
var sqlparam = new DynamicParameters();
var sql = "select t2.account_name,t1.sku,t1.currency,cost,(cost*exchange_rate) cost_rmb,report_date,asin,t2.site_en,t1.type from dc_base_finance_amazon_ad_product t1 join dc_base_company_account t2 on t1.account_id=t2.account_id ";
......@@ -6022,9 +6023,9 @@ namespace Bailun.DC.Services
sqlparam.Add("end", end.Value.AddDays(1));
}
if(type.HasValue)
if (type.HasValue)
{
sql += " and t1.type="+type.Value;
sql += " and t1.type=" + type.Value;
}
......@@ -6049,7 +6050,7 @@ namespace Bailun.DC.Services
/// <param name="end"></param>
/// <param name="companyid"></param>
/// <returns></returns>
public dc_base_finance_amazon_ad_product ListAmazonADSkuCount(string account, DateTime? start, DateTime? end, int? companyid,bool isUSD, int[] producttype, int? skusource, int? shippingstrategy,string platform,string website, int? type)
public dc_base_finance_amazon_ad_product ListAmazonADSkuCount(string account, DateTime? start, DateTime? end, int? companyid, bool isUSD, int[] producttype, int? skusource, int? shippingstrategy, string platform, string website, int? type)
{
if (platform != null && platform.ToLower() != "fba")
{
......@@ -6057,7 +6058,7 @@ namespace Bailun.DC.Services
}
var sqlparam = new DynamicParameters();
var sql = $"select sum(cost) cost,sum(cost*{(isUSD?"exchange_rate_usd":"exchange_rate")}) cost_rmb from dc_base_finance_amazon_ad_product t1 join dc_base_company_account t2 on t1.account_id=t2.account_id ";
var sql = $"select sum(cost) cost,sum(cost*{(isUSD ? "exchange_rate_usd" : "exchange_rate")}) cost_rmb from dc_base_finance_amazon_ad_product t1 join dc_base_company_account t2 on t1.account_id=t2.account_id ";
if (!string.IsNullOrEmpty(account))
{
......@@ -6080,9 +6081,9 @@ namespace Bailun.DC.Services
sql += " join dc_base_sku t10 on t1.bailun_sku=t10.bailun_sku ";
if (producttype.Count()>0)
if (producttype.Count() > 0)
{
sql += " and t10.bailun_category_id in (" + string.Join(",",producttype)+") ";
sql += " and t10.bailun_category_id in (" + string.Join(",", producttype) + ") ";
}
if (skusource.HasValue)
......@@ -6149,9 +6150,9 @@ namespace Bailun.DC.Services
/// <param name="end"></param>
/// <param name="companyid"></param>
/// <returns></returns>
public List<dc_base_finance_amazon_ad_product> ListAmazonADSkuCount(string account, DateTime? start, DateTime? end, int? companyid, bool isUSD, int[] producttype, int? skusource, int? shippingstrategy,int statistictype,string platform,string website)
public List<dc_base_finance_amazon_ad_product> ListAmazonADSkuCount(string account, DateTime? start, DateTime? end, int? companyid, bool isUSD, int[] producttype, int? skusource, int? shippingstrategy, int statistictype, string platform, string website)
{
if (platform!=null && platform.ToLower() != "fba")
if (platform != null && platform.ToLower() != "fba")
{
return new List<dc_base_finance_amazon_ad_product>();
}
......@@ -6166,7 +6167,7 @@ namespace Bailun.DC.Services
}
//Add by Allan at 20200320
if ((producttype != null && producttype.Count() > 0) || skusource.HasValue || shippingstrategy.HasValue || statistictype!=0)
if ((producttype != null && producttype.Count() > 0) || skusource.HasValue || shippingstrategy.HasValue || statistictype != 0)
{
var s = "";
......@@ -6272,14 +6273,14 @@ namespace Bailun.DC.Services
/// <param name="total">符合条件的总记录数</param>
/// <param name="isUSD">是否美元</param>
/// <returns></returns>
public List<dc_base_finance_wish> ListWishAD(BtTableParameter parameter,int? companyid, string account_name, DateTime? start, DateTime? end, ref int total,bool isUSD)
public List<dc_base_finance_wish> ListWishAD(BtTableParameter parameter, int? companyid, string account_name, DateTime? start, DateTime? end, ref int total, bool isUSD)
{
var sqlparam = new DynamicParameters();
var sql = $"select t1.campaign_name,t2.account_name,t1.daily_total_campaign_spend,(t1.daily_total_campaign_spend*{(isUSD? "t1.other_to_usd_exchange_rate":"t1.other_to_cny_exchange_rate")}) daily_total_campaign_spend_rmb,t1.record_time from dc_base_finance_wish t1 join dc_base_company_account t2 on t1.account_id=t2.account_id where 1=1 ";
var sql = $"select t1.campaign_name,t2.account_name,t1.daily_total_campaign_spend,(t1.daily_total_campaign_spend*{(isUSD ? "t1.other_to_usd_exchange_rate" : "t1.other_to_cny_exchange_rate")}) daily_total_campaign_spend_rmb,t1.record_time from dc_base_finance_wish t1 join dc_base_company_account t2 on t1.account_id=t2.account_id where 1=1 ";
if (companyid.HasValue && companyid.Value > 0)
{
sql += " and t1.company_id="+companyid.Value;
sql += " and t1.company_id=" + companyid.Value;
}
if (!string.IsNullOrEmpty(account_name))
......@@ -6323,7 +6324,7 @@ namespace Bailun.DC.Services
/// <param name="total">符合条件的总记录数</param>
/// <param name="isUSD">是否美元</param>
/// <returns></returns>
public List<dc_base_finance_wish> ListWishAD(int? companyid, string account_name, DateTime? start, DateTime? end , bool isUSD)
public List<dc_base_finance_wish> ListWishAD(int? companyid, string account_name, DateTime? start, DateTime? end, bool isUSD)
{
var sqlparam = new DynamicParameters();
var sql = $"select t1.campaign_name,t2.account_name,t1.daily_total_campaign_spend,(t1.daily_total_campaign_spend*{(isUSD ? "t1.other_to_usd_exchange_rate" : "t1.other_to_cny_exchange_rate")}) daily_total_campaign_spend_rmb,t1.record_time from dc_base_finance_wish t1 join dc_base_company_account t2 on t1.account_id=t2.account_id where 1=1 ";
......@@ -6358,7 +6359,7 @@ namespace Bailun.DC.Services
cn.Open();
}
var obj = cn.Query<dc_base_finance_wish>(sql,sqlparam, null,true,2 * 60);
var obj = cn.Query<dc_base_finance_wish>(sql, sqlparam, null, true, 2 * 60);
return obj.AsList();
}
......@@ -6408,7 +6409,7 @@ namespace Bailun.DC.Services
cn.Open();
}
var obj = cn.QueryFirstOrDefault<dc_base_finance_wish>(sql, sqlparam,null,2*60);
var obj = cn.QueryFirstOrDefault<dc_base_finance_wish>(sql, sqlparam, null, 2 * 60);
return obj;
}
}
......@@ -6431,11 +6432,11 @@ namespace Bailun.DC.Services
public List<dc_base_finance_aliexpress> ListAliexpressAD(BtTableParameter parameter, int? companyid, string account, DateTime? start, DateTime? end, bool isUSD, ref int total)
{
var sqlparam = new DynamicParameters();
var sql = $" select account_name,product_name,exposure,clickcount,clickrate,cost_fee,(cost_fee*{(isUSD? "to_usd_rate" : "to_rmb_rate")}) cost_fee_rmb,currency,recore_time from dc_base_finance_aliexpress where delstatus=0";
var sql = $" select account_name,product_name,exposure,clickcount,clickrate,cost_fee,(cost_fee*{(isUSD ? "to_usd_rate" : "to_rmb_rate")}) cost_fee_rmb,currency,recore_time from dc_base_finance_aliexpress where delstatus=0";
if (companyid.HasValue && companyid.Value > 0)
{
sql += " and company_id="+companyid.Value;
sql += " and company_id=" + companyid.Value;
}
if (!string.IsNullOrEmpty(account))
......@@ -6512,7 +6513,7 @@ namespace Bailun.DC.Services
cn.Open();
}
var obj = cn.Query<dc_base_finance_aliexpress>(sql, sqlparam,null,true,2*60).AsList();
var obj = cn.Query<dc_base_finance_aliexpress>(sql, sqlparam, null, true, 2 * 60).AsList();
return obj;
}
}
......@@ -6561,7 +6562,7 @@ namespace Bailun.DC.Services
cn.Open();
}
var obj = cn.QueryFirstOrDefault<dc_base_finance_aliexpress>(sql, sqlparam, null,2 * 60);
var obj = cn.QueryFirstOrDefault<dc_base_finance_aliexpress>(sql, sqlparam, null, 2 * 60);
return obj;
}
}
......@@ -6604,7 +6605,13 @@ namespace Bailun.DC.Services
public decimal ShopifyAD(DateTime? start, DateTime? end, bool isUSD)
{
var sqlparam = new DynamicParameters();
//WINDIWOS
TimeZoneInfo easternZone = TimeZoneInfo.FindSystemTimeZoneById("Eastern Standard Time");
//LINUX
if (Environment.OSVersion.Platform == PlatformID.Unix)
{
easternZone = TimeZoneInfo.FindSystemTimeZoneById("America/New_York");
}
var sql = $" select round(sum(fee * {(isUSD ? "1" : "cny_exchange_rate")}),2) as fee from dc_base_finance_shopify_fee where status = 0";
if (start.HasValue)
......@@ -6650,7 +6657,7 @@ namespace Bailun.DC.Services
/// <param name="companyid"></param>
/// <param name="total"></param>
/// <returns></returns>
public List<dc_base_finance_paypal> ListPaypal(BtTableParameter parameter,DateTime? start,DateTime? end,int? companyid,ref int total)
public List<dc_base_finance_paypal> ListPaypal(BtTableParameter parameter, DateTime? start, DateTime? end, int? companyid, ref int total)
{
var sqlparam = new DynamicParameters();
var sql = "select t1.transaction_id,t1.receipt_id,t1.transaction_type,t1.payment_type,t1.payment_date,t1.gross_amount,t1.payment_status,t1.business,t1.receiver,t1.currency,(t1.gross_amount*t1.other_to_cny_exchange_rate) gross_amount_rmb from dc_base_finance_paypal t1 where 1=1 ";
......@@ -6772,7 +6779,7 @@ namespace Bailun.DC.Services
cn.Open();
}
var obj = cn.Query<dc_base_finance_paypal>(sql,sqlparam, null,true,2*60);
var obj = cn.Query<dc_base_finance_paypal>(sql, sqlparam, null, true, 2 * 60);
return obj.AsList();
}
......@@ -6782,7 +6789,7 @@ namespace Bailun.DC.Services
#region 拦截订单
public List<mInterceptOrderItemid> ListInterceptOrderItemId(int page,int pagesize,DateTime? start, DateTime? end,ref int total,string platform,int? accountid)
public List<mInterceptOrderItemid> ListInterceptOrderItemId(int page, int pagesize, DateTime? start, DateTime? end, ref int total, string platform, int? accountid)
{
var sqlparam = new DynamicParameters();
......@@ -6805,7 +6812,7 @@ namespace Bailun.DC.Services
sqlparam.Add("platform", platform);
}
if(accountid.HasValue)
if (accountid.HasValue)
{
sql += " and bailun_account_id=@accountid";
sqlparam.Add("accountid", accountid.Value);
......@@ -6818,12 +6825,12 @@ namespace Bailun.DC.Services
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString_read))
{
if(cn.State== System.Data.ConnectionState.Closed)
if (cn.State == System.Data.ConnectionState.Closed)
{
cn.Open();
}
var obj = cn.Query<mInterceptOrderItemid>(sql, sqlparam, null,true,2*60).AsList();
var obj = cn.Query<mInterceptOrderItemid>(sql, sqlparam, null, true, 2 * 60).AsList();
return obj;
}
......@@ -6846,7 +6853,7 @@ namespace Bailun.DC.Services
/// <param name="companyid"></param>
/// <param name="skucategoryids"></param>
/// <returns></returns>
public List<Models.OrderChart.ProformProfitChart> ListOrderProfitGraph(string col,string platform, DateTime? start, DateTime? end, DateTime? shipstart, DateTime? shipend, bool isUSD, int? companyid, string skucategoryids)
public List<Models.OrderChart.ProformProfitChart> ListOrderProfitGraph(string col, string platform, DateTime? start, DateTime? end, DateTime? shipstart, DateTime? shipend, bool isUSD, int? companyid, string skucategoryids)
{
var sqlparam = new DynamicParameters();
......@@ -6858,7 +6865,7 @@ namespace Bailun.DC.Services
{
if (col == "amount_sales") //销售额需转换汇率
{
col = "sum(" + col + "*"+(!isUSD? "seller_order_exchange_rate" : "order_to_usd_exchange_rate") +") as val";
col = "sum(" + col + "*" + (!isUSD ? "seller_order_exchange_rate" : "order_to_usd_exchange_rate") + ") as val";
}
else
{
......@@ -6962,7 +6969,7 @@ namespace Bailun.DC.Services
/// <param name="warehoursetype"></param>
/// <param name="warehousecode"></param>
/// <returns></returns>
public List<Models.OrderChart.ProformProfitChart> ListOrderSalesGraph(string col,string platform,DateTime? start,DateTime? end,string website,string account,int? companyid,string skucategoryids,string warehoursetype,string warehousecode,bool websiteGroup=false)
public List<Models.OrderChart.ProformProfitChart> ListOrderSalesGraph(string col, string platform, DateTime? start, DateTime? end, string website, string account, int? companyid, string skucategoryids, string warehoursetype, string warehousecode, bool websiteGroup = false)
{
var sqlparam = new DynamicParameters();
......@@ -7060,7 +7067,7 @@ namespace Bailun.DC.Services
sqlparam.Add("platform_type", platform);
}
if(start.HasValue)
if (start.HasValue)
{
fromsql += " and paid_time>=@start";
sqlparam.Add("start", start.Value);
......@@ -7602,7 +7609,7 @@ namespace Bailun.DC.Services
/// <param name="bailunsku">sku编码</param>
/// <param name="total">符合条件的记录数</param>
/// <returns></returns>
public List<dc_mid_cost_first> ListCostFirst(BtTableParameter request,string warehousetype,string warehousecode,string bailunsku,ref int total)
public List<dc_mid_cost_first> ListCostFirst(BtTableParameter request, string warehousetype, string warehousecode, string bailunsku, ref int total)
{
var sqlparam = new DynamicParameters();
......@@ -7631,7 +7638,7 @@ namespace Bailun.DC.Services
if (!string.IsNullOrEmpty(request.sort))
{
sql += " order by t1."+request.sort+" "+request.order;
sql += " order by t1." + request.sort + " " + request.order;
}
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString_read))
......@@ -7656,44 +7663,44 @@ namespace Bailun.DC.Services
/// <param name="warehousecode"></param>
/// <param name="type"></param>
/// <returns></returns>
public List<dc_base_cost_first_finish> ListCostFirstJson(BtTableParameter request, string transfer_order_id, string bailun_sku,string warehousetype, string warehousecode, int? type,ref int total)
public List<dc_base_cost_first_finish> ListCostFirstJson(BtTableParameter request, string transfer_order_id, string bailun_sku, string warehousetype, string warehousecode, int? type, ref int total)
{
var sql = "select t1.*,t2.warehouse_name from dc_base_cost_first_finish t1 join dc_base_warehouse t2 on t1.warehouse_code=t2.warehouse_code where 1=1 ";
var sqlparam = new DynamicParameters();
if(!string.IsNullOrEmpty(warehousetype))
if (!string.IsNullOrEmpty(warehousetype))
{
sql += " and t2.hq_type=@warehousetype";
sqlparam.Add("warehousetype",warehousetype);
sqlparam.Add("warehousetype", warehousetype);
}
if(!string.IsNullOrEmpty(bailun_sku))
if (!string.IsNullOrEmpty(bailun_sku))
{
sql += " and t1.bailun_sku=@bailun_sku";
sqlparam.Add("bailun_sku", bailun_sku);
}
if(!string.IsNullOrEmpty(warehousecode))
if (!string.IsNullOrEmpty(warehousecode))
{
sql += " and t1.warehouse_code = @warehousecode";
sqlparam.Add("warehousecode", warehousecode);
}
if(!string.IsNullOrEmpty(transfer_order_id))
if (!string.IsNullOrEmpty(transfer_order_id))
{
sql += " and t1.transfer_order_id = @transfer_order_id";
sqlparam.Add("transfer_order_id", transfer_order_id);
}
if(type.HasValue)
if (type.HasValue)
{
sql += " and t1.exception_type=@type";
sqlparam.Add("type",type);
sqlparam.Add("type", type);
}
if(!string.IsNullOrEmpty(request.sort))
if (!string.IsNullOrEmpty(request.sort))
{
sql += " order by "+request.sort+" "+request.order;
sql += " order by " + request.sort + " " + request.order;
}
else
{
......@@ -7702,7 +7709,7 @@ namespace Bailun.DC.Services
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString_read))
{
if(cn.State== System.Data.ConnectionState.Closed)
if (cn.State == System.Data.ConnectionState.Closed)
{
cn.Open();
}
......@@ -7739,9 +7746,9 @@ namespace Bailun.DC.Services
left join dc_daily_item_oneday_profit_rate t2 on t1.item_id=t2.item_id and t1.day=t2.day
where t1.day='{day.ToString("yyyy-MM-dd")}'";
if(itemid.Count>0)
if (itemid.Count > 0)
{
sql+= $@" and t1.item_id in ('{string.Join("','", itemid)}')";
sql += $@" and t1.item_id in ('{string.Join("','", itemid)}')";
}
return cn.Query<mItemNoProfitRate>(sql).ToList();
......@@ -7785,18 +7792,18 @@ namespace Bailun.DC.Services
/// <param name="day"></param>
/// <param name="total"></param>
/// <returns></returns>
public List<dc_mid_itemno_profit_order> ListItemNoOrder(BtTableParameter parameter, string itemid, DateTime day,ref int total)
public List<dc_mid_itemno_profit_order> ListItemNoOrder(BtTableParameter parameter, string itemid, DateTime day, ref int total)
{
var sql = $@"select * from dc_mid_itemno_profit_order where item_id='{itemid}' and day='{day.ToString("yyyy-MM-dd")}'";
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString_read))
{
if(cn.State== System.Data.ConnectionState.Closed)
if (cn.State == System.Data.ConnectionState.Closed)
{
cn.Open();
}
if(parameter.limit==0)
if (parameter.limit == 0)
{
var obj = cn.Page<dc_mid_itemno_profit_order>(parameter.pageIndex, parameter.limit, sql, ref total);
......@@ -7804,7 +7811,7 @@ namespace Bailun.DC.Services
}
else
{
return cn.Query<dc_mid_itemno_profit_order>(sql,null,null,true,6*60).ToList();
return cn.Query<dc_mid_itemno_profit_order>(sql, null, null, true, 6 * 60).ToList();
}
}
......@@ -7845,7 +7852,7 @@ namespace Bailun.DC.Services
/// <param name="start">开始时间</param>
/// <param name="end">结束时间</param>
/// <returns></returns>
public dc_base_oms_order GetProfitTotal(DateTime start,DateTime end)
public dc_base_oms_order GetProfitTotal(DateTime start, DateTime end)
{
var sql = $"select Count(id) id,sum(amount_sales*seller_order_exchange_rate) amount_sales,sum(profit_total) profit_total,sum(profit_total)/sum(amount_sales*seller_order_exchange_rate) as profit_rate from dc_base_oms_order where create_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and create_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}'";
......@@ -7872,7 +7879,7 @@ namespace Bailun.DC.Services
/// <param name="end">付款结束时间</param>
/// <param name="platform">平台类型</param>
/// <returns></returns>
public List<mPlatformItemIdSaleCount> ListPlatformItemIdCount(int page,int pagesize,DateTime start, DateTime end, string platform)
public List<mPlatformItemIdSaleCount> ListPlatformItemIdCount(int page, int pagesize, DateTime start, DateTime end, string platform)
{
var sql = $@"select t1.platform_type,t1.item_id,sum(t1.platform_sku_quantity_ordered) platform_sku_quantity_ordered from dc_base_oms_platform_sku t1 where t1.bailun_order_status!='Canceled' and t1.has_cancle=0 and t1.has_delete=0 and t1.has_scalp=0 and ((t1.platform_type!='FBA' and t1.bailun_order_status!='CantHandle') or t1.platform_type='FBA')
";
......@@ -7890,7 +7897,7 @@ namespace Bailun.DC.Services
sql += " group by t1.platform_type,t1.item_id";
sql += " limit "+(page-1)*pagesize+","+pagesize;
sql += " limit " + (page - 1) * pagesize + "," + pagesize;
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString_read))
{
......@@ -7899,7 +7906,7 @@ namespace Bailun.DC.Services
cn.Open();
}
var obj = cn.Query<mPlatformItemIdSaleCount>(sql, null, null, true,2*60).ToList();
var obj = cn.Query<mPlatformItemIdSaleCount>(sql, null, null, true, 2 * 60).ToList();
return obj;
}
......@@ -7912,7 +7919,7 @@ namespace Bailun.DC.Services
/// <param name="start">退款开始时间</param>
/// <param name="end">退款结束时间</param>
/// <returns></returns>
public List<Models.Api.mSkuSaleAndRefund> ListSkuRefund(string sku, DateTime start, DateTime end,string platform)
public List<Models.Api.mSkuSaleAndRefund> ListSkuRefund(string sku, DateTime start, DateTime end, string platform)
{
var sql = $@"select t1.bailun_sku,sum(t1.bailun_sku_quantity_refund) as refundcount,t1.website,t1.platform_type,t1.bailun_account_id from dc_base_crm_refund t1
where t1.refund_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.refund_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.is_deleted=0 and t1.is_freeze=0 and t1.company_id=1
......@@ -7920,12 +7927,12 @@ namespace Bailun.DC.Services
if (!string.IsNullOrEmpty(sku))
{
sql += " and t1.bailun_sku='"+sku+"'";
sql += " and t1.bailun_sku='" + sku + "'";
}
if (!string.IsNullOrEmpty(platform))
{
sql += " and t1.platform_type='" + platform+"'";
sql += " and t1.platform_type='" + platform + "'";
}
sql += " group by t1.platform_type,t1.website,t1.platform_type,t1.bailun_account_id";
......@@ -7949,7 +7956,7 @@ namespace Bailun.DC.Services
/// <param name="start"></param>
/// <param name="end"></param>
/// <returns></returns>
public List<Models.Api.mSkuSalesAmount> ListSkuAmount(DateTime start,DateTime end,int page,int pagesize,string platform)
public List<Models.Api.mSkuSalesAmount> ListSkuAmount(DateTime start, DateTime end, int page, int pagesize, string platform)
{
//var sql = $@"select t1.platform_type,t1.bailun_sku_title_cn,t1.bailun_sku,sum(amount_product) as amount_product,sum(ordercount) as ordercount,sum(t1.bailun_sku_quantity_ordered) as bailun_sku_quantity_ordered,sum(t1.amount_sales) amount_sales,sum(cost_platform_fee) cost_platform_fee,sum(cost_product) cost_product,sum(t1.cost_logistics) cost_logistics,sum(profit_total) profit_total from (
// select t1.platform_type,t1.bailun_sku_title_cn,t1.bailun_sku,sum(t1.amount_product*t1.bailun_sku_quantity_ordered*t1.seller_order_exchange_rate) as amount_product,count(DISTINCT bailun_order_id) as ordercount,sum(t1.bailun_sku_quantity_ordered) as bailun_sku_quantity_ordered,sum(t1.amount_sales*t1.bailun_sku_quantity_ordered*t1.seller_order_exchange_rate) amount_sales,sum(cost_platform_fee*t1.bailun_sku_quantity_ordered*t1.seller_order_exchange_rate) cost_platform_fee,sum(cost_product*t1.bailun_sku_quantity_ordered) cost_product,sum(t1.cost_logistics*t1.bailun_sku_quantity_ordered) cost_logistics,sum(profit_total*t1.bailun_sku_quantity_ordered) profit_total from dc_base_oms_sku t1
......@@ -7976,7 +7983,7 @@ namespace Bailun.DC.Services
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString_read))
{
if(cn.State== System.Data.ConnectionState.Closed)
if (cn.State == System.Data.ConnectionState.Closed)
{
cn.Open();
}
......@@ -7998,18 +8005,18 @@ namespace Bailun.DC.Services
/// <param name="platform">平台类型</param>
/// <param name="total">符合条件的记录数</param>
/// <returns></returns>
public List<dc_base_oms_platform_sku> ListOrderPlatformSku(DateTime? start, DateTime? end, int? page, int pagesize, string platform,List<string> orderIds,ref int total)
public List<dc_base_oms_platform_sku> ListOrderPlatformSku(DateTime? start, DateTime? end, int? page, int pagesize, string platform, List<string> orderIds, ref int total)
{
var sql = $@"select t1.origin_order_id,t1.bailun_order_id,t1.website,t1.platform_type,t1.seller_name,t1.bailun_account_id,t1.platform_sku_quantity_ordered,t1.platform_sku_unit_price,t1.platform_sku,t1.order_currency,t1.item_id,seller_order_exchange_rate from dc_base_oms_platform_sku t1 where t1.bailun_order_status != 'Canceled' and t1.has_delete = 0 and t1.has_cancle = 0 ";
if(!string.IsNullOrEmpty(platform))
if (!string.IsNullOrEmpty(platform))
{
sql += " and t1.platform_type='"+platform+"'";
sql += " and t1.platform_type='" + platform + "'";
}
if (orderIds != null && orderIds.Count > 0)
{
sql += " and t1.origin_order_id in ('"+string.Join("','",orderIds)+"')";
sql += " and t1.origin_order_id in ('" + string.Join("','", orderIds) + "')";
}
if (start.HasValue)
......@@ -8025,7 +8032,7 @@ namespace Bailun.DC.Services
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString_read))
{
if(cn.State== System.Data.ConnectionState.Closed)
if (cn.State == System.Data.ConnectionState.Closed)
{
cn.Open();
}
......@@ -8047,11 +8054,11 @@ namespace Bailun.DC.Services
public List<dc_base_oms_sku> ListOmsOrderByBailunOrderId(List<string> listblorderid)
{
var sql = $"select * from dc_base_oms_sku where has_delete=0 and bailun_order_id in ('{string.Join("','",listblorderid)}')";
var sql = $"select * from dc_base_oms_sku where has_delete=0 and bailun_order_id in ('{string.Join("','", listblorderid)}')";
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString_read))
{
if(cn.State== System.Data.ConnectionState.Closed)
if (cn.State == System.Data.ConnectionState.Closed)
{
cn.Open();
}
......
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