Commit a81a2813 by guanzhenshan

1、平台利润统计报表增加FBA费,Paypal费、广告费、上架费

2、亚马逊、FBA增加站点销售统计报表
parent 88c46d40
...@@ -535,5 +535,15 @@ namespace Bailun.DC.Models.Orders ...@@ -535,5 +535,15 @@ namespace Bailun.DC.Models.Orders
/// 是否已删除 /// 是否已删除
/// </summary> /// </summary>
public int has_delete { get; set; } public int has_delete { get; set; }
/// <summary>
/// 广告费
/// </summary>
public decimal? adfee { get; set; }
/// <summary>
/// 上架费
/// </summary>
public decimal? putawayfee { get; set; }
} }
} }
using System;
using System.Collections.Generic;
using System.Text;
namespace Bailun.DC.Models
{
/// <summary>
/// sku利润分析
/// </summary>
public class dc_mid_sku_profit
{
/// <summary>
///
/// </summary>
public int id { get; set; }
/// <summary>
///
/// </summary>
public string bailun_sku { get; set; }
/// <summary>
/// 仓库编码
/// </summary>
public string warehouse_code { get; set; }
/// <summary>
/// 仓库名称
/// </summary>
public string warehouse_name { get; set; }
/// <summary>
/// 昨日销售额
/// </summary>
public decimal yd_sales_amount { get; set; }
/// <summary>
/// 昨日销售数量
/// </summary>
public int yd_sales_count { get; set; }
/// <summary>
/// 昨日销售库存金额
/// </summary>
public decimal yd_sales_stockamount { get; set; }
/// <summary>
/// 昨日毛利
/// </summary>
public decimal yd_grossprofit { get; set; }
/// <summary>
/// 昨日成本毛利率
/// </summary>
public decimal yd_grossprofit_rate { get; set; }
/// <summary>
/// 过去30天销售额
/// </summary>
public decimal pre30_sales_amount { get; set; }
/// <summary>
/// 过去30天销量
/// </summary>
public int pre30_sales_count { get; set; }
/// <summary>
/// 过去30天销售库存金额
/// </summary>
public decimal pre30_stockamount { get; set; }
/// <summary>
/// 过去30天毛利额
/// </summary>
public decimal pre30_grossprofit { get; set; }
/// <summary>
/// 过去30天成本毛利率
/// </summary>
public decimal pre30_grossprofit_rate { get; set; }
/// <summary>
/// 过去30天退货率 前一个30天/过去这30天(因为最近的30天的订单可能都还没收到)
/// </summary>
public decimal pre30_return_rate { get; set; }
/// <summary>
/// 过去30天金额库存周转率(卖出库存金额/除于统计时刻的库存在库总数+采购在途+调拨在途)
/// </summary>
public decimal pre30_stockamount_turn_rate { get; set; }
/// <summary>
/// 过去统计周期累计采购+调拨+已经入库的新增金额
/// </summary>
public decimal pre30_stockamount_add { get; set; }
/// <summary>
/// 过去30天 金额销进比 卖出数/采购入库数
/// </summary>
public decimal pre30_stockamount__rate { get; set; }
/// <summary>
/// 过去30天 件数库存周转率
/// </summary>
public decimal pre30_stocknum_turn_rate { get; set; }
/// <summary>
/// 过去30天 累积入库件数
/// </summary>
public int pre30_stock_add_count { get; set; }
/// <summary>
/// 过去30天 件数销进比
/// </summary>
public decimal pre30_stocknum_rate { get; set; }
/// <summary>
/// 过去30天 金额可售天数 库存总金额/过去30天日均销售成本金额
/// </summary>
public decimal pre30_stockamount_vendibility_day { get; set; }
/// <summary>
/// 过去30天 件数可售天数
/// </summary>
public decimal pre30_stocknum_vendibility_day { get; set; }
/// <summary>
/// 统计日期
/// </summary>
public DateTime day { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime createtime { get; set; }
}
}
...@@ -141,9 +141,9 @@ ...@@ -141,9 +141,9 @@
paramData: 'platform=FBA', paramData: 'platform=FBA',
func: function (result) { func: function (result) {
if (result != null && result != undefined) { if (result != null && result != undefined) {
$('#saleaccount').html('<option value="">选择帐号</option>'); $('#account').html('<option value="">选择帐号</option>');
for (var i = 0; i < result.length; i++) { for (var i = 0; i < result.length; i++) {
$('#saleaccount').append('<option value="' + result[i] + '">' + result[i]+'</option>'); $('#account').append('<option value="' + result[i] + '">' + result[i]+'</option>');
} }
} }
} }
......
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
{ field: 'bailun_shipping_status', title: '发货状态', width: '110', sortable: true }, { field: 'bailun_shipping_status', title: '发货状态', width: '110', sortable: true },
{ field: 'order_currency', title: '币种', width: '80', sortable: true }, { field: 'order_currency', title: '币种', width: '80', sortable: true },
{ field: 'amount_total', title: '订单总金额', width: '120', sortable: true, iscount: true }, { field: 'amount_total', title: '订单总金额', width: '120', sortable: true, iscount: true },
{ field: 'amount_shipping', title: '运费', width: '80', sortable: true, iscount: true }, { field: 'amount_shipping', title: '运费收入', width: '80', sortable: true, iscount: true },
{ field: 'amount_product', title: '商品金额', width: '100', sortable: true, iscount: true }, { field: 'amount_product', title: '商品金额', width: '100', sortable: true, iscount: true },
{ field: 'amount_adjustment', title: '调整金额', width: '100', sortable: true, iscount: true }, { field: 'amount_adjustment', title: '调整金额', width: '100', sortable: true, iscount: true },
{ field: 'cost_promotion', title: '促销费', width: '90', sortable: true, iscount: true }, { field: 'cost_promotion', title: '促销费', width: '90', sortable: true, iscount: true },
...@@ -124,7 +124,8 @@ ...@@ -124,7 +124,8 @@
{ field: 'cost_product', title: '产品成本', width: '100', sortable: true, iscount: true }, { field: 'cost_product', title: '产品成本', width: '100', sortable: true, iscount: true },
{ field: 'cost_first', title: '头程费', width: '90', sortable: true, iscount: true }, { field: 'cost_first', title: '头程费', width: '90', sortable: true, iscount: true },
{ field: 'cost_package', title: '包装费', width: '90', sortable: true, iscount: true }, { field: 'cost_package', title: '包装费', width: '90', sortable: true, iscount: true },
//{ field: 'cost_fba_fee', title: 'fba费用', width: '90', sortable: true, iscount: true }, { field: 'cost_fba_fee', title: 'fba费用', width: '110', sortable: true, iscount: true },
{ field: 'cost_paypal_fee', title: 'paypal费', width: '110', sortable: true, iscount: true },
{ field: 'cost_total', title: '总支出', width: '90', sortable: true, iscount: true }, { field: 'cost_total', title: '总支出', width: '90', sortable: true, iscount: true },
{ field: 'salecount', title: '销售数量', width: '100', sortable: false, iscount: true }, { field: 'salecount', title: '销售数量', width: '100', sortable: false, iscount: true },
{ field: 'profit_total', title: '利润', width: '100', sortable: true, iscount: true }, { field: 'profit_total', title: '利润', width: '100', sortable: true, iscount: true },
......
...@@ -60,28 +60,32 @@ ...@@ -60,28 +60,32 @@
</form> </form>
</div> </div>
<div class="ibox-content m-b-sm border-bottom"> <div class="ibox-content m-b-sm border-bottom">
<table id="roletable" class="table table-hover table-bordered table-condensed table-striped" style="table-layout:fixed;"> <table id="roletable" class="table table-hover table-bordered table-condensed table-striped" >
<thead> <thead>
<tr> <tr>
<th>平台</th> <th style="width:110px;">平台</th>
<th style="width:70px;">订单数</th> <th style="width:70px;">订单数</th>
<th style="width:40px"></th> <th style="width:40px"></th>
<th>销售额</th> <th style="width:110px;">销售额</th>
<th style="width:40px"></th> <th style="width:40px"></th>
<th>产品成本</th> <th style="width:110px;">产品成本</th>
<th style="width:70px;">客单价</th> <th style="width:70px;">客单价</th>
<th>平台费</th> <th style="width:100px;">平台费</th>
<th>头程费</th> <th style="width:80px;">FBA费</th>
<th>尾程费</th> <th style="width:100px;">PayPal费</th>
<th>处理费(百伦)</th> <th style="width:100px;">头程费</th>
<th>平台操作费</th> <th style="width:100px;">尾程费</th>
<th>预收金额</th> <th style="width:90px;">处理费</th>
<th>预收订单数</th> <th style="width:130px;">平台操作费</th>
<th>利润</th> <th style="width:100px;">广告费</th>
<th style="width:100px;">上架费</th>
<th style="width:110px;">预收金额</th>
<th style="width:120px;">预收订单数</th>
<th style="width:110px;">利润</th>
<th style="width:40px"></th> <th style="width:40px"></th>
<th>利润率%</th> <th style="width:110px;">利润率%</th>
<th>退款</th> <th style="width:100px;">退款</th>
<th>退款率%</th> <th style="width:110px;">退款率%</th>
</tr> </tr>
</thead> </thead>
<tbody id="tb"></tbody> <tbody id="tb"></tbody>
...@@ -191,10 +195,14 @@ ...@@ -191,10 +195,14 @@
s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'产品成本\',\'cost_product\',1)">' + result[i].cost_product + '</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>' + result[i].customerprice + '</td>';
s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'平台费用\',\'cost_platform_fee\',1)">' + result[i].cost_platform_fee + '</td>'; s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'平台费用\',\'cost_platform_fee\',1)">' + result[i].cost_platform_fee + '</td>';
s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'FBA费\',\'cost_fba_fee\',1)">' + result[i].cost_fba_fee + '</td>';
s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'PayPal费\',\'cost_paypal_fee\',1)">' + result[i].cost_paypal_fee + '</td>';
s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'头程费\',\'cost_first\',1)">' + result[i].cost_first + '</td>'; s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'头程费\',\'cost_first\',1)">' + result[i].cost_first + '</td>';
s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'尾程费\',\'cost_tail\',1)">' + result[i].cost_tail + '</td>'; s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'尾程费\',\'cost_tail\',1)">' + result[i].cost_tail + '</td>';
s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'处理费(百伦)\',\'cost_handle_bailun\',1)">' + result[i].cost_handle_bailun + '</td>'; s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'处理费\',\'cost_handle_bailun\',1)">' + result[i].cost_handle_bailun + '</td>';
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 + '\',\'平台操作费\',\'cost_handle_platform\',1)">' + result[i].cost_handle_platform + '</td>';
s += '<td>' + result[i].adfee + '</td>';
s += '<td>' + result[i].putawayfee + '</td>';
s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'预收款\',\'amount_prepaid\',1)">' + result[i].amount_prepaid + '</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">' + 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></td>'; s += '<td class="alink"><a href="javascript:;" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'利润\',\'profit_total\',1)">' + result[i].profit_total + '</a></td>';
...@@ -217,10 +225,14 @@ ...@@ -217,10 +225,14 @@
foot_s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'产品成本\',\'cost_product\',1)">' + result[i].cost_product + '</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>' + 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>'; foot_s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'平台费用\',\'cost_platform_fee\',1)">' + result[i].cost_platform_fee + '</td>';
foot_s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'FBA费\',\'cost_fba_fee\',1)">' + result[i].cost_fba_fee + '</td>';
foot_s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'PayPal费\',\'cost_paypal_fee\',1)">' + result[i].cost_paypal_fee + '</td>';
foot_s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'头程费\',\'cost_first\',1)">' + result[i].cost_first + '</td>'; foot_s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'头程费\',\'cost_first\',1)">' + result[i].cost_first + '</td>';
foot_s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'尾程费\',\'cost_tail\',1)">' + result[i].cost_tail + '</td>'; foot_s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'尾程费\',\'cost_tail\',1)">' + result[i].cost_tail + '</td>';
foot_s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'处理费(百伦)\',\'cost_handle_bailun\',1)">' + result[i].cost_handle_bailun + '</td>'; foot_s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'处理费\',\'cost_handle_bailun\',1)">' + result[i].cost_handle_bailun + '</td>';
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 + '\',\'平台操作费\',\'cost_handle_platform\',1)">' + result[i].cost_handle_platform + '</td>';
foot_s += '<td>' + result[i].adfee + '</td>';
foot_s += '<td>' + result[i].putawayfee + '</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" 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">' + 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></td>'; foot_s += '<td class="alink"><a href="javascript:;" onclick="ShowDetail(\'' + result[i].platform_type + '\',\'利润\',\'profit_total\',1)">' + result[i].profit_total + '</a></td>';
......
...@@ -183,11 +183,21 @@ ...@@ -183,11 +183,21 @@
</a> </a>
</li> </li>
<li> <li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/StatisticsByWebsite?platform=Amazon")" data-index="0" style="padding-left:74px;">
<span>非FBA站点销售统计</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/FBASaleStatistics")" data-index="0" style="padding-left:74px;"> <a class="J_menuItem" href="@Url.Content("~/Reports/Orders/FBASaleStatistics")" data-index="0" style="padding-left:74px;">
<span>FBA销售统计</span> <span>FBA销售统计</span>
</a> </a>
</li> </li>
<li> <li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/StatisticsByWebsite?platform=FBA")" data-index="0" style="padding-left:74px;">
<span>FBA站点销售统计</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/ListOrder?platform=Amazon")" data-index="0" style="padding-left:74px;"> <a class="J_menuItem" href="@Url.Content("~/Reports/Orders/ListOrder?platform=Amazon")" data-index="0" style="padding-left:74px;">
<span>订单流水</span> <span>订单流水</span>
</a> </a>
...@@ -242,7 +252,7 @@ ...@@ -242,7 +252,7 @@
</a> </a>
</li> </li>
<li> <li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/EbayStatisticsByWebsite")" data-index="0" style="padding-left:74px;"> <a class="J_menuItem" href="@Url.Content("~/Reports/Orders/StatisticsByWebsite?platform=Ebay")" data-index="0" style="padding-left:74px;">
<span>Ebay站点销售统计</span> <span>Ebay站点销售统计</span>
</a> </a>
</li> </li>
......
...@@ -25,6 +25,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bailun.DC.SaveWHSalesServic ...@@ -25,6 +25,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bailun.DC.SaveWHSalesServic
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bailun.DC.LogicWareHouse", "Bailun.DC.LogicWareHouse\Bailun.DC.LogicWareHouse.csproj", "{75782F98-28B6-4618-BAF2-56C68846CC92}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bailun.DC.LogicWareHouse", "Bailun.DC.LogicWareHouse\Bailun.DC.LogicWareHouse.csproj", "{75782F98-28B6-4618-BAF2-56C68846CC92}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bailun.DC.SkuProfitService", "Bailun.DC.SkuProfitService\Bailun.DC.SkuProfitService.csproj", "{91F08169-1D64-479B-B877-88FCBDDDE90B}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
...@@ -71,6 +73,10 @@ Global ...@@ -71,6 +73,10 @@ Global
{75782F98-28B6-4618-BAF2-56C68846CC92}.Debug|Any CPU.Build.0 = Debug|Any CPU {75782F98-28B6-4618-BAF2-56C68846CC92}.Debug|Any CPU.Build.0 = Debug|Any CPU
{75782F98-28B6-4618-BAF2-56C68846CC92}.Release|Any CPU.ActiveCfg = Release|Any CPU {75782F98-28B6-4618-BAF2-56C68846CC92}.Release|Any CPU.ActiveCfg = Release|Any CPU
{75782F98-28B6-4618-BAF2-56C68846CC92}.Release|Any CPU.Build.0 = Release|Any CPU {75782F98-28B6-4618-BAF2-56C68846CC92}.Release|Any CPU.Build.0 = Release|Any CPU
{91F08169-1D64-479B-B877-88FCBDDDE90B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{91F08169-1D64-479B-B877-88FCBDDDE90B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{91F08169-1D64-479B-B877-88FCBDDDE90B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{91F08169-1D64-479B-B877-88FCBDDDE90B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
...@@ -80,6 +86,7 @@ Global ...@@ -80,6 +86,7 @@ Global
{070FDDD3-6461-4A06-B8E2-4E099B51D11B} = {AE2CE86A-8538-4142-920F-684DCF47C064} {070FDDD3-6461-4A06-B8E2-4E099B51D11B} = {AE2CE86A-8538-4142-920F-684DCF47C064}
{121E5FDF-0CE9-46A3-BE01-D638B7275213} = {AE2CE86A-8538-4142-920F-684DCF47C064} {121E5FDF-0CE9-46A3-BE01-D638B7275213} = {AE2CE86A-8538-4142-920F-684DCF47C064}
{75782F98-28B6-4618-BAF2-56C68846CC92} = {AE2CE86A-8538-4142-920F-684DCF47C064} {75782F98-28B6-4618-BAF2-56C68846CC92} = {AE2CE86A-8538-4142-920F-684DCF47C064}
{91F08169-1D64-479B-B877-88FCBDDDE90B} = {AE2CE86A-8538-4142-920F-684DCF47C064}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6E53AF28-A282-4FB0-A769-EAEA9769C02A} SolutionGuid = {6E53AF28-A282-4FB0-A769-EAEA9769C02A}
......
...@@ -20,3 +20,10 @@ services: ...@@ -20,3 +20,10 @@ services:
context: . context: .
dockerfile: Bailun.DC.LogicWareHouse/Dockerfile dockerfile: Bailun.DC.LogicWareHouse/Dockerfile
bailun.dc.skuprofitservice:
image: ${DOCKER_REGISTRY}bailundcskuprofitservice
build:
context: .
dockerfile: Bailun.DC.SkuProfitService/Dockerfile
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