Commit bc6d7a0e by guanzhenshan

1、退款数据除了取消订单不取,其他状态的退款数据都包含到平台利润统计报表

2、增加登录超时的判断
parent 18c8de6c
...@@ -4295,7 +4295,7 @@ namespace Bailun.DC.Services ...@@ -4295,7 +4295,7 @@ namespace Bailun.DC.Services
public List<dc_base_oms_order> ListPlatformRefund(DateTime? start, DateTime? end, int? companyid, string platform, string website, bool isUSD) public List<dc_base_oms_order> ListPlatformRefund(DateTime? start, DateTime? end, int? companyid, string platform, string website, bool isUSD)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
var sql = $"select t1.platform_type,{(isUSD? "sum(t1.amount_refund_usd)" : "sum(t1.amount_refund_rmb)")} as amount_refund from dc_base_crm_refund t1 join dc_base_oms_order t2 on t1.origin_order_id=t2.origin_order_id and t2.bailun_order_status!='Canceled' and t2.has_scalp=0 and t2.has_innersale=0 and t2.bailun_interception_status in ('None','Failed') "; var sql = $"select t1.platform_type,{(isUSD? "sum(t1.amount_refund_usd)" : "sum(t1.amount_refund_rmb)")} as amount_refund from dc_base_crm_refund t1 join dc_base_oms_order t2 on t1.origin_order_id=t2.origin_order_id and t2.bailun_order_status!='Canceled' ";
sql += " where t1.is_deleted=0 and t1.is_freeze=0 "; sql += " where t1.is_deleted=0 and t1.is_freeze=0 ";
......
...@@ -54,6 +54,10 @@ function OnlyTable(tableId, aoColumn, actionUrl, serverParams,tbParams,dataParam ...@@ -54,6 +54,10 @@ function OnlyTable(tableId, aoColumn, actionUrl, serverParams,tbParams,dataParam
paginationNextText: "下一页", paginationNextText: "下一页",
paginationLastText: "最后页", paginationLastText: "最后页",
onLoadSuccess: function (data) { onLoadSuccess: function (data) {
if (data != undefined && data.statusCode == '401') {
parent.window.location = parent.window.location;
}
if (tbParams != undefined && tbParams.showCount) { if (tbParams != undefined && tbParams.showCount) {
//替换汇总行的相关列值 //替换汇总行的相关列值
var tr = $('.fixed-table-footer').find('tr'); var tr = $('.fixed-table-footer').find('tr');
...@@ -226,6 +230,10 @@ $.submit = function (data) { ...@@ -226,6 +230,10 @@ $.submit = function (data) {
} }
}, },
success: function (result) { success: function (result) {
if (data != undefined && data.statusCode == '401') {
parent.window.location = parent.window.location;
}
try { try {
if (!data.noloading) if (!data.noloading)
{ {
......
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