Skip to content

D
DataCenter_Core2.1_20190520
Commit 7dd56f9d by zhouminghui
Options

fix

parent 57100411
Showing with 442 additions and 72 deletions
Bailun.DC.Models/WebApiModels/Attribute/ParentNameAttribute.cs
......@@ -68,35 +68,39 @@ namespace Bailun.DC.Models.WebApiModels
/// </summary>
[Description("仓储费")]
fee_logistics_storage = 4,
/// <summary>
///
/// </summary>
[Description("销售费用-税金")]
fee_sales_taxes = 5,
/// <summary>
/// 销售费用合计
/// </summary>
[Description("销售费用合计")]
fee_sales_count = 5,
fee_sales_count = 6,
/// <summary>
/// 管理成本合计
/// </summary>
[Description("管理成本合计")]
managercost_count = 6,
managercost_count = 7,
/// <summary>
/// 营业利润
/// </summary>
[Description("营业利润")]
profit = 7,
profit = 8,
/// <summary>
/// 实际利润
/// </summary>
[Description("实际利润")]
actual_profit = 8,
actual_profit = 9,
/// <summary>
/// 净利率
/// </summary>
[Description("净利率")]
rate_profit_actual = 9
rate_profit_actual = 10
}
}
Bailun.DC.Models/WebApiModels/MonthPlatformProfitDto.cs
......@@ -20,7 +20,7 @@ namespace Bailun.DC.Models.WebApiModels
public string DatacenterCol { get; set; }
public string Currency { get; set; }
public string ExchangeRate { get; set; }
public string AmountValRmb { get; set; }
public decimal? AmountValRmb { get; set; }
public string Month { get; set; }
}
}
Bailun.DC.Models/WebApiModels/MonthSalesProfitDto.cs
......@@ -105,22 +105,37 @@ namespace Bailun.DC.Models.WebApiModels
public decimal fee_platform { get; set; }
/// <summary>
/// 平台扣费及退款
/// 广告及宣传费用
/// </summary>
[ParentName("平台费", ParentNameEnum.fee_platform)]
public decimal fee_platform_and_refund { get; set; }
[ParentName("广告及宣传费", ParentNameEnum.fee_platform)]
public decimal fee_ad { get; set; }
/// <summary>
/// FBA费
/// 佣金及平台费-亚马逊FBA
/// </summary>
[ParentName("FBA费", ParentNameEnum.fee_platform)]
[ParentName("佣金及平台费-亚马逊FBA", ParentNameEnum.fee_platform)]
public decimal fee_fba { get; set; }
/// <summary>
/// 广告及宣传费用
/// 佣金及平台费-亚马逊非FBA
/// </summary>
[ParentName("广告及宣传费", ParentNameEnum.fee_platform)]
public decimal fee_ad { get; set; }
[ParentName("佣金及平台费-亚马逊非FBA", ParentNameEnum.fee_platform)]
public decimal? fee_nofba { get; set; }//new
/// <summary>
/// 佣金及平台费-Ebay
/// </summary>
[ParentName("佣金及平台费-Ebay", ParentNameEnum.fee_platform)]
public decimal? fee_ebay { get; set; }//new
/// <summary>
/// 佣金及平台费-其他平台
/// </summary>
[ParentName("佣金及平台费-其他平台", ParentNameEnum.fee_platform)]
public decimal? fee_ohtre { get; set; }//new
///// <summary>
///// 平台扣费及退款
///// </summary>
//[ParentName("平台费", ParentNameEnum.fee_platform)]
//public decimal fee_platform_and_refund { get; set; }
/// <summary>
/// 物流仓储费用
/// </summary>
......@@ -131,41 +146,51 @@ namespace Bailun.DC.Models.WebApiModels
///// </summary>
//public decimal amount_withdraw { get; set; }
/// <summary>
/// 头程费
/// 头程运输
/// </summary>
[ParentName("头程费", ParentNameEnum.fee_logistics_storage)]
[ParentName("头程运输-平台", ParentNameEnum.fee_logistics_storage)]
public decimal fee_logistics_first { get; set; }
[ParentName("头程运输-非平台", ParentNameEnum.fee_logistics_storage)]
public decimal? fee_nologistics_first { get; set; }//new
/// <summary>
/// 直邮物流费 国内发货
/// </summary>
[ParentName("直邮物流费", ParentNameEnum.fee_logistics_storage)]
public decimal fee_logistics_direct { get; set; }
/// <summary>
/// 尾程费 国外发货
/// 尾程物流费
/// </summary>
[ParentName("尾程物流费", ParentNameEnum.fee_logistics_storage)]
[ParentName("尾程物流费-平台", ParentNameEnum.fee_logistics_storage)]
public decimal fee_logistics_tail { get; set; }
[ParentName("尾程物流费-非平台", ParentNameEnum.fee_logistics_storage)]
public decimal? fee_nologistics_tail { get; set; }//new
/// <summary>
/// 海外仓仓储
/// 直邮物流费
/// </summary>
[ParentName("海外仓仓储费", ParentNameEnum.fee_logistics_storage)]
public decimal fee_storage { get; set; }
[ParentName("直邮物流费-平台", ParentNameEnum.fee_logistics_storage)]
public decimal fee_logistics_direct { get; set; }
[ParentName("直邮物流费-非平台", ParentNameEnum.fee_logistics_storage)]
public decimal? fee_nologistics_direct { get; set; }//new
/// <summary>
/// 海外仓其他杂费
/// 仓储费
/// </summary>
[ParentName("海外仓其他杂费", ParentNameEnum.fee_logistics_storage)]
public decimal fee_storage_incidentals { get; set; }
[ParentName("仓储费-平台", ParentNameEnum.fee_logistics_storage)]
public decimal fee_storage { get; set; }
[ParentName("仓储费-非平台", ParentNameEnum.fee_logistics_storage)]
public decimal? fee_nostorage { get; set; }//new
/// <summary>
/// 付现销售费用
/// </summary>
[ParentName("付现销售费用", ParentNameEnum.fee_logistics_storage)]
public decimal fee_paycash_sales { get; set; }
///// <summary>
///// 海外仓其他杂费
///// </summary>
//[ParentName("海外仓其他杂费", ParentNameEnum.fee_logistics_storage)]
//public decimal fee_storage_incidentals { get; set; }
///// <summary>
///// 付现销售费用
///// </summary>
//[ParentName("付现销售费用", ParentNameEnum.fee_logistics_storage)]
//public decimal fee_paycash_sales { get; set; }
[ParentName("销售费用-税金", ParentNameEnum.fee_sales_taxes)]
public decimal? fee_sales_taxes { get; set; }//new
/// <summary>
/// 销售费用合计
/// </summary>
......@@ -194,49 +219,54 @@ namespace Bailun.DC.Models.WebApiModels
[ParentName("管理成本合计", ParentNameEnum.managercost_count)]
public decimal managercost_count { get; set; }
///// <summary>
///// 管理成本-香港百伦
///// </summary>
//[ParentName("香港百伦科技有限公司")]
//public decimal managecost_bl_xg { get; set; }
/// <summary>
/// 管理成本-广州百伦
/// </summary>
[ParentName("广州百伦供应链科技有限公司", ParentNameEnum.managercost_count)]
public decimal managecost_bl_gz { get; set; }
/// <summary>
/// 管理成本-美容美甲店
/// 管理成本-香港百伦
/// </summary>
[ParentName("广州歌戈儿生活科技有限公司", ParentNameEnum.managercost_count)]
public decimal managecost_meijia { get; set; }
[ParentName("香港百伦科技有限公司", ParentNameEnum.managercost_count)]
public decimal managecost_bl_xg { get; set; }
/// <summary>
/// 管理成本-杨杉
/// </summary>
[ParentName("深圳前海扬杉创新科技有限公司", ParentNameEnum.managercost_count)]
public decimal managercost_yangshan { get; set; }
/// <summary>
/// 管理成本-成品仓
/// </summary>
[ParentName("广州电子服装仓&阳山", ParentNameEnum.managercost_count)]
public decimal managercost_chengpincang { get; set; }
/// <summary>
/// 管理成本-信荟蓝
/// </summary>
[ParentName("广州信荟蓝科技有限公司", ParentNameEnum.managercost_count)]
public decimal managercost_xinhuilan { get; set; }
/// <summary>
/// 管理成本-广州电子服装仓
/// </summary>
[ParentName("广州电子服装仓", ParentNameEnum.managercost_count)]
public decimal? managercost_gzdz { get; set; }//new
[ParentName("阳山仓", ParentNameEnum.managercost_count)]
public decimal? managercost_ys { get; set; }//new
/// <summary>
/// 管理成本-美容美甲店
/// </summary>
[ParentName("广州歌戈儿生活科技有限公司（含分公司）", ParentNameEnum.managercost_count)]
public decimal managecost_meijia { get; set; }
/// <summary>
/// 迪致美容
/// </summary>
[ParentName("广州迪致美容科技有限公司", ParentNameEnum.managercost_count)]
public decimal managercost_dizhi { get; set; }
/// <summary>
/// 广州灵酷跨境科技有限公司
/// </summary>
[ParentName("广州灵酷跨境科技有限公司", ParentNameEnum.managercost_count)]
public decimal? managercost_gzlk { get; set; }//new
/// <summary>
/// 广州灵酷跨境科技有限公司
/// </summary>
[ParentName("广州崇瑜信息技术咨询有限公司", ParentNameEnum.managercost_count)]
public decimal? managercost_gzcy { get; set; }//new
///// <summary>
///// 广州美甲生产仓
///// </summary>
//public decimal managercost_meijiashengchan { get; set; }
/// <summary>
/// 营业利润
......@@ -276,11 +306,11 @@ namespace Bailun.DC.Models.WebApiModels
/// </summary>
[ParentName("减：营业外支出", ParentNameEnum.profit)]
public decimal pay_non_operating { get; set; }
/// <summary>
/// 减：资产减值损失
/// </summary>
[ParentName("减：资产减值损失", ParentNameEnum.profit)]
public decimal? impairment_assets { get; set; }
///// <summary>
///// 减：资产减值损失
///// </summary>
//[ParentName("减：资产减值损失", ParentNameEnum.profit)]
//public decimal? impairment_assets { get; set; }
/// <summary>
/// 实际利润
/// </summary>
......
Bailun.DC.Models/dc_month_sales_profit_v2.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Text;
namespace Bailun.DC.Models
{
/// <summary>
/// 预计销售利润表
/// </summary>
public class dc_month_sales_profit_v2
{
/// <summary>
/// auto_increment
/// </summary>
public int id { get; set; }
/// <summary>
/// 月份
/// </summary>
public string month { get; set; }
/// <summary>
/// 总销售额
/// </summary>
public decimal amount_sales { get; set; }
/// <summary>
/// 销售额-精油
/// </summary>
public decimal amount_sales_jingyou { get; set; }
/// <summary>
/// 销售额-电子
/// </summary>
public decimal amount_sales_dianzi { get; set; }
/// <summary>
/// 销售额-家居产品
/// </summary>
public decimal amount_sales_jiaju { get; set; }
/// <summary>
/// 销售额-美容美甲产品
/// </summary>
public decimal amount_sales_meirongmj { get; set; }
/// <summary>
/// 销售额-服装
/// </summary>
public decimal amount_sales_fuzhuang { get; set; }
/// <summary>
/// 销售额-其他
/// </summary>
public decimal amount_sales_other { get; set; }
/// <summary>
/// 总成本
/// </summary>
public decimal cost { get; set; }
/// <summary>
/// 精油成本
/// </summary>
public decimal cost_jingyou { get; set; }
/// <summary>
/// 电子成本
/// </summary>
public decimal cost_dianzi { get; set; }
/// <summary>
/// 家居成本
/// </summary>
public decimal cost_jiaju { get; set; }
/// <summary>
/// 美容美甲产品成本
/// </summary>
public decimal cost_meirongmj { get; set; }
/// <summary>
/// 服装成本
/// </summary>
public decimal cost_fuzhuang { get; set; }
/// <summary>
/// 其他成本
/// </summary>
public decimal cost_other { get; set; }
/// <summary>
/// 平台扣费及退款
/// </summary>
public decimal fee_platform_and_refund { get; set; }
/// <summary>
/// 平台费
/// </summary>
public decimal fee_platform { get; set; }
/// <summary>
/// FBA费
/// </summary>
public decimal fee_fba { get; set; }
/// <summary>
/// 广告及宣传费用
/// </summary>
public decimal fee_ad { get; set; }
/// <summary>
/// 平台退款
/// </summary>
public decimal fee_refund { get; set; }
/// <summary>
/// 平台提现回款
/// </summary>
public decimal amount_withdraw { get; set; }
/// <summary>
/// 物流仓储费用
/// </summary>
public decimal fee_logistics_storage { get; set; }
/// <summary>
/// 头程费
/// </summary>
public decimal fee_logistics_first { get; set; }
/// <summary>
/// 尾程费 国外发货
/// </summary>
public decimal fee_logistics_tail { get; set; }
/// <summary>
/// 直邮物流费 国内发货
/// </summary>
public decimal fee_logistics_direct { get; set; }
/// <summary>
/// 海外仓仓储
/// </summary>
public decimal fee_storage { get; set; }
/// <summary>
/// 海外仓其他杂费
/// </summary>
public decimal fee_storage_incidentals { get; set; }
/// <summary>
/// 付现销售费用
/// </summary>
public decimal fee_paycash_sales { get; set; }
/// <summary>
/// 销售费用合计
/// </summary>
public decimal fee_sales_count { get; set; }
/// <summary>
/// 销售利润
/// </summary>
public decimal profit_sales { get; set; }
/// <summary>
/// 销售毛利率
/// </summary>
public decimal rate_profit_sales { get; set; }
/// <summary>
/// 管理成本-香港百伦
/// </summary>
public decimal managecost_bl_xg { get; set; }
/// <summary>
/// 管理成本-广州百伦
/// </summary>
public decimal managecost_bl_gz { get; set; }
/// <summary>
/// 管理成本-美容美甲店
/// </summary>
public decimal managecost_meijia { get; set; }
/// <summary>
/// 管理成本-杨杉
/// </summary>
public decimal managercost_yangshan { get; set; }
/// <summary>
/// 管理成本-成品仓
/// </summary>
public decimal managercost_chengpincang { get; set; }
/// <summary>
/// 管理成本-信荟蓝
/// </summary>
public decimal managercost_xinhuilan { get; set; }
/// <summary>
/// 迪致美容
/// </summary>
public decimal managercost_dizhi { get; set; }
/// <summary>
/// 广州美甲生产仓
/// </summary>
public decimal managercost_meijiashengchan { get; set; }
/// <summary>
/// 管理成本合计
/// </summary>
public decimal managercost_count { get; set; }
/// <summary>
/// 财务费用
/// </summary>
public decimal fee_finance { get; set; }
/// <summary>
/// 营业利润
/// </summary>
public decimal profit { get; set; }
/// <summary>
/// 营业毛利率
/// </summary>
public decimal rate_profit { get; set; }
/// <summary>
/// 加：其他收入
/// </summary>
public decimal incoming_other { get; set; }
/// <summary>
/// 加：出口退税收入
/// </summary>
public decimal incoming_refundtax { get; set; }
/// <summary>
/// 加：歌戈尔收入
/// </summary>
public decimal incoming_gogirl { get; set; }
/// <summary>
/// 加：营业外收入
/// </summary>
public decimal incoming_non_operating { get; set; }
/// <summary>
/// 减：营业外支出
/// </summary>
public decimal pay_non_operating { get; set; }
/// <summary>
/// 实际利润
/// </summary>
public decimal actual_profit { get; set; }
/// <summary>
/// 减：分红
/// </summary>
public decimal dividend { get; set; }
/// <summary>
/// 利润结余
/// </summary>
public decimal profit_balance { get; set; }
/// <summary>
/// 净利润率
/// </summary>
public decimal rate_profit_actual { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime createtime { get; set; }
/// <summary>
/// 更新人
/// </summary>
public int lastupdateuserid { get; set; }
/// <summary>
/// 更新人
/// </summary>
public string lastupdateusername { get; set; }
/// <summary>
/// 更新时间
/// </summary>
public DateTime lastupdatetime { get; set; }
/// <summary>
/// 是否编辑的版本，1：是，0：否
/// </summary>
public int isedit { get; set; }
/// <summary>
/// 减：资产减值损失
/// </summary>
public decimal? impairment_assets { get; set; }
/// <summary>
/// 佣金及平台费-亚马逊非FBA
/// </summary>
public decimal fee_nofba { get; set; }//new
/// <summary>
/// 佣金及平台费-Ebay
/// </summary>
public decimal fee_ebay { get; set; }//new
/// <summary>
/// 佣金及平台费-其他平台
/// </summary>
public decimal fee_ohtre { get; set; }//new
/// <summary>
/// 头程运输-非平台
/// </summary>
public decimal fee_nologistics_first { get; set; }//new
/// <summary>
/// 尾程物流费-非平台
/// </summary>
public decimal fee_nologistics_tail { get; set; }//new
/// <summary>
/// 直邮物流费-非平台
/// </summary>
public decimal fee_nologistics_direct { get; set; }//new
/// <summary>
/// 仓储费-非平台
/// </summary>
public decimal fee_nostorage { get; set; }//new
/// <summary>
/// 销售费用-税金
/// </summary>
public decimal fee_sales_taxes { get; set; }//new
/// <summary>
/// 广州电子服装仓
/// </summary>
public decimal managercost_gzdz { get; set; }//new
/// <summary>
/// 阳山仓
/// </summary>
public decimal managercost_ys { get; set; }//new
/// <summary>
/// 广州灵酷跨境科技有限公司
/// </summary>
public decimal managercost_gzlk { get; set; }//new
/// <summary>
/// 广州崇瑜信息技术咨询有限公司
/// </summary>
public decimal managercost_gzcy { get; set; }//new
}
}
Bailun.DC.WebApi/Controllers/FinanceController.cs
......@@ -238,7 +238,7 @@ namespace Bailun.DC.WebApi.Controllers
cost_fuzhuang = editModel.cost_fuzhuang + item.cost_fuzhuang,
cost_other = editModel.cost_other + item.cost_other,
fee_platform = editModel.fee_platform + item.fee_platform,
fee_platform_and_refund = editModel.fee_platform_and_refund + item.fee_platform_and_refund,
//fee_platform_and_refund = editModel.fee_platform_and_refund + item.fee_platform_and_refund,
fee_fba = editModel.fee_fba + item.fee_fba,
fee_ad = editModel.fee_ad + item.fee_ad,
fee_logistics_storage = editModel.fee_logistics_storage + item.fee_logistics_storage,
......@@ -246,8 +246,8 @@ namespace Bailun.DC.WebApi.Controllers
fee_logistics_direct = editModel.fee_logistics_direct + item.fee_logistics_direct,
fee_logistics_tail = editModel.fee_logistics_tail + item.fee_logistics_tail,
fee_storage = editModel.fee_storage + item.fee_storage,
fee_storage_incidentals = editModel.fee_storage_incidentals + item.fee_storage_incidentals,
fee_paycash_sales = editModel.fee_paycash_sales + item.fee_paycash_sales,
//fee_storage_incidentals = editModel.fee_storage_incidentals + item.fee_storage_incidentals,
//fee_paycash_sales = editModel.fee_paycash_sales + item.fee_paycash_sales,
fee_sales_count = editModel.fee_sales_count + item.fee_sales_count,
profit_sales = editModel.profit_sales + item.profit_sales,
rate_profit_sales = editModel.rate_profit_sales + item.rate_profit_sales,
......@@ -256,7 +256,7 @@ namespace Bailun.DC.WebApi.Controllers
managecost_bl_gz = editModel.managecost_bl_gz + item.managecost_bl_gz,
managecost_meijia = editModel.managecost_meijia + item.managecost_meijia,
managercost_yangshan = editModel.managercost_yangshan + item.managercost_yangshan,
managercost_chengpincang = editModel.managercost_chengpincang + item.managercost_chengpincang,
//managercost_chengpincang = editModel.managercost_chengpincang + item.managercost_chengpincang,
managercost_xinhuilan = editModel.managercost_xinhuilan + item.managercost_xinhuilan,
managercost_dizhi = editModel.managercost_dizhi + item.managercost_dizhi,
profit = editModel.profit + item.profit,
......@@ -266,9 +266,23 @@ namespace Bailun.DC.WebApi.Controllers
incoming_gogirl = editModel.incoming_gogirl + item.incoming_gogirl,
incoming_non_operating = editModel.incoming_non_operating + item.incoming_non_operating,
pay_non_operating = editModel.pay_non_operating + item.pay_non_operating,
impairment_assets = editModel.impairment_assets + item.impairment_assets,
//impairment_assets = editModel.impairment_assets + item.impairment_assets,
actual_profit = editModel.actual_profit + item.actual_profit,
rate_profit_actual = editModel.rate_profit_actual + item.rate_profit_actual,
managercost_gzcy = editModel.managercost_gzcy + item.managercost_gzcy,
managercost_gzlk = editModel.managercost_gzlk + item.managercost_gzlk,
managercost_ys = editModel.managercost_ys + item.managercost_ys,
managercost_gzdz = editModel.managercost_gzdz + item.managercost_gzdz,
fee_sales_taxes = editModel.fee_sales_taxes + item.fee_sales_taxes,
fee_nostorage = editModel.fee_nostorage + item.fee_nostorage,
fee_nologistics_direct = editModel.fee_nologistics_direct + item.fee_nologistics_direct,
fee_nologistics_tail = editModel.fee_nologistics_tail + item.fee_nologistics_tail,
fee_nologistics_first = editModel.fee_nologistics_first + item.fee_nologistics_first,
fee_ohtre = editModel.fee_ohtre + item.fee_ohtre,
fee_ebay = editModel.fee_ebay + item.fee_ebay,
fee_nofba = editModel.fee_nofba + item.fee_nofba,
isedit = 2
});
}
......@@ -495,11 +509,12 @@ namespace Bailun.DC.WebApi.Controllers
}
[HttpGet("getReFundTest")]
public object GetReFundTest()
public object GetReFundTest(DateTime time)
{
var sql = "select * from dc_month_sales_profit_orderdetail limit 1";
var data = Dapper.SimpleCRUD.Query<dc_month_sales_profit_orderdetail>(sql, null, Common.GlobalConfig.ConnectionString).FirstOrDefault();
return data;
return new FinanceService().SyncMonthSalesProfit(time);
//var sql = "select * from dc_month_sales_profit_orderdetail limit 1";
//var data = Dapper.SimpleCRUD.Query<dc_month_sales_profit_orderdetail>(sql, null, Common.GlobalConfig.ConnectionString).FirstOrDefault();
//return data;
}
#endregion
}
......
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