Skip to content

D
DataCenter_Core2.1_20190520
Commit 198058df by guanzhenshan
Options

1、发货sku利润接口增加删除字段 

2、解决平台利润统计无法排序的问题
parent 687d0857
Showing with 121 additions and 8 deletions
Bailun.DC.Models/Orders/dc_base_oms_sku.cs
......@@ -518,5 +518,22 @@ namespace Bailun.DC.Models.Orders
/// </summary>
public int noshippingcount { get; set; }
public int company_id { get; set; }
/// <summary>
/// 配货单号
/// </summary>
public string pick_order_id { get; set; }
/// <summary>
/// 发货时间
/// </summary>
public DateTime shipping_time { get; set; }
/// <summary>
/// 是否已删除
/// </summary>
public int has_delete { get; set; }
}
}
Bailun.DC.Models/Orders/mShipSkuProfitInput.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Text;
namespace Bailun.DC.Models.Orders
{
public class mShipSkuProfitInput
{
public int page { get; set; }
public DateTime start { get; set; }
public DateTime end { get; set; }
}
}
Bailun.DC.Services/OrdersServices.cs
......@@ -3322,6 +3322,35 @@ namespace Bailun.DC.Services
}
}
/// <summary>
/// 获取发货sku的利润数据
/// </summary>
/// <param name="page"></param>
/// <param name="pagesize"></param>
/// <param name="start"></param>
/// <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)
{
var sql = $@"select t1.platform_type,t1.seller_account,t1.bailun_account_id,t1.website,t1.bailun_order_id,t1.origin_order_id,t1.transaction_id,t1.paid_time,t1.gmt_modified,t1.bailun_sku,(t1.amount_sales*t1.seller_order_exchange_rate*t2.quantity_shipped) amount_sales,(t1.profit_total*t2.quantity_shipped) profit_total,t1.company_id,t2.pick_order_id,t2.shipping_time,t2.has_delete
from dc_base_oms_sku t1
join dc_base_oms_pick t2 on t1.bailun_order_id = t2.bailun_order_id and t1.bailun_sku = t2.bailun_sku and t2.shipping_time >= '{start.ToString("yyyy-MM-dd HH:mm:ss")}' and t2.shipping_time < '{end.ToString("yyyy-MM-dd HH:mm:ss")}' and t2.shipping_status = 'TotalShipping' and t2.company_id = 1
where t1.bailun_order_status != 'Canceled' and t1.has_scalp = 0 and t1.bailun_order_status != 'CantHandle' and t1.has_scalp = 0 and t1.has_innersale = 0 and t1.company_id = 1 and t1.has_delete = 0";
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
{
if (cn.State == System.Data.ConnectionState.Closed)
{
cn.Open();
}
var obj = cn.Query<dc_base_oms_sku>(sql+" limit "+(page-1)*pagesize+","+pagesize, 2 * 60);
return obj.ToList();
}
}
#endregion
#region 平台SKu
......
Bailun.DC.Web/Areas/Reports/Views/Orders/PlatformProfitCount.cshtml
......@@ -64,10 +64,12 @@
<thead>
<tr>
<th>平台</th>
<th>订单数</th>
<th style="width:70px;">订单数</th>
<th style="width:40px"></th>
<th>销售额</th>
<th style="width:40px"></th>
<th>产品成本</th>
<th>客单价</th>
<th style="width:70px;">客单价</th>
<th>平台费</th>
<th>头程费</th>
<th>尾程费</th>
......@@ -76,6 +78,7 @@
<th>预收金额</th>
<th>预收订单数</th>
<th>利润</th>
<th style="width:40px"></th>
<th>利润率%</th>
<th>退款</th>
<th>退款率%</th>
......@@ -181,8 +184,10 @@
$('#footer').html('');
for (var i = 0; i < result.length-1; i++) {
var s = '<tr><td class="platform"><a href="javascript:;" onclick="ShowWebsite(\'' + result[i].platform_type + '\');">' + result[i].platform_type + '</a></td>';
s += '<td class="alink"><a href="javascript:;" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'订单数\',\'\',0)" >' + result[i].order_count + '</a><img style="width:16px;margin-left:3px" src="@Url.Content("~/img/chart-icon.png")" onclick="ShowChart(\'' + result[i].platform_type + '\',\'订单数\',\'order_count\');" title="点击查看曲线图"></td>';
s += '<td class="alink"><a href="javascript:;" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'销售额\',\'amount_sales\',0)"> ' + result[i].amount_sales + '</a><img style="width:16px;margin-left:3px" src="@Url.Content("~/img/chart-icon.png")" onclick="ShowChart(\'' + result[i].platform_type + '\',\'销售额\',\'amount_sales\');" title="点击查看曲线图"></td>';
s += '<td class="alink"><a href="javascript:;" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'订单数\',\'\',0)" >' + result[i].order_count + '</a></td>';
s += '<td><img style="width:16px;margin-left:3px" src="@Url.Content("~/img/chart-icon.png")" onclick="ShowChart(\'' + result[i].platform_type + '\',\'订单数\',\'order_count\');" title="点击查看订单数曲线图"></td>';
s += '<td class="alink"><a href="javascript:;" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'销售额\',\'amount_sales\',0)"> ' + result[i].amount_sales + '</a></td>';
s += '<td><img style="width:16px;margin-left:3px" src="@Url.Content("~/img/chart-icon.png")" onclick="ShowChart(\'' + result[i].platform_type + '\',\'销售额\',\'amount_sales\');" title="点击查看销售额曲线图"></td>';
s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'产品成本\',\'cost_product\',1)">' + result[i].cost_product + '</td>';
s += '<td>' + result[i].customerprice + '</td>';
s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'平台费用\',\'cost_platform_fee\',1)">' + result[i].cost_platform_fee + '</td>';
......@@ -192,7 +197,8 @@
s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'第三方仓处理费\',\'cost_handle_platform\',1)">' + result[i].cost_handle_platform + '</td>';
s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'预收款\',\'amount_prepaid\',1)">' + result[i].amount_prepaid + '</td>';
s += '<td class="alink">' + result[i].noshippingcount + '</td>';
s += '<td class="alink"><a href="javascript:;" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'利润\',\'profit_total\',1)">' + result[i].profit_total + '</a><img style="width:16px;margin-left:3px" src="@Url.Content("~/img/chart-icon.png")" onclick="ShowChart(\'' + result[i].platform_type + '\',\'利润\',\'profit_total\');" title="点击查看曲线图"></td>';
s += '<td class="alink"><a href="javascript:;" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'利润\',\'profit_total\',1)">' + result[i].profit_total + '</a></td>';
s += '<td><img style="width:16px;margin-left:3px" src="@Url.Content("~/img/chart-icon.png")" onclick="ShowChart(\'' + result[i].platform_type + '\',\'利润\',\'profit_total\');" title="点击查看利润曲线图"></td>';
s += '<td>' + result[i].profit_rate + '</td>';
s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'退款金额\',\'amount_refund\',1)">' + result[i].amount_refund + '</td>';
s += '<td>' + result[i].amount_refund_rate + '</td>';
......@@ -204,8 +210,10 @@
var i = result.length - 1;
var foot_s = '<tr><td class="platform"><a href="javascript:;" onclick="ShowWebsite(\'' + result[i].platform_type + '\');">' + result[i].platform_type + '</a></td>';
foot_s += '<td class="alink"><a href="javascript:;" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'订单数\',\'\',0)" >' + result[i].order_count + '</a><img style="width:16px;margin-left:3px" src="@Url.Content("~/img/chart-icon.png")" onclick="ShowChart(\'\',\'订单数\',\'order_count\');" title="点击查看曲线图"></td>';
foot_s += '<td class="alink"><a href="javascript:;" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'销售额\',\'amount_sales\',0)"> ' + result[i].amount_sales + '</a><img style="width:16px;margin-left:3px" src="@Url.Content("~/img/chart-icon.png")" onclick="ShowChart(\'\',\'销售额\',\'amount_sales\');" title="点击查看曲线图"></td>';
foot_s += '<td class="alink"><a href="javascript:;" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'订单数\',\'\',0)" >' + result[i].order_count + '</a></td>';
foot_s += '<td><img style="width:16px;margin-left:3px" src="@Url.Content("~/img/chart-icon.png")" onclick="ShowChart(\'\',\'订单数\',\'order_count\');" title="点击查看曲线图"></td>';
foot_s += '<td class="alink"><a href="javascript:;" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'销售额\',\'amount_sales\',0)"> ' + result[i].amount_sales + '</a></td>';
foot_s += '<td><img style="width:16px;margin-left:3px" src="@Url.Content("~/img/chart-icon.png")" onclick="ShowChart(\'\',\'销售额\',\'amount_sales\');" title="点击查看曲线图"></td>';
foot_s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'产品成本\',\'cost_product\',1)">' + result[i].cost_product + '</td>';
foot_s += '<td>' + result[i].customerprice + '</td>';
foot_s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'平台费用\',\'cost_platform_fee\',1)">' + result[i].cost_platform_fee + '</td>';
......@@ -215,7 +223,8 @@
foot_s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'第三方仓处理费\',\'cost_handle_platform\',1)">' + result[i].cost_handle_platform + '</td>';
foot_s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'预收款\',\'amount_prepaid\',1)">' + result[i].amount_prepaid + '</td>';
foot_s += '<td class="alink">' + result[i].noshippingcount + '</td>';
foot_s += '<td class="alink"><a href="javascript:;" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'利润\',\'profit_total\',1)">' + result[i].profit_total + '</a><img style="width:16px;margin-left:3px" src="@Url.Content("~/img/chart-icon.png")" onclick="ShowChart(\'\',\'利润\',\'profit_total\');" title="点击查看曲线图"></td>';
foot_s += '<td class="alink"><a href="javascript:;" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'利润\',\'profit_total\',1)">' + result[i].profit_total + '</a></td>';
foot_s += '<td><img style="width:16px;margin-left:3px" src="@Url.Content("~/img/chart-icon.png")" onclick="ShowChart(\'\',\'利润\',\'profit_total\');" title="点击查看曲线图"></td>';
foot_s += '<td>' + result[i].profit_rate + '</td>';
foot_s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'退款金额\',\'amount_refund\',1)">' + result[i].amount_refund + '</td>';
foot_s += '<td>' + result[i].amount_refund_rate + '</td>';
......
Bailun.DC.Web/Controllers/ApiController.cs
......@@ -209,5 +209,46 @@ namespace Bailun.DC.Web.Controllers
});
}
/// <summary>
/// 获取发货sku利润数据
/// </summary>
/// <param name="page"></param>
/// <returns></returns>
[HttpPost]
public JsonResult ListOrderSkuProfit([FromBody]Models.Orders.mShipSkuProfitInput m)
{
var pagesize = 1000;
var obj = new Services.OrdersServices().ListOrderSkuProfit(m.page, pagesize, m.start, m.end);
var list = obj.Select(a => new
{
a.platform_type,
a.seller_account,
a.website,
a.bailun_order_id,
a.origin_order_id,
a.transaction_id,
a.paid_time,
a.gmt_modified,
a.bailun_sku,
a.amount_sales,
a.profit_total,
a.company_id,
a.pick_order_id,
a.bailun_account_id,
a.shipping_time,
a.has_delete,
});
return Json(new {
success = true,
msg = "",
list = list
});
}
}
}
\ No newline at end of file
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