@@ -963,7 +967,8 @@ ON s2.id = s1.order_fee_config_id WHERE s1.month = @month ");
...
@@ -963,7 +967,8 @@ ON s2.id = s1.order_fee_config_id WHERE s1.month = @month ");
}
}
elseif(input.FeeName.Contains("减:营业外支出"))
elseif(input.FeeName.Contains("减:营业外支出"))
{
{
sql.Append("AND s2.datacenter_col LIKE '%营业外支出'");
//2021-09-23陈文静提出需求 营业外收入的mx站点数值小于0的话,就放入营业外支出
sql.Append("AND s2.datacenter_col LIKE '%营业外支出' or (s2.datacenter_col LIKE '%营业外收入' and s1.platform = '亚马逊' and LOWER(s1.website) = 'mx' and amountval_rmb < 0)");
}
}
else
else
{
{
...
@@ -1037,6 +1042,10 @@ ON s2.id = s1.order_fee_config_id WHERE s1.month = @month ");
...
@@ -1037,6 +1042,10 @@ ON s2.id = s1.order_fee_config_id WHERE s1.month = @month ");