Skip to content

D
DataCenter_Core2.1_20190520
Commit 2ca47cbe by guanzhenshan
Options

更新平台余额展示

parent df09ee8b
Showing with 125 additions and 52 deletions
Bailun.DC.Services/FinanceReportServices.cs
......@@ -1050,16 +1050,41 @@ namespace Bailun.DC.Services
/// <param name="sort"></param>
/// <param name="total"></param>
/// <returns></returns>
public List<dc_platform_balance> ListCount(DateTime day, string platformcode, int page, int pagesize, string order, string sort, ref int total)
public List<dc_platform_balance> ListCount(DateTime day, string platformname, int page, int pagesize, string order, string sort, ref int total)
{
var sql = "select id,platformcode,platformname,day,count(id) as account,currency,sum(amount) as amount,sum(userable_amount) as userable_amount,sum(freeze_amount) as freeze_amount,exchangerate,sum(amount_rmb) as amount_rmb,sum(userable_amount_rmb) as userable_amount_rmb,sum(freeze_amount_rmb) as freeze_amount_rmb,puttime from dc_platform_balance where delstatus=0 and day='" + day.ToString("yyyy-MM-dd") + "' ";
//var sql = "select id,platformcode,platformname,day,count(id) as account,currency,sum(amount) as amount,sum(userable_amount) as userable_amount,sum(freeze_amount) as freeze_amount,exchangerate,sum(amount_rmb) as amount_rmb,sum(userable_amount_rmb) as userable_amount_rmb,sum(freeze_amount_rmb) as freeze_amount_rmb,puttime from dc_platform_balance where delstatus=0 and day='" + day.ToString("yyyy-MM-dd") + "' ";
if (!string.IsNullOrWhiteSpace(platformcode))
//if (!string.IsNullOrWhiteSpace(platformcode))
//{
// sql += " and platformcode='" + platformcode + "' ";
//}
//sql += " group by platformcode,currency,puttime";
//if (!string.IsNullOrWhiteSpace(order))
//{
// sql += " order by " + order;
// if (!string.IsNullOrWhiteSpace(sort))
// {
// sql += " " + sort;
// }
//}
var sql = "select platform_name as platformname,platform_name as platformcode,count(id) as account,currency,sum(totalamount) as amount,sum(availableamount) as userable_amount,sum(frozenmoney) as freeze_amount,currencyrate as exchangerate,sum(totalamount_rmb) as amount_rmb,sum(availableamount_rmb) as userable_amount_rmb,sum(frozenmoney_rmb) as freeze_amount_rmb,day from dc_daily_platform_account_balance where day='" + day.ToString("yyyy-MM-dd") + "' ";
var sqlparam = new DynamicParameters();
if (!string.IsNullOrEmpty(platformname))
{
sql += " and platformcode='" + platformcode + "' ";
sql += " and platform_name=@platformname ";
sqlparam.Add("platformname", platformname);
}
sql += " group by platformcode,currency,puttime";
sql += " group by platform_name,currency,day";
string countsql = sql;
sql += " limit " + (page - 1) * pagesize + "," + pagesize;
if (!string.IsNullOrWhiteSpace(order))
{
......@@ -1072,10 +1097,6 @@ namespace Bailun.DC.Services
}
string countsql = sql;
sql += " limit " + (page - 1) * pagesize + "," + pagesize;
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
{
if (cn.State == System.Data.ConnectionState.Closed)
......@@ -1083,9 +1104,9 @@ namespace Bailun.DC.Services
cn.Open();
}
var list = cn.Query<dc_platform_balance>(sql).AsList();
var list = cn.Query<dc_platform_balance>(sql,sqlparam).AsList();
total = cn.ExecuteScalar<int>("select count(1) from (" + countsql + ") as tb");
total = cn.ExecuteScalar<int>("select count(1) from (" + countsql + ") as tb",sqlparam);
return list;
}
......@@ -1095,13 +1116,13 @@ namespace Bailun.DC.Services
/// 获取平台账号余额汇总 统计
/// </summary>
/// <returns></returns>
public dc_platform_balance ListCounts(DateTime day, string platformcode)
public dc_platform_balance ListCounts(DateTime day, string platformname)
{
var sql = "select count(id) as account,currency,sum(amount) as amount,sum(userable_amount) as userable_amount,sum(freeze_amount) as freeze_amount,exchangerate,sum(amount_rmb) as amount_rmb,sum(userable_amount_rmb) as userable_amount_rmb,sum(freeze_amount_rmb) as freeze_amount_rmb from dc_platform_balance where delstatus=0 and day='" + day.ToString("yyyy-MM-dd") + "' ";
var sql = "select count(id) as account,currency,sum(totalamount) as amount,sum(availableamount) as userable_amount,sum(frozenmoney) as freeze_amount,currencyrate as exchangerate,sum(totalamount_rmb) as amount_rmb,sum(availableamount_rmb) as userable_amount_rmb,sum(frozenmoney_rmb) as freeze_amount_rmb from dc_daily_platform_account_balance where day='" + day.ToString("yyyy-MM-dd") + "' ";
if (!string.IsNullOrWhiteSpace(platformcode))
if (!string.IsNullOrWhiteSpace(platformname))
{
sql += " and platformcode='" + platformcode + "' ";
sql += " and platform_name='" + platformname + "' ";
}
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
......@@ -1128,16 +1149,22 @@ namespace Bailun.DC.Services
/// <param name="sort"></param>
/// <param name="total"></param>
/// <returns></returns>
public List<dc_platform_balance> List(DateTime day, string platformcode, int page, int pagesize, string order, string sort, ref int total)
public List<dc_platform_balance> List(DateTime day, string platformname,string currency, int page, int pagesize, string order, string sort, ref int total)
{
var sql = "select * from dc_platform_balance where delstatus=0 and day='" + day.ToString("yyyy-MM-dd") + "'";
string countsql = "select count(id) from dc_platform_balance where delstatus=0 and day='" + day + "'";
var sql = "select t1.id,t1.day,t1.account,t1.platform_name as platformcode,t1.platform_name as platformname,t1.currency,t1.currencyrate as exchangerate,t1.availableamount as userable_amount,t1.availableamount_rmb as userable_amount_rmb,t1.frozenmoney as freeze_amount,t1.frozenmoney_rmb as freeze_amount_rmb,t1.totalamount as amount,t1.totalamount_rmb as amount_rmb,t1.day as puttime from dc_daily_platform_account_balance t1 where t1.day='" + day.ToString("yyyy-MM-dd") + "'";
string countsql = "select count(id) from dc_daily_platform_account_balance where day='" + day + "'";
if (!string.IsNullOrEmpty(platformcode))
if (!string.IsNullOrEmpty(platformname))
{
sql += " and platformcode='" + platformcode + "'";
countsql += " and platformcode='" + platformcode + "'";
sql += " and platform_name='" + platformname + "'";
countsql += " and platform_name='" + platformname + "'";
}
if (!string.IsNullOrEmpty(currency))
{
sql += " and currency='" + currency + "'";
countsql += " and currency='" + currency + "'";
}
if (!string.IsNullOrWhiteSpace(order))
......@@ -1168,6 +1195,25 @@ namespace Bailun.DC.Services
}
}
/// <summary>
/// 获取
/// </summary>
/// <returns></returns>
public List<string> ListAccountBalancePlatform()
{
var sql = $@"select platform_name from dc_daily_platform_account_balance group by platform_name";
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
{
if (cn.State == ConnectionState.Closed)
{
cn.Open();
}
return cn.Query<string>(sql).ToList();
}
}
/// <summary>
......
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
......@@ -4015,6 +4015,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
public ActionResult ListAccoutBalanceCount()
{
ViewBag.listplatform = new Services.FinanceReportServices().ListAccountBalancePlatform();
return View();
}
......@@ -4023,15 +4025,15 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// </summary>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
public string ListAccoutBalanceCountJson(BtTableParameter request, DateTime day, string platformcode)
public string ListAccoutBalanceCountJson(BtTableParameter request, DateTime day, string platformname)
{
var user = HttpContextHelper.Current?.User;
var services = new Services.FinanceReportServices();
var total = 0;
var list = services.ListCount(day, platformcode, request.pageIndex, request.limit, request.sort, request.order, ref total);
var list = services.ListCount(day, platformname, request.pageIndex, request.limit, request.sort, request.order, ref total);
var countM = services.ListCounts(day, platformcode);
var countM = services.ListCounts(day, platformname);
countM.platformname = "总计：";
countM.amount = Math.Round(countM.amount, 2, MidpointRounding.AwayFromZero);
......@@ -4061,7 +4063,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
p.freeze_amount_rmb,
p.platformcode,
p.platformname,
puttime = p.puttime.ToString("yyyy-MM-dd")
puttime = p.day.ToString("yyyy-MM-dd")
});
return JsonConvert.SerializeObject(new {
......@@ -4274,6 +4276,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <returns></returns>
public ActionResult ListAccountBalance()
{
ViewBag.listplatform = new Services.FinanceReportServices().ListAccountBalancePlatform();
return View();
}
......@@ -4284,11 +4287,11 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="day"></param>
/// <param name="code"></param>
/// <returns></returns>
public string ListAccountBalanceJson(BtTableParameter request, DateTime day, string code)
public string ListAccountBalanceJson(BtTableParameter request, DateTime day, string platformname,string currency)
{
var services = new Services.FinanceReportServices();
var total = 0;
var list = services.List(day, code, request.pageIndex, request.limit, request.sort, request.order, ref total);
var list = services.List(day, platformname,currency, request.pageIndex, request.limit, request.sort, request.order, ref total);
//pagination.records = total;
//pagination.total = total / pagination.rows + (total % pagination.rows > 0 ? 1 : 0);
......
Bailun.DC.Web/Areas/Reports/Views/Finance/ListAccountBalance.cshtml
......@@ -11,8 +11,18 @@
<div class="form-inline" style="line-height:40px;">
<div class="form-group">
<label>平台：</label>
<select id="code" name="code" class="form-control" style="width: 120px;">
<select id="platformname" name="platformname" class="form-control" style="width: 120px;">
<option value="">选择平台</option>
@foreach (var item in ViewBag.listplatform)
{
<option value="@item">@item</option>
}
</select>
</div>
<div class="form-group">
<label>&nbsp;</label>
<select id="currency" name="currency" class="form-control" style="width:120px;">
<option value=""></option>
</select>
</div>
<div class="form-group">
......@@ -50,22 +60,32 @@
$('#day').val(day);
}
var code = getUrlParam('code');
if (code != '') {
$('#code').val(code);
if ($('#code').val() == null) {
$('#code').append('<option value="' + code + '">' + code + '</option>');
$('#code').val(code);
var platformname = unescape(getUrlParam('n'));
if (platformname != '') {
$('#platformname').val(platformname);
if ($('#platformname').val() == null) {
$('#platformname').append('<option value="' + platformname + '">' + platformname + '</option>');
$('#platformname').val(platformname);
}
}
var currency = getUrlParam('currency');
if (currency != null) {
$('#currency').val(currency);
if ($('#currency').val() == null) {
$('#currency').append('<option value="' + currency + '">' + currency + '</option>');
$('#currency').val(currency);
}
}
laydate.render({ elem: '#day' });
var height = document.body.clientHeight;
$("#roletable").attr("data-height", (height - 150));
list();
listplatform();
//listplatform();
})
function list() {
......@@ -104,17 +124,17 @@
// }
//},
//{ field: 'saleday', title: '初始额统计日期', width: '140', sortable: true },
{
field: 'option', title: '操作', width: '140px', formatter: function (idx, data) {
var s = '';
if (data.fromsource == 'oms') {
s += '<button class="btn btn-success btn-xs" onclick="SaveDetail(\'' + data.id + '\');">保存</button>';
}
//{
// field: 'option', title: '操作', width: '140px', formatter: function (idx, data) {
// var s = '';
// if (data.fromsource == 'oms') {
// s += '<button class="btn btn-success btn-xs" onclick="SaveDetail(\'' + data.id + '\');">保存</button>';
// }
s+='<button class="btn btn-danger btn-xs" onclick="DelDetail(\'' + data.id + '\');">删除</button>';
return s;
}
}
// s+='<button class="btn btn-danger btn-xs" onclick="DelDetail(\'' + data.id + '\');">删除</button>';
// return s;
// }
//}
];
var url = '@Url.Content("~/Reports/Finance/ListAccountBalanceJson")' + '?' + $("#toolbar").serialize();
......
Bailun.DC.Web/Areas/Reports/Views/Finance/ListAccoutBalanceCount.cshtml
......@@ -11,8 +11,12 @@
<div class="form-inline" style="line-height:40px;">
<div class="form-group">
<label>平台：</label>
<select id="platformcode" name="platformcode" class="form-control" style="width: 120px;">
<select id="platformname" name="platformname" class="form-control" style="width: 120px;">
<option value="">选择平台</option>
@foreach (var item in ViewBag.listplatform)
{
<option value="@item">@item</option>
}
</select>
</div>
<div class="form-group">
......@@ -21,8 +25,8 @@
</div>
<div class="form-group">
<button type="button" class="btn btn-primary" onclick="list();"><i class="fa fa-search"></i>&nbsp;查询</button>
<button id="btn_Upload" class="btn btn-success">导入</button>
<a id="btn_UpdateTemplate" class="btn btn-default" href="@Url.Content("~/templatefile/accountTemplate2.xls")" target="_blank">下载导入模版</a>
@*<button id="btn_Upload" class="btn btn-success">导入</button>
<a id="btn_UpdateTemplate" class="btn btn-default" href="@Url.Content("~/templatefile/accountTemplate2.xls")" target="_blank">下载导入模版</a>*@
</div>
</div>
</form>
......@@ -68,7 +72,7 @@
list();
listplatform();
//listplatform();
})
function list() {
......@@ -87,7 +91,7 @@
{ field: 'freeze_amount_rmb', title: '冻结余额(人民币)', width: '140', sortable: true, iscount: true },
{
field: 'option', title: '操作',width:'120px', formatter: function (idx, data) {
var s = '<button class="btn btn-xs btn-primary" onclick="ShowDetail(\'' + data.platformcode + '\',\'' + data.platformname + '\',\'' + data.day + '\');">查看明细</button>';
var s = '<button class="btn btn-xs btn-primary" onclick="ShowDetail(\'' + data.platformcode + '\',\'' + data.platformname + '\',\'' + data.day + '\',\'' + data.currency+'\');">查看明细</button>';
return s;
}
}
......@@ -162,8 +166,8 @@
}
function ShowDetail(code, name, day) {
showdetail(name + '的平台账号余额明细', '@Url.Content("~/Reports/Finance/ListAccountBalance?code=")' + code + '&day=' + day + '&n=' + name);
function ShowDetail(code, name, day, currency) {
showdetail(name + '的平台账号余额明细', '@Url.Content("~/Reports/Finance/ListAccountBalance?")' + 'day=' + day + '&n=' + escape(name) + '&currency=' + currency);
}
function listplatform() {
......
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