Skip to content

D
DataCenter_Core2.1_20190520
Commit ec923d7c by guanzhenshan
Options

调整手续费和利息的显示

parent cc88aceb
Showing with 45 additions and 25 deletions
Bailun.DC.MonthSaleProfit/Services.cs
......@@ -539,7 +539,7 @@ namespace Bailun.DC.MonthSaleProfit
//管理成本
var list = new Bailun.DC.Services.FinanceReportServices().ListFinanceFee(day, day.AddMonths(1).AddDays(-1), "", "", "", null,null);
//手续费
var listHandleFee = new Bailun.DC.Services.FinanceReportServices().ListFinanceHandleFee(day, day.AddMonths(1).AddDays(-1), 1);
var listHandleFee = new Bailun.DC.Services.FinanceReportServices().ListFinanceHandleFee(day, day.AddMonths(1).AddDays(-1), 1,"");
//自发货订单明细
sql = $@"select sum(amount_sales*quantity_shipped*seller_order_exchange_rate) as amount_sales,sum(cost_product*quantity_shipped) as cost_product,sum(cost_platform_fee*(if(platform_type='Ebay',seller_other_exchange_rate,seller_order_exchange_rate))*quantity_shipped) as cost_platform_fee,sum(cost_paypal_fee*seller_order_exchange_rate*quantity_shipped) as cost_paypal_fee,sum(cost_first*quantity_shipped) as cost_first,sum(cost_logistics*quantity_shipped) as cost_logistics,sum(cost_handle_platform*quantity_shipped) as cost_handle_platform,if(financecategoryname is null,'',financecategoryname) as financecategoryname,((total_fee-shipping)*wms_to_cny_exchange_rate*quantity_shipped) as total_fee from dc_month_sales_profit_orderdetail where month='{day.ToString("yyyy-MM")}' and platform_type!='FBA' group by financecategoryname";
......
Bailun.DC.Services/FinanceReportServices.cs
......@@ -810,18 +810,20 @@ namespace Bailun.DC.Services
if (paycompanyid.HasValue && paycompanyid.Value > 0)
{
if (paycompanyid.Value == 53)
{
sql += " and company_value in (53,59,60,61,66)";
}
else if (paycompanyid.Value == 54) //四千里
{
sql += " and company_value in (72, 67, 58, 54, 78)";
}
else
{
sql += " and company_value=" + paycompanyid.Value;
}
//if (paycompanyid.Value == 53)
//{
// sql += " and company_value in (53,59,60,61,66)";
//}
//else if (paycompanyid.Value == 54) //四千里
//{
// sql += " and company_value in (72, 67, 58, 54, 78)";
//}
//else
//{
// sql += " and company_value=" + paycompanyid.Value;
//}
sql += " and company_value=" + paycompanyid.Value;
}
if(ismanager.HasValue)
......@@ -902,7 +904,7 @@ namespace Bailun.DC.Services
/// <param name="end"></param>
/// <param name="paycompanyid"></param>
/// <returns></returns>
public List<dc_base_finance_handlefee> ListFinanceHandleFee(DateTime start, DateTime end, int? paycompanyid)
public List<dc_base_finance_handlefee> ListFinanceHandleFee(DateTime start, DateTime end, int? paycompanyid,string headname)
{
var sql = $"select * from dc_base_finance_handlefee where subject_value_from in (1,2,3,5,7,8,11,46,48,50,53,59,60,61,66,69) and has_delete=0 and create_time>='{start.ToString("yyyy-MM-dd")}' and create_time<'{end.AddDays(1).ToString("yyyy-MM-dd")}'";
......@@ -911,6 +913,12 @@ namespace Bailun.DC.Services
sql += " and subject_value_from=" + paycompanyid.Value;
}
if(!string.IsNullOrEmpty(headname))
{
sql += " and subject_name_from='"+headname+"'";
}
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
{
if (cn.State == ConnectionState.Closed)
......
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
......@@ -1401,7 +1401,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
var list = new Services.FinanceReportServices().ListFinanceFee(start,end,"","","",paycompanyid,ismanager);
//手续费 Add by Allan at 20200514
var listHandleFee = new Services.FinanceReportServices().ListFinanceHandleFee(start, end, paycompanyid);
var listHandleFee = new Services.FinanceReportServices().ListFinanceHandleFee(start, end, paycompanyid,"");
var listValue = new List<Tuple<string, List<decimal>>>();
var listCol = new List<string>();
......@@ -2132,11 +2132,12 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
}
public ActionResult ListFinanceHandleFee(DateTime start, DateTime end, int? paycompanyid)
public ActionResult ListFinanceHandleFee(DateTime start, DateTime end, int? paycompanyid,string headname)
{
ViewBag.start = start.ToString("yyyy-MM-dd");
ViewBag.end = end.ToString("yyyy-MM-dd");
ViewBag.paycompanyid = paycompanyid.HasValue ? paycompanyid.Value.ToString() : "";
ViewBag.headname = headname;
return View();
}
......@@ -2150,11 +2151,11 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="paycompanyid"></param>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
public JsonResult ListFinanceHandleFeeJson(DateTime start, DateTime end, int? paycompanyid)
public JsonResult ListFinanceHandleFeeJson(DateTime start, DateTime end, int? paycompanyid,string headname)
{
var total = 0;
var obj = new Services.FinanceReportServices().ListFinanceHandleFee(start, end, paycompanyid);
var obj = new Services.FinanceReportServices().ListFinanceHandleFee(start, end, paycompanyid,headname);
var totalRmb = 0M;
......@@ -2226,7 +2227,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
cwurl += "&CompanyVal=" + paycompanyid.Value;
}
if (type == 1 && headname == "财务部" || type==2)
if ((type == 1 && headname == "财务部") || type==2)
{
//利息支出
listInterest = new Services.FinanceReportServices().ListInterestExpense(cwurl);
......@@ -2275,7 +2276,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
cwurl += "&CompanyVal=" + paycompanyid.Value;
}
if (type == 1 && headname == "财务部" || type == 2)
if ((type == 1 && headname == "财务部") || type == 2)
{
//利息支出
listInterest = new Services.FinanceReportServices().ListInterestExpense(cwurl);
......@@ -2460,6 +2461,11 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
);
}
//利息
//手续费支出
var guid = Guid.NewGuid().ToString();
var filename = "付现流水明细"+DateTime.Now.ToString("yyyyMMddHHmmss");
var filepath = _hostingEnvironment.WebRootPath + "\\Files\\Report\\"+DateTime.Now.ToString("yyyy-MM-dd")+"\\";
......
Bailun.DC.Web/Areas/Reports/Views/Finance/AdministrativeCost.cshtml
......@@ -8,11 +8,12 @@
<div class="col-sm-12">
<div class="ibox-content m-b-sm border-bottom">
<div class="alert alert-info">
说明：1、手续费支出来自于财务系统，导出明细时，不会导出；
说明：1、【手续费支出】来自于财务系统，统计在广州百伦供应链科技有限公司主体下；2、【利息支出】来自于财务系统，统计在广州电子服装仓主体下；3、【广州歌戈儿生活科技有限公司】合并了分店的费用数据；
</div>
<form id="toolbar">
<div class="form-inline" style="line-height:40px;">
<input id="sel_type" name="sel_type" type="hidden" value="2" />
@*<div class="form-group">
<label>统计类型</label>
<select id="sel_type" class="form-control">
......@@ -38,12 +39,13 @@
</select>
</div>
<div class="form-group">
<label>&nbsp;</label>
@*<label>&nbsp;</label>
<select id="ismanager" class="form-control">
<option value="">全部</option>
<option value="1">销管财</option>
<option value="0">非销管财</option>
</select>
</select>*@
<input id="ismanager" name="ismanager" value="" type="hidden" />
</div>
<div class="form-group">
<label>&nbsp;</label>
......
Bailun.DC.Web/Areas/Reports/Views/Finance/ListFinanceHandleFee.cshtml
......@@ -57,7 +57,7 @@
$.submit({
url: '@Url.Content("~/Reports/Finance/ListFinanceHandleFeeJson")',
paramData: 'start=' + start + '&end=' + end +'&paycompanyid=@(ViewBag.paycompanyid)',
paramData: 'start=' + start + '&end=' + end +'&paycompanyid=@(ViewBag.paycompanyid)&headname=@(ViewBag.headname)',
func: function (result) {
$('#tb').html('');
if (result.success) {
......
Bailun.DC.Web/Areas/Reports/Views/Finance/ListInterestExpense.cshtml
......@@ -8,6 +8,10 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox-content m-b-sm border-bottom">
<div class="alert alert-info">
说明：1、如果不是广州百伦供应链科技有限公司主体的，则汇总显示为电子服装仓的利息
</div>
<form id="toolbar">
<div class="form-inline" style="line-height:40px;">
<div class="form-group">
......
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