Skip to content

D
DataCenter_Core2.1_20190520
Commit e2e8e19a by guanzhenshan
Options

调整销售统计报表金额显示格式

parent 5095a1ad
Showing with 131 additions and 131 deletions
Bailun.DC.Services/FinanceReportServices.cs
......@@ -387,33 +387,33 @@ namespace Bailun.DC.Services
{
if (m != null && m.userable_amount == item.userable_amount)
{
item.amount = m.amount + item.amount_sales - item.withdraw_amount; //本期期末=上一期期末+本期销售额-本期提现额
item.amount_rmb = item.amount * item.exchangerate;
//item.amount = m.amount + item.amount_sales - item.withdraw_amount; //本期期末=上一期期末+本期销售额-本期提现额
//item.amount_rmb = item.amount * item.exchangerate;
item.before_balance = m.amount;
}
else if (m != null && m.userable_amount != item.userable_amount)
{
item.amount = item.userable_amount + item.amount_sales - item.withdraw_amount;
item.amount_rmb = item.amount * item.exchangerate;
//item.amount = item.userable_amount + item.amount_sales - item.withdraw_amount;
//item.amount_rmb = item.amount * item.exchangerate;
item.before_balance = item.userable_amount;
}
else if (m == null && m.userable_amount == item.userable_amount)
{
item.amount = 0 + item.amount_sales - item.withdraw_amount; //本期期末=上一期期末+本期销售额-本期提现额
item.amount_rmb = item.amount * item.exchangerate;
//item.amount = 0 + item.amount_sales - item.withdraw_amount; //本期期末=上一期期末+本期销售额-本期提现额
//item.amount_rmb = item.amount * item.exchangerate;
item.before_balance = 0;
}
else if (m == null && m.userable_amount != item.userable_amount)
{
item.amount = item.userable_amount + item.amount_sales - item.withdraw_amount;
item.amount_rmb = item.amount * item.exchangerate;
//item.amount = item.userable_amount + item.amount_sales - item.withdraw_amount;
//item.amount_rmb = item.amount * item.exchangerate;
item.before_balance = item.userable_amount;
}
}
else
{
item.amount = item.userable_amount;
item.amount_rmb = item.userable_amount * item.exchangerate;
//item.amount = item.userable_amount;
//item.amount_rmb = item.userable_amount * item.exchangerate;
item.before_balance = m.userable_amount;
}
......
Bailun.DC.Services/OrdersServices.cs
......@@ -76,7 +76,7 @@ namespace Bailun.DC.Services
{
var sqlparam = new DynamicParameters();
var sql = @"select sum(amount_product*seller_order_exchange_rate) 'amount_product',sum(cost_product) 'cost_product',sum(cost_platform_fee*seller_order_exchange_rate) 'platform_fee',sum(cost_first) 'head_fee',count(id) 'order_count',sum(cost_total) 'cost_count',sum(cost_shipping) 'nofba_logisticsfee',sum(profit_total) 'profit_count',(sum(profit_total)/sum(amount_sales*seller_order_exchange_rate)) 'profit_rate',sum(amount_prepaid) amount_prepaid,sum(amount_refund*seller_order_exchange_rate) amount_refund from dc_base_oms_order from dc_base_oms_order where paid_time>='" + start.ToString("yyyy-MM-dd") + "' and paid_time<'" + end.AddDays(1).ToString("yyyy-MM-dd") + "' and platform_type='Amazon' and bailun_order_status!='Canceled' ";
var sql = @"select sum(amount_product*seller_order_exchange_rate) 'amount_product',sum(cost_product) 'cost_product',sum(cost_platform_fee*seller_order_exchange_rate) 'platform_fee',sum(cost_first) 'head_fee',count(id) 'order_count',sum(cost_total) 'cost_count',sum(cost_shipping) 'nofba_logisticsfee',sum(profit_total) 'profit_count',(sum(profit_total)/sum(amount_sales*seller_order_exchange_rate)) 'profit_rate',sum(amount_prepaid) amount_prepaid,sum(amount_refund*seller_order_exchange_rate) amount_refund from dc_base_oms_order where paid_time>='" + start.ToString("yyyy-MM-dd") + "' and paid_time<'" + end.AddDays(1).ToString("yyyy-MM-dd") + "' and platform_type='Amazon' and bailun_order_status!='Canceled' ";
if (!string.IsNullOrWhiteSpace(account))
{
......
Bailun.DC.Web/Areas/Reports/Controllers/OrdersController.cs
......@@ -64,7 +64,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
countM.amount_prepaid = Math.Round(countM.amount_prepaid, 2, MidpointRounding.AwayFromZero);
countM.amount_refund = Math.Round(countM.amount_refund, 2, MidpointRounding.AwayFromZero);
countM.loss_withdrawal = countM.amount_product * (objwithdraw == null ? 0 : objwithdraw.Loss_withdrawal_percent ?? 0);
countM.profit_rate = Math.Round((countM.profit_count / countM.amount_product), 2, MidpointRounding.AwayFromZero);
countM.profit_rate = countM.amount_product>0?Math.Round((countM.profit_count / countM.amount_product), 2, MidpointRounding.AwayFromZero):0;
var obj = list.Select(p => new
......@@ -72,42 +72,42 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
p.platform_type,
p.seller_account,
p.website,
amount_product = p.amount_product.ToString("###,###.##"),
cost_product = p.cost_product.ToString("###,###.##"),
platform_fee = p.platform_fee.ToString("###,###.##"),
head_fee = p.head_fee>0?p.head_fee.ToString("###,###.##"):"0",
amount_product = p.amount_product.ToString("N2"),
cost_product = p.cost_product.ToString("N2"),
platform_fee = p.platform_fee.ToString("N2"),
head_fee = p.head_fee>0?p.head_fee.ToString("N2"):"0",
p.order_count,
loss_withdrawal = (p.amount_product * (objwithdraw == null ? 0 : objwithdraw.Loss_withdrawal_percent ?? 0))>0? (p.amount_product * (objwithdraw == null ? 0 : objwithdraw.Loss_withdrawal_percent ?? 0)).ToString("###,###.##"):"0",
cost_count = p.cost_count.ToString("###,###.##"),
forecast_profit_count = p.forecast_profit_count.ToString("###,###.##"),
nofba_logisticsfee = p.nofba_logisticsfee>0?p.nofba_logisticsfee.ToString("###,###.##"):"0",
nofba_forecast_logisticsfee = p.nofba_forecast_logisticsfee.ToString("###,###.##"),
forecast_profit_rate = (100*p.forecast_profit_rate).ToString("###,###.##"),
profit_count = p.profit_count.ToString("###,###.##"),
profit_rate = (100*p.profit_rate).ToString("###,###.##"),
loss_withdrawal = (p.amount_product * (objwithdraw == null ? 0 : objwithdraw.Loss_withdrawal_percent ?? 0))>0? (p.amount_product * (objwithdraw == null ? 0 : objwithdraw.Loss_withdrawal_percent ?? 0)).ToString("N2"):"0",
cost_count = p.cost_count.ToString("N2"),
forecast_profit_count = p.forecast_profit_count.ToString("N2"),
nofba_logisticsfee = p.nofba_logisticsfee>0?p.nofba_logisticsfee.ToString("N2"):"0",
nofba_forecast_logisticsfee = p.nofba_forecast_logisticsfee.ToString("N2"),
forecast_profit_rate = (100*p.forecast_profit_rate).ToString("N2"),
profit_count = p.profit_count.ToString("N2"),
profit_rate = (100*p.profit_rate).ToString("N2"),
p.currency,
amount_prepaid = p.amount_prepaid.ToString("###,###.##"),
amount_refund = p.amount_refund>0?p.amount_refund.ToString("###,###.##"):"0",
amount_prepaid = p.amount_prepaid.ToString("N2"),
amount_refund = p.amount_refund>0?p.amount_refund.ToString("N2"):"0",
});
return JsonConvert.SerializeObject(new { total = total, rows = obj,count_row=new {
countM.website,
amount_product = countM.amount_product.ToString("###,###.##"),
cost_product = countM.cost_product.ToString("###,###.##"),
platform_fee = countM.platform_fee.ToString("###,###.##"),
head_fee = countM.head_fee.ToString("###,###.##"),
amount_product = countM.amount_product.ToString("N2"),
cost_product = countM.cost_product.ToString("N2"),
platform_fee = countM.platform_fee.ToString("N2"),
head_fee = countM.head_fee.ToString("N2"),
countM.order_count,
loss_withdrawal = countM.loss_withdrawal>0? countM.loss_withdrawal.ToString("###,###.##"):"0",
cost_count = countM.cost_count.ToString("###,###.##"),
forecast_profit_count = countM.forecast_profit_count.ToString("###,###.##"),
nofba_logisticsfee = countM.nofba_logisticsfee.ToString("###,###.##"),
nofba_forecast_logisticsfee = countM.nofba_forecast_logisticsfee.ToString("###,###.##"),
forecast_profit_rate = (100 * countM.forecast_profit_rate).ToString("###,###.##"),
profit_count = countM.profit_count.ToString("###,###.##"),
profit_rate = (100 * countM.profit_rate).ToString("###,###.##"),
loss_withdrawal = countM.loss_withdrawal>0? countM.loss_withdrawal.ToString("N2"):"0",
cost_count = countM.cost_count.ToString("N2"),
forecast_profit_count = countM.forecast_profit_count.ToString("N2"),
nofba_logisticsfee = countM.nofba_logisticsfee.ToString("N2"),
nofba_forecast_logisticsfee = countM.nofba_forecast_logisticsfee.ToString("N2"),
forecast_profit_rate = (100 * countM.forecast_profit_rate).ToString("N2"),
profit_count = countM.profit_count.ToString("N2"),
profit_rate = (100 * countM.profit_rate).ToString("N2"),
countM.currency,
amount_prepaid = countM.amount_prepaid.ToString("###,###.##"),
amount_refund = countM.amount_refund > 0 ? countM.amount_refund.ToString("###,###.##") : "0",
amount_prepaid = countM.amount_prepaid.ToString("N2"),
amount_refund = countM.amount_refund > 0 ? countM.amount_refund.ToString("N2") : "0",
}
});
}
......@@ -168,49 +168,49 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
p.platform_type,
p.seller_account,
p.website,
amount_product = p.amount_product.ToString("###,###.##"),
cost_product = p.cost_product.ToString("###,###.##"),
platform_fee = p.platform_fee.ToString("###,###.##"),
head_fee = p.head_fee.ToString("###,###.##"),
amount_product = p.amount_product.ToString("N2"),
cost_product = p.cost_product.ToString("N2"),
platform_fee = p.platform_fee.ToString("N2"),
head_fee = p.head_fee.ToString("N2"),
p.order_count,
loss_withdrawal = (p.amount_product * (objwithdraw == null ? 0 : objwithdraw.Loss_withdrawal_percent ?? 0)) > 0 ? (p.amount_product * (objwithdraw == null ? 0 : objwithdraw.Loss_withdrawal_percent ?? 0)).ToString("###,###.##") : "0",
cost_count = p.cost_count.ToString("###,###.##"),
forecast_profit_count = p.forecast_profit_count.ToString("###,###.##"),
nofba_logisticsfee = p.nofba_logisticsfee > 0 ? p.nofba_logisticsfee.ToString("###,###.##") : "0",
nofba_forecast_logisticsfee = p.nofba_forecast_logisticsfee.ToString("###,###.##"),
forecast_profit_rate = (100 * p.forecast_profit_rate).ToString("###,###.##"),
profit_count = p.profit_count.ToString("###,###.##"),
profit_rate = (100 * p.profit_rate).ToString("###,###.##"),
amount_prepaid = p.amount_prepaid.ToString("###,###.##"),
amount_refund = p.amount_refund > 0 ? p.amount_refund.ToString("###,###.##") : "0",
cost_fba_fee = p.cost_fba_fee>0?p.cost_fba_fee.ToString("###,###.##"):"0",
cost_paypal_fee = p.cost_paypal_fee>0?p.cost_paypal_fee.ToString("###,###.##"):"0",
cost_package = p.cost_package>0?p.cost_package.ToString("###,###.##"):"0",
loss_withdrawal = (p.amount_product * (objwithdraw == null ? 0 : objwithdraw.Loss_withdrawal_percent ?? 0)) > 0 ? (p.amount_product * (objwithdraw == null ? 0 : objwithdraw.Loss_withdrawal_percent ?? 0)).ToString("N2") : "0",
cost_count = p.cost_count.ToString("N2"),
forecast_profit_count = p.forecast_profit_count.ToString("N2"),
nofba_logisticsfee = p.nofba_logisticsfee > 0 ? p.nofba_logisticsfee.ToString("N2") : "0",
nofba_forecast_logisticsfee = p.nofba_forecast_logisticsfee.ToString("N2"),
forecast_profit_rate = (100 * p.forecast_profit_rate).ToString("N2"),
profit_count = p.profit_count.ToString("N2"),
profit_rate = (100 * p.profit_rate).ToString("N2"),
amount_prepaid = p.amount_prepaid.ToString("N2"),
amount_refund = p.amount_refund > 0 ? p.amount_refund.ToString("N2") : "0",
cost_fba_fee = p.cost_fba_fee>0?p.cost_fba_fee.ToString("N2"):"0",
cost_paypal_fee = p.cost_paypal_fee>0?p.cost_paypal_fee.ToString("N2"):"0",
cost_package = p.cost_package>0?p.cost_package.ToString("N2"):"0",
});
return JsonConvert.SerializeObject(new { total = total, rows = obj,
count_row = new
{
countM.website,
amount_product = countM.amount_product.ToString("###,###.##"),
cost_product = countM.cost_product.ToString("###,###.##"),
platform_fee = countM.platform_fee.ToString("###,###.##"),
head_fee = countM.head_fee.ToString("###,###.##"),
amount_product = countM.amount_product.ToString("N2"),
cost_product = countM.cost_product.ToString("N2"),
platform_fee = countM.platform_fee.ToString("N2"),
head_fee = countM.head_fee.ToString("N2"),
countM.order_count,
loss_withdrawal = countM.loss_withdrawal > 0 ? countM.loss_withdrawal.ToString("###,###.##") : "0",
cost_count = countM.cost_count.ToString("###,###.##"),
forecast_profit_count = countM.forecast_profit_count.ToString("###,###.##"),
nofba_logisticsfee = countM.nofba_logisticsfee.ToString("###,###.##"),
nofba_forecast_logisticsfee = countM.nofba_forecast_logisticsfee.ToString("###,###.##"),
forecast_profit_rate = (100 * countM.forecast_profit_rate).ToString("###,###.##"),
profit_count = countM.profit_count.ToString("###,###.##"),
profit_rate = (100 * countM.profit_rate).ToString("###,###.##"),
loss_withdrawal = countM.loss_withdrawal > 0 ? countM.loss_withdrawal.ToString("N2") : "0",
cost_count = countM.cost_count.ToString("N2"),
forecast_profit_count = countM.forecast_profit_count.ToString("N2"),
nofba_logisticsfee = countM.nofba_logisticsfee.ToString("N2"),
nofba_forecast_logisticsfee = countM.nofba_forecast_logisticsfee.ToString("N2"),
forecast_profit_rate = (100 * countM.forecast_profit_rate).ToString("N2"),
profit_count = countM.profit_count.ToString("N2"),
profit_rate = (100 * countM.profit_rate).ToString("N2"),
countM.currency,
amount_prepaid = countM.amount_prepaid.ToString("###,###.##"),
amount_refund = countM.amount_refund > 0 ? countM.amount_refund.ToString("###,###.##") : "0",
cost_fba_fee = countM.cost_fba_fee > 0 ? countM.cost_fba_fee.ToString("###,###.##") : "0",
cost_paypal_fee = countM.cost_paypal_fee > 0 ? countM.cost_paypal_fee.ToString("###,###.##") : "0",
cost_package = countM.cost_package > 0 ? countM.cost_package.ToString("###,###.##") : "0",
amount_prepaid = countM.amount_prepaid.ToString("N2"),
amount_refund = countM.amount_refund > 0 ? countM.amount_refund.ToString("N2") : "0",
cost_fba_fee = countM.cost_fba_fee > 0 ? countM.cost_fba_fee.ToString("N2") : "0",
cost_paypal_fee = countM.cost_paypal_fee > 0 ? countM.cost_paypal_fee.ToString("N2") : "0",
cost_package = countM.cost_package > 0 ? countM.cost_package.ToString("N2") : "0",
}
});
}
......@@ -278,18 +278,18 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
p.bailun_payment_status,
p.bailun_shipping_status,
p.order_currency,
amount_total = p.amount_total>0? p.amount_total.ToString("###,###.##"):"0",
amount_shipping = p.amount_shipping>0? p.amount_shipping.ToString("###,###.##"):"0",
amount_product = p.amount_product>0? p.amount_product.ToString("###,###.##"):"0",
amount_adjustment = p.amount_adjustment>0? p.amount_adjustment.ToString("###,###.##"):"0",
cost_promotion = p.cost_promotion>0? p.cost_promotion.ToString("###,###.##"):"0",
cost_platform_fee = p.cost_platform_fee>0? p.cost_platform_fee.ToString("###,###.##"):"0",
cost_product = p.cost_product>0? p.cost_product.ToString("###,###.##"):"0",
cost_first = p.cost_first>0? p.cost_first.ToString("###,###.##"):"0",
cost_package = p.cost_package>0? p.cost_package.ToString("###,###.##"):"0",
cost_fba_fee = p.cost_fba_fee>0? p.cost_fba_fee.ToString("###,###.##"):"0",
cost_total = p.cost_total>0? p.cost_total.ToString("###,###.##"):"0",
profit_total = p.profit_total>0? p.profit_total.ToString("###,###.##"):"0",
amount_total = p.amount_total>0? p.amount_total.ToString("N2"):"0",
amount_shipping = p.amount_shipping>0? p.amount_shipping.ToString("N2"):"0",
amount_product = p.amount_product>0? p.amount_product.ToString("N2"):"0",
amount_adjustment = p.amount_adjustment>0? p.amount_adjustment.ToString("N2"):"0",
cost_promotion = p.cost_promotion>0? p.cost_promotion.ToString("N2"):"0",
cost_platform_fee = p.cost_platform_fee>0? p.cost_platform_fee.ToString("N2"):"0",
cost_product = p.cost_product>0? p.cost_product.ToString("N2"):"0",
cost_first = p.cost_first>0? p.cost_first.ToString("N2"):"0",
cost_package = p.cost_package>0? p.cost_package.ToString("N2"):"0",
cost_fba_fee = p.cost_fba_fee>0? p.cost_fba_fee.ToString("N2"):"0",
cost_total = p.cost_total>0? p.cost_total.ToString("N2"):"0",
profit_total = p.profit_total>0? p.profit_total.ToString("N2"):"0",
create_time = p.create_time.ToString("yyyy-MM-dd HH:mm:ss"),
order_update_time = p.order_update_time.ToString("yyyy-MM-dd HH:mm:ss"),
p.salecount
......@@ -358,18 +358,18 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
p.seller_account,
p.platform_order_type,
p.bailun_sku,
amount_product = p.amount_product>0? (p.amount_product*p.seller_order_exchange_rate).ToString("###,###.##"):"0",
cost_first = p.cost_first>0? p.cost_first.ToString("###,###.##"):"0",
amount_shipping = p.amount_shipping>0? (p.amount_shipping * p.seller_order_exchange_rate).ToString("###,###.##"):"0",
cost_promotion= p.cost_promotion>0? (p.cost_promotion * p.seller_order_exchange_rate).ToString("###,###.##"):"0",
cost_shipping = p.cost_shipping>0? p.cost_shipping.ToString("###,###.##"):"0",
cost_fba_fee = p.cost_fba_fee>0? (p.cost_fba_fee * p.seller_order_exchange_rate).ToString("###,###.##"):"0",
cost_platform_fee = p.cost_platform_fee>0? (p.cost_platform_fee * p.seller_order_exchange_rate).ToString("###,###.##"):"0",
platform_fee_rate = (p.cost_platform_fee/ p.amount_product *100).ToString("###,###.##"),
cost_package = p.cost_package>0? p.cost_package.ToString("###,###.##"):"0",
losswithdrawal = p.losswithdrawal>0? p.losswithdrawal.ToString("###,###.##"):"0",
amount_total = p.amount_total>0? p.amount_total.ToString("###,###.##"):"0",
cost_total = p.cost_total>0? p.cost_total.ToString("###,###.##"):"0",
amount_product = p.amount_product>0? (p.amount_product*p.seller_order_exchange_rate).ToString("N2"):"0",
cost_first = p.cost_first>0? p.cost_first.ToString("N2") :"0",
amount_shipping = p.amount_shipping>0? (p.amount_shipping * p.seller_order_exchange_rate).ToString("N2") :"0",
cost_promotion= p.cost_promotion>0? (p.cost_promotion * p.seller_order_exchange_rate).ToString("N2") :"0",
cost_shipping = p.cost_shipping>0? p.cost_shipping.ToString("N2") :"0",
cost_fba_fee = p.cost_fba_fee>0? (p.cost_fba_fee * p.seller_order_exchange_rate).ToString("N2") :"0",
cost_platform_fee = p.cost_platform_fee>0? (p.cost_platform_fee * p.seller_order_exchange_rate).ToString("N2") :"0",
platform_fee_rate = (p.cost_platform_fee/ p.amount_product *100).ToString("N2"),
cost_package = p.cost_package>0? p.cost_package.ToString("N2") :"0",
losswithdrawal = p.losswithdrawal>0? p.losswithdrawal.ToString("N2") :"0",
amount_total = p.amount_total>0? p.amount_total.ToString("N2") :"0",
cost_total = p.cost_total>0? p.cost_total.ToString("N2") :"0",
paid_time = p.paid_time.ToString("yyyy-MM-dd HH:mm:ss")
});
......@@ -403,19 +403,19 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
var obj = new Services.OrdersServices().ListFbaAbnormalOrder(parameter, account, website, start, end, orderno, ref total);
var list = obj.Select(p => new {
average_fba_fee = p.average_fba_fee>0?p.average_fba_fee.ToString("###,###.##"):"0",
average_fba_fee = p.average_fba_fee>0?p.average_fba_fee.ToString("N2") :"0",
p.bailun_sku,
cost_fba_fee = p.cost_fba_fee>0? p.cost_fba_fee.ToString("###,###.##"):"0",
cost_fba_fee = p.cost_fba_fee>0? p.cost_fba_fee.ToString("N2") :"0",
create_time = p.create_time.ToString("yyyy-MM-dd HH:mm:ss"),
fba_fee_rmb = p.fba_fee_rmb>0? p.fba_fee_rmb.ToString("###,###.##"):"0",
max_fba_fee = p.max_fba_fee>0? p.max_fba_fee.ToString("###,###.##"):"0",
min_fba_fee = p.min_fba_fee>0? p.min_fba_fee.ToString("###,###.##"):"0",
fba_fee_rmb = p.fba_fee_rmb>0? p.fba_fee_rmb.ToString("N2") :"0",
max_fba_fee = p.max_fba_fee>0? p.max_fba_fee.ToString("N2") :"0",
min_fba_fee = p.min_fba_fee>0? p.min_fba_fee.ToString("N2") :"0",
p.order_currency,
p.origin_order_id,
p.platform_type,
p.product_code,
p.seller_account,
seller_order_exchange_rate = p.seller_order_exchange_rate>0?p.seller_order_exchange_rate.ToString("###,###.##"):"0",
seller_order_exchange_rate = p.seller_order_exchange_rate>0?p.seller_order_exchange_rate.ToString("N2") :"0",
p.website,
});
......@@ -458,9 +458,9 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
p.origin_order_id,
p.bailun_order_id,
p.seller_account,
amount_product = p.amount_product>0? p.amount_product.ToString("###,###.##"):"0",
cost_platform_fee = p.cost_platform_fee>0? p.cost_platform_fee.ToString("###,###.##"):"0",
platform_fee_rate = p.platform_fee_rate>0? (p.platform_fee_rate*100).ToString("###,###.##"):"0",
amount_product = p.amount_product>0? p.amount_product.ToString("N2") :"0",
cost_platform_fee = p.cost_platform_fee>0? p.cost_platform_fee.ToString("N2") :"0",
platform_fee_rate = p.platform_fee_rate>0? (p.platform_fee_rate*100).ToString("N2") :"0",
p.platform_type,
p.website,
create_time = p.create_time.ToString("yyyy-MM-dd HH:mm:ss")
......@@ -518,19 +518,19 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
var list = result.Select(p => new {
p.platform,
customerprice = p.customerprice > 0 ? p.customerprice.ToString("###,###.##") : "0",
customerprice = p.customerprice > 0 ? p.customerprice.ToString("N2") : "0",
p.ordercount,
platformfee = p.platformfee > 0 ? p.platformfee.ToString("###,###.##") : "0",
profit = p.profit > 0 ? p.profit.ToString("###,###.##") : "0",
profitrate = p.profitrate > 0 ? (p.profitrate * 100).ToString("###,###.##") : "0",
returnamount = p.returnamount > 0 ? p.returnamount.ToString("###,###.##") : "0",
platformfee = p.platformfee > 0 ? p.platformfee.ToString("N2") : "0",
profit = p.profit > 0 ? p.profit.ToString("N2") : "0",
profitrate = p.profitrate > 0 ? (p.profitrate * 100).ToString("N2") : "0",
returnamount = p.returnamount > 0 ? p.returnamount.ToString("N2") : "0",
returnamountrate = p.returnamountrate.ToString("N4"),
saleamount = p.saleamount > 0 ? p.saleamount.ToString("###,###.##") : "0",
saleamount = p.saleamount > 0 ? p.saleamount.ToString("N2") : "0",
cost_first = p.cost_first > 0 ? p.cost_first.ToString("###,###.##") : "0",
cost_handle_bailun = p.cost_handle_bailun > 0 ? p.cost_handle_bailun.ToString("###,###.##") : "0",
cost_handle_platform = p.cost_handle_platform > 0 ? p.cost_handle_platform.ToString("###,###.##") : "0",
cost_tail = p.cost_tail > 0 ? p.cost_tail.ToString("###,###.##") : "0",
cost_first = p.cost_first > 0 ? p.cost_first.ToString("N2") : "0",
cost_handle_bailun = p.cost_handle_bailun > 0 ? p.cost_handle_bailun.ToString("N2") : "0",
cost_handle_platform = p.cost_handle_platform > 0 ? p.cost_handle_platform.ToString("N2") : "0",
cost_tail = p.cost_tail > 0 ? p.cost_tail.ToString("N2") : "0",
amount_prepaid = p.amount_prepaid.ToString("N2"),
});
......@@ -582,21 +582,21 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
var list = result.Select(p => new {
p.platform,
customerprice = p.customerprice > 0 ? p.customerprice.ToString("###,###.##") : "0",
customerprice = p.customerprice > 0 ? p.customerprice.ToString("N2") : "0",
p.ordercount,
platformfee = p.platformfee > 0 ? p.platformfee.ToString("###,###.##") : "0",
profit = p.profit > 0 ? p.profit.ToString("###,###.##") : "0",
profitrate = p.profitrate > 0 ? (p.profitrate * 100).ToString("###,###.##") : "0",
returnamount = p.returnamount > 0 ? p.returnamount.ToString("###,###.##") : "0",
returnamountrate = p.returnamountrate > 0 ? (p.returnamountrate * 100).ToString("###,###.##") : "0",
saleamount = p.saleamount > 0 ? p.saleamount.ToString("###,###.##") : "0",
cost_first = p.cost_first > 0 ? p.cost_first.ToString("###,###.##") : "0",
cost_handle_bailun = p.cost_handle_bailun > 0 ? p.cost_handle_bailun.ToString("###,###.##") : "0",
cost_handle_platform = p.cost_handle_platform > 0 ? p.cost_handle_platform.ToString("###,###.##") : "0",
cost_tail = p.cost_tail > 0 ? p.cost_tail.ToString("###,###.##") : "0",
platformfee = p.platformfee > 0 ? p.platformfee.ToString("N2") : "0",
profit = p.profit > 0 ? p.profit.ToString("N2") : "0",
profitrate = p.profitrate > 0 ? (p.profitrate * 100).ToString("N2") : "0",
returnamount = p.returnamount > 0 ? p.returnamount.ToString("N2") : "0",
returnamountrate = p.returnamountrate > 0 ? (p.returnamountrate * 100).ToString("N2") : "0",
saleamount = p.saleamount > 0 ? p.saleamount.ToString("N2") : "0",
cost_first = p.cost_first > 0 ? p.cost_first.ToString("N2") : "0",
cost_handle_bailun = p.cost_handle_bailun > 0 ? p.cost_handle_bailun.ToString("N2") : "0",
cost_handle_platform = p.cost_handle_platform > 0 ? p.cost_handle_platform.ToString("N2") : "0",
cost_tail = p.cost_tail > 0 ? p.cost_tail.ToString("N2") : "0",
p.website,
amount_prepaid = p.amount_prepaid>0?p.amount_prepaid.ToString("###,###.##"):"0",
amount_prepaid = p.amount_prepaid>0?p.amount_prepaid.ToString("N2"):"0",
});
return JsonConvert.SerializeObject(new { total=total,rows = list,count_row=countM});
......@@ -837,7 +837,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
cost_paypal_fee = p.cost_paypal_fee.ToString("N2"),
cost_first = p.cost_first.ToString("N2"),
p.order_count,
loss_withdrawal = (p.amount_product * (objwithdraw == null ? 0 : objwithdraw.Loss_withdrawal_percent ?? 0)) > 0 ? (p.amount_product * (objwithdraw == null ? 0 : objwithdraw.Loss_withdrawal_percent ?? 0)).ToString("###,###.##") : "0",
loss_withdrawal = (p.amount_product * (objwithdraw == null ? 0 : objwithdraw.Loss_withdrawal_percent ?? 0)) > 0 ? (p.amount_product * (objwithdraw == null ? 0 : objwithdraw.Loss_withdrawal_percent ?? 0)).ToString("N2") : "0",
cost_total = p.cost_total.ToString("N2"),
cost_shipping = p.cost_shipping.ToString("N2"),
......
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