Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
DataCenter_Core2.1_20190520
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bltdc
DataCenter_Core2.1_20190520
Commits
77f1e523
Commit
77f1e523
authored
Nov 21, 2019
by
guanzhenshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加帐号余额创建人信息
parent
f17b000f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
46 additions
and
15 deletions
+46
-15
dc_platform_balance.cs
Bailun.DC.Models/dc_platform_balance.cs
+14
-0
FinanceController.cs
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
+17
-2
ListAccoutBalanceCount.cshtml
...Areas/Reports/Views/Finance/ListAccoutBalanceCount.cshtml
+15
-13
No files found.
Bailun.DC.Models/dc_platform_balance.cs
View file @
77f1e523
...
@@ -120,5 +120,19 @@ namespace Bailun.DC.Models
...
@@ -120,5 +120,19 @@ namespace Bailun.DC.Models
/// </summary>
/// </summary>
public
decimal
end_balance
{
get
;
set
;
}
public
decimal
end_balance
{
get
;
set
;
}
/// <summary>
/// 创建时间
/// </summary>
public
DateTime
createtime
{
get
;
set
;
}
/// <summary>
/// 创建人id
/// </summary>
public
int
createuserid
{
get
;
set
;
}
/// <summary>
/// 创建人
/// </summary>
public
string
createusername
{
get
;
set
;
}
}
}
}
}
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
View file @
77f1e523
...
@@ -2344,8 +2344,10 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
...
@@ -2344,8 +2344,10 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// 平台账号余额管理列表数据
/// 平台账号余额管理列表数据
/// </summary>
/// </summary>
/// <returns></returns>
/// <returns></returns>
[
BailunAuthentication
(
LoginMode
.
Enforce
)]
public
string
ListAccoutBalanceCountJson
(
BtTableParameter
request
,
DateTime
day
,
string
platformcode
)
public
string
ListAccoutBalanceCountJson
(
BtTableParameter
request
,
DateTime
day
,
string
platformcode
)
{
{
var
user
=
HttpContextHelper
.
Current
?.
User
;
var
services
=
new
Services
.
FinanceReportServices
();
var
services
=
new
Services
.
FinanceReportServices
();
var
total
=
0
;
var
total
=
0
;
...
@@ -2384,14 +2386,20 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
...
@@ -2384,14 +2386,20 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
puttime
=
p
.
puttime
.
ToString
(
"yyyy-MM-dd"
)
puttime
=
p
.
puttime
.
ToString
(
"yyyy-MM-dd"
)
});
});
return
JsonConvert
.
SerializeObject
(
new
{
total
=
obj
.
Count
(),
rows
=
obj
,
count_row
=
countM
});
return
JsonConvert
.
SerializeObject
(
new
{
total
=
obj
.
Count
(),
rows
=
obj
,
count_row
=
countM
,
uid
=
user
!=
null
?
user
.
GetUid
():
0
,
username
=
user
!=
null
?
user
.
GetUserName
():
""
});
}
}
/// <summary>
/// <summary>
/// 上传平台账号余额明细
/// 上传平台账号余额明细
/// </summary>
/// </summary>
/// <returns></returns>
/// <returns></returns>
public
JsonResult
UpdateBalanceCount
()
public
JsonResult
UpdateBalanceCount
(
int
uid
,
string
username
)
{
{
if
(
Request
.
Form
.
Files
.
Count
==
0
)
if
(
Request
.
Form
.
Files
.
Count
==
0
)
{
{
...
@@ -2520,6 +2528,9 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
...
@@ -2520,6 +2528,9 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
amount_sales
=
dailysale
,
amount_sales
=
dailysale
,
withdraw_amount
=
(
m
!=
null
?
m
.
withdraw_amount
:
0
),
withdraw_amount
=
(
m
!=
null
?
m
.
withdraw_amount
:
0
),
before_balance
=
(
m
!=
null
?
m
.
before_balance
:
0
),
before_balance
=
(
m
!=
null
?
m
.
before_balance
:
0
),
createtime
=
DateTime
.
Now
,
createuserid
=
uid
,
createusername
=
username
,
});
});
}
}
...
@@ -2559,6 +2570,10 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
...
@@ -2559,6 +2570,10 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
userable_amount
=
(
m
!=
null
?
m
.
userable_amount
:
0
),
userable_amount
=
(
m
!=
null
?
m
.
userable_amount
:
0
),
userable_amount_rmb
=
(
m
!=
null
?
m
.
userable_amount_rmb
:
0
),
userable_amount_rmb
=
(
m
!=
null
?
m
.
userable_amount_rmb
:
0
),
withdraw_amount
=
withdrawamount
,
withdraw_amount
=
withdrawamount
,
createtime
=
DateTime
.
Now
,
createuserid
=
uid
,
createusername
=
username
});
});
}
}
...
...
Bailun.DC.Web/Areas/Reports/Views/Finance/ListAccoutBalanceCount.cshtml
View file @
77f1e523
...
@@ -61,19 +61,7 @@
...
@@ -61,19 +61,7 @@
var BASE_URL = '@(Url.Content("~/js/webuploader-0.1.5/"))';
var BASE_URL = '@(Url.Content("~/js/webuploader-0.1.5/"))';
var tb;
var tb;
$(document).ready(function () {
$(document).ready(function () {
uploadfile('btn_Upload',
'@Url.Content("~/Reports/Finance/UpdateBalanceCount")',
function(result){
if(result.success)
{
alert('上传成功!');
}
else
{
alert(result.msg);
}
});
laydate.render({ elem: '#day' });
laydate.render({ elem: '#day' });
var height = document.body.clientHeight;
var height = document.body.clientHeight;
$("#roletable").attr("data-height", (height - 150));
$("#roletable").attr("data-height", (height - 150));
...
@@ -123,6 +111,20 @@
...
@@ -123,6 +111,20 @@
}
}
}
}
}
}
uploadfile('btn_Upload',
'@Url.Content("~/Reports/Finance/UpdateBalanceCount")' + '?uid=' + d.uid +'&username='+d.username,
function(result){
if(result.success)
{
alert('上传成功!');
}
else
{
alert(result.msg);
}
});
}
}
});
});
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment