Skip to content

D
DataCenter_Core2.1_20190520
Commit cc7d3996 by guanzhenshan
Options

解决退款导出财务格式数据异常的问题；增加数据监测面板；

parent 4a7cf88f
Showing with 182 additions and 21 deletions
Bailun.DC.Models/DataWareHouse/flowing_parse_error.cs
...@@ -9,28 +9,54 @@ namespace Bailun.DC.Models.DataWareHouse ...@@ -9,28 +9,54 @@ namespace Bailun.DC.Models.DataWareHouse
/// </summary> /// </summary>
public class flowing_parse_error public class flowing_parse_error
{ {
/// <summary>
///
/// </summary>
public int id { get; set; } public int id { get; set; }
/// <summary>
///
/// </summary>
public int flowing_id { get; set; } public int flowing_id { get; set; }
/// <summary>
/// 数据类型，1：销售平台，2：物流平台
/// </summary>
public int datatype { get; set; } public int datatype { get; set; }
/// <summary>
///
/// </summary>
public string log_content { get; set; } public string log_content { get; set; }
/// <summary>
/// 处理状态，0：待处理，1：无需处理，2：处理完成
/// </summary>
public int status { get; set; } public int status { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime createtime { get; set; } public DateTime createtime { get; set; }
/// <summary> /// <summary>
/// 平台 /// 平台
/// </summary> /// </summary>
public string platform { get; set; } public string platform { get; set; }
/// <summary> /// <summary>
/// 站点 /// 站点
/// </summary> /// </summary>
public string website { get; set; } public string website { get; set; }
/// <summary> /// <summary>
/// 月份 /// 月份
/// </summary> /// </summary>
......
Bailun.DC.Models/DataWareHouse/uploadfiles.cs
...@@ -11,11 +11,13 @@ namespace Bailun.DC.Models.DataWareHouse ...@@ -11,11 +11,13 @@ namespace Bailun.DC.Models.DataWareHouse
/// </summary> /// </summary>
public int id { get; set; } public int id { get; set; }
/// <summary> /// <summary>
/// 数据类型，1：销售平台的，2：物流费用 /// 数据类型，1：销售平台的，2：物流费用
/// </summary> /// </summary>
public int datatype { get; set; } public int datatype { get; set; }
/// <summary> /// <summary>
/// 文件名称 /// 文件名称
/// </summary> /// </summary>
...@@ -47,7 +49,7 @@ namespace Bailun.DC.Models.DataWareHouse ...@@ -47,7 +49,7 @@ namespace Bailun.DC.Models.DataWareHouse
/// <summary> /// <summary>
/// 文件状态：0：待解析，1：解析成功 /// 文件状态：0：待解析，1：解析中，2：解析成功
/// </summary> /// </summary>
public int status { get; set; } public int status { get; set; }
...@@ -69,15 +71,30 @@ namespace Bailun.DC.Models.DataWareHouse ...@@ -69,15 +71,30 @@ namespace Bailun.DC.Models.DataWareHouse
/// </summary> /// </summary>
public string website { get; set; } public string website { get; set; }
/// <summary>
///
/// </summary>
public DateTime createtime { get; set; }
/// <summary> /// <summary>
/// 上传七牛云返回的hask码 /// 上传七牛云返回的hask码
/// </summary> /// </summary>
public string hashcode { get; set; } public string hashcode { get; set; }
/// <summary> /// <summary>
/// 上传七牛云返回的key /// 上传七牛云返回的key
/// </summary> /// </summary>
public string filekey { get; set; } public string filekey { get; set; }
/// <summary>
/// 解析出来的流水总数
/// </summary>
public int? rowcount { get; set; }
} }
} }
Bailun.DC.Models/DataWareHouse/uploadfiles_parsing_error_log.cs
...@@ -70,6 +70,7 @@ namespace Bailun.DC.Models.DataWareHouse ...@@ -70,6 +70,7 @@ namespace Bailun.DC.Models.DataWareHouse
} }
/// <summary> /// <summary>
......
Bailun.DC.Models/Orders/mRefundForFinance.cs
...@@ -65,6 +65,11 @@ namespace Bailun.DC.Models.Orders ...@@ -65,6 +65,11 @@ namespace Bailun.DC.Models.Orders
public string website { get; set; } public string website { get; set; }
/// <summary>
/// 退款人民币金额
/// </summary>
public decimal amount_refund_rmb { get; set; }
} }
} }
Bailun.DC.Services/FinanceReportServices.cs
...@@ -857,7 +857,6 @@ namespace Bailun.DC.Services ...@@ -857,7 +857,6 @@ namespace Bailun.DC.Services
item.amount = -(item.amount); item.amount = -(item.amount);
item.amount_rmb = -(item.amount_rmb); item.amount_rmb = -(item.amount_rmb);
} }
} }
} }
......
Bailun.DC.Services/OrdersServices.cs
...@@ -5842,25 +5842,32 @@ namespace Bailun.DC.Services ...@@ -5842,25 +5842,32 @@ namespace Bailun.DC.Services
/// <returns></returns> /// <returns></returns>
public List<mRefundForFinance> ListRefundForFinance(DateTime start,DateTime end) public List<mRefundForFinance> ListRefundForFinance(DateTime start,DateTime end)
{ {
var sql = $@"select * from ( //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 // 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
from dc_base_crm_refund t1 // from dc_base_crm_refund t1
left join dc_base_oms_order t6 on t1.origin_order_id=t6.origin_order_id // left join dc_base_oms_order t6 on t1.origin_order_id=t6.origin_order_id
left join dc_base_oms_pick t2 on t1.origin_order_id=t2.origin_order_id and t1.bailun_sku=t2.bailun_sku and t2.has_delete=0 and t2.shipping_status='TotalShipping' // left join dc_base_oms_pick t2 on t1.origin_order_id=t2.origin_order_id and t1.bailun_sku=t2.bailun_sku and t2.has_delete=0 and t2.shipping_status='TotalShipping'
// left join dc_base_sku t3 on t1.bailun_sku=t3.bailun_sku
// left join dc_base_sku_finance_category t4 on t3.bailun_category_id=t4.bailuncategoryid
// where t1.refund_time>='{start.ToString("yyyy-MM-dd")}' and t1.refund_time<'{end.AddDays(1).ToString("yyyy-MM-dd")}' and t1.platform_type!='Ebay' and t1.is_deleted=0
// union all
// select 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
// from dc_base_crm_refund t1
// left join dc_base_oms_order t6 on t1.origin_order_id=t6.transaction_id
// left join dc_base_oms_pick t2 on t6.origin_order_id=t2.origin_order_id and t1.bailun_sku=t2.bailun_sku and t2.has_delete=0 and t2.shipping_status='TotalShipping'
// left join dc_base_sku t3 on t1.bailun_sku=t3.bailun_sku
// left join dc_base_sku_finance_category t4 on t3.bailun_category_id=t4.bailuncategoryid
// where t1.refund_time>='{start.ToString("yyyy-MM-dd")}' and t1.refund_time<'{end.AddDays(1).ToString("yyyy-MM-dd")}' and t1.platform_type='Ebay' and t1.is_deleted=0
// ) t1
// order by t1.refund_time;
// ";
var sql = $@"select t1.platform_type,t1.origin_order_id,t1.refund_time,t1.amount_refund,t1.order_currency as currency,t1.shipping_status,t1.bailun_sku,t4.financecategoryname,t1.order_total_amount,t1.amount_refund_rmb
from dc_base_crm_refund t1
left join dc_base_sku t3 on t1.bailun_sku=t3.bailun_sku left join dc_base_sku t3 on t1.bailun_sku=t3.bailun_sku
left join dc_base_sku_finance_category t4 on t3.bailun_category_id=t4.bailuncategoryid left join dc_base_sku_finance_category t4 on t3.bailun_category_id=t4.bailuncategoryid
where t1.refund_time>='{start.ToString("yyyy-MM-dd")}' and t1.refund_time<'{end.AddDays(1).ToString("yyyy-MM-dd")}' and t1.platform_type!='Ebay' and t1.is_deleted=0 where t1.shipping_status in ('TotalShipping','PartShipping') and t1.is_deleted=0 and is_freeze=0 and t1.company_id=1 and t1.refund_time>='{start.ToString("yyyy-MM-dd")}' and t1.refund_time<'{end.AddDays(1).ToString("yyyy-MM-dd")}'";
union all
select 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
from dc_base_crm_refund t1
left join dc_base_oms_order t6 on t1.origin_order_id=t6.transaction_id
left join dc_base_oms_pick t2 on t6.origin_order_id=t2.origin_order_id and t1.bailun_sku=t2.bailun_sku and t2.has_delete=0 and t2.shipping_status='TotalShipping'
left join dc_base_sku t3 on t1.bailun_sku=t3.bailun_sku
left join dc_base_sku_finance_category t4 on t3.bailun_category_id=t4.bailuncategoryid
where t1.refund_time>='{start.ToString("yyyy-MM-dd")}' and t1.refund_time<'{end.AddDays(1).ToString("yyyy-MM-dd")}' and t1.platform_type='Ebay' and t1.is_deleted=0
) t1
order by t1.refund_time;
";
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString_read)) using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString_read))
{ {
...@@ -5871,6 +5878,32 @@ namespace Bailun.DC.Services ...@@ -5871,6 +5878,32 @@ namespace Bailun.DC.Services
var obj = cn.Query<mRefundForFinance>(sql).ToList(); 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();
obj.ForEach(a => {
if (a.platform_type.ToLower() == "ebay")
{
var objOrder = listEbayOrderInfo.Where(o => o.transaction_id == a.origin_order_id).FirstOrDefault();
if (objOrder != null)
{
a.website = objOrder.website;
a.order_currency = objOrder.order_currency;
a.trancation_id = objOrder.transaction_id;
}
}
else
{
var objOrder = listNotEbayOrderInfo.Where(o => o.origin_order_id == a.origin_order_id).FirstOrDefault();
if (objOrder != null)
{
a.website = objOrder.website;
a.order_currency = objOrder.order_currency;
a.trancation_id = objOrder.transaction_id;
}
}
});
return obj; return obj;
} }
......
Bailun.DC.Web/Areas/DataWareHouse/Controllers/AutoCheckController.cs 0 → 100644
using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace Bailun.DC.Web.Areas.DataWareHouse.Controllers
{
[Area("DataWareHouse")]
public class AutoCheckController : Base.BaseController
{
public IActionResult Index()
{
return View();
}
[HttpPost]
public JsonResult GetAutoCheckAmazonFlowing(string month)
{
return Json(new { });
}
}
}
Bailun.DC.Web/Areas/DataWareHouse/Views/AutoCheck/Index.cshtml 0 → 100644
@{
ViewData["Title"] = "自动对账面板";
Layout = "~/Pages/Shared/_MainLayout.cshtml";
ViewBag.Nav = new string[] { "自动对账", "情况表" };
}
<div class="row">
<div class="col-sm-12">
<div class="ibox-content m-b-sm border-bottom">
<div class="row">
<div class="col-sm-12">
<div class="well well-sm">销售平台账单自动对账情况</div>
</div>
<div class="col-sm-6">
<div class="panel panel-info">
<div class="panel-heading">亚马逊</div>
<div class="panel-body">
1、
</div>
</div>
</div>
<div class="col-sm-6">
<div class="panel panel-info">
<div class="panel-heading">速卖通支付宝</div>
<div class="panel-body">
2、
</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-sm-12">
<div class="row">
<div class="col-sm-12">
<div class="well well-sm">物流账单自动对账情况</div>
</div>
<div class="col-sm-6">
<div class="panel panel-info">
<div class="panel-heading"></div>
<div class="panel-body">
2、
</div>
</div>
</div>
<div class="col-sm-6">
<div class="panel panel-info">
<div class="panel-heading"></div>
<div class="panel-body">
2、
</div>
</div>
</div>
</div>
</div>
</div>
Bailun.DC.Web/Areas/Reports/Controllers/OrdersController.cs
...@@ -2945,7 +2945,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -2945,7 +2945,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
var colNames = new List<string> {"平台","单号","交易号","退款时间", "退款金额(原币)", "币种", var colNames = new List<string> {"平台","单号","交易号","退款时间", "退款金额(原币)", "币种",
"发货状态", "Sku","财务分类","发货时间","订单金额", "发货状态", "Sku","财务分类","发货时间","订单金额",
"订单币种","站点" "订单币种","站点","退款金额RMB"
}; };
var listVal = new List<string>(); var listVal = new List<string>();
...@@ -2954,7 +2954,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -2954,7 +2954,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
listVal.Add( listVal.Add(
item.platform_type + "|" + item.origin_order_id +"|"+item.trancation_id+ "|" + item.refund_time.ToString("yyyy-MM-dd HH:mm:ss") + "|" + item.amount_refund + "|" + item.currency + "|" + item.platform_type + "|" + item.origin_order_id +"|"+item.trancation_id+ "|" + item.refund_time.ToString("yyyy-MM-dd HH:mm:ss") + "|" + item.amount_refund + "|" + item.currency + "|" +
item.shipping_status + "|" + item.bailun_sku+"|"+item.financecategoryname+"|"+(item.shipping_time?.ToString("yyyy-MM-dd HH:mm:ss")??"")+"|"+item.order_total_amount+ item.shipping_status + "|" + item.bailun_sku+"|"+item.financecategoryname+"|"+(item.shipping_time?.ToString("yyyy-MM-dd HH:mm:ss")??"")+"|"+item.order_total_amount+
"|"+item.order_currency+"|"+item.website "|"+item.order_currency+"|"+item.website+"|"+item.amount_refund_rmb
); );
} }
......
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