Commit 1ddcd6eb by guanzhenshan

调整预收款的提现统计公式

parent 7d8bc877
...@@ -23,7 +23,7 @@ namespace Bailun.DC.DailyPlatformReceivable ...@@ -23,7 +23,7 @@ namespace Bailun.DC.DailyPlatformReceivable
// var _services = new Services(); // var _services = new Services();
// var start = DateTime.Parse("2020-04-01"); // var start = DateTime.Parse("2020-01-01");
// while (start.AddDays(1) < DateTime.Now) // while (start.AddDays(1) < DateTime.Now)
// { // {
// Console.WriteLine(start); // Console.WriteLine(start);
......
...@@ -152,9 +152,9 @@ namespace Bailun.DC.DailyPlatformReceivable ...@@ -152,9 +152,9 @@ namespace Bailun.DC.DailyPlatformReceivable
var listRefund = cn.Query<platformamount>(sql); var listRefund = cn.Query<platformamount>(sql);
//提现金额 //提现金额
sql = $@"select sum(t1.other_to_cny_money) amount,t2.english_name as platform_type from dc_base_finance_cashierdetail t1 sql = $@"select sum(t1.exchange_money*other_to_cny_exchange_rate) amount,t2.english_name as platform_type from dc_base_finance_cashierdetail t1
join dc_base_finance_salesplatform t2 on t1.salesl_platform=t2.platform_id and t2.platform_id!=100 join dc_base_finance_salesplatform t2 on t1.salesl_platform=t2.platform_id and t2.platform_id!=100
where t1.status=2 and daozhang_time>='{day.ToString("yyyy-MM-dd")}' and daozhang_time<'{day.AddDays(1).ToString("yyyy-MM-dd")}' group by salesl_platform"; where createTime>='{day.ToString("yyyy-MM-dd")}' and createTime<'{day.AddDays(1).ToString("yyyy-MM-dd")}' group by salesl_platform";
var listIncome = cn.Query<platformamount>(sql); var listIncome = cn.Query<platformamount>(sql);
var listM = new List<dc_daily_receivable>() { m_ebay }; var listM = new List<dc_daily_receivable>() { m_ebay };
......
...@@ -119,10 +119,14 @@ ...@@ -119,10 +119,14 @@
{ field: 'amount_start', title: '期初应收余额', width: '130', iscount: true }, { field: 'amount_start', title: '期初应收余额', width: '130', iscount: true },
{ field: 'amount_sale_shipping', title: '本期销售收入', width: '130', iscount: true }, { field: 'amount_sale_shipping', title: '本期销售收入', width: '130', iscount: true },
{ field: 'amount_platformfee', title: '平台扣费', width: '110', iscount: true }, { field: 'amount_platformfee', title: '平台扣费', width: '110', iscount: true },
//{
// field: 'amount_incoming', title: '放款金额', width: '110', iscount: true, formatter: function (idx, data) {
// return '<span>' + data.amount_incoming + '</span><a style="margin-left:3px;" href="javascript:;" onclick="showmodel(' + data.id + ',\'' + data.day + '\',\'' + data.platform + '\',\'' + data.amount_incoming + '\',2);">编辑</a>';
// }
//},
{ {
field: 'amount_incoming', title: '放款金额', width: '110', iscount: true, formatter: function (idx, data) { field: 'amount_incoming', title: '放款金额', width: '110', iscount: true
return '<span>' + data.amount_incoming + '</span><a style="margin-left:3px;" href="javascript:;" onclick="showmodel(' + data.id + ',\'' + data.day + '\',\'' + data.platform + '\',\'' + data.amount_incoming + '\',2);">编辑</a>';
}
}, },
{ field: 'amount_refund', title: '退款(已发货)', width: '130', iscount: true }, { field: 'amount_refund', title: '退款(已发货)', width: '130', iscount: true },
......
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