Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zhichan
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
蒋勇
zhichan
Commits
c3bfb3f7
Commit
c3bfb3f7
authored
Jul 07, 2020
by
zhaoxiqing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gsn
parent
42544b26
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
3 deletions
+19
-3
esign-admin/app/base/controller/impl/merchant/merchanttradeCtl.js
+19
-3
No files found.
esign-admin/app/base/controller/impl/merchant/merchanttradeCtl.js
View file @
c3bfb3f7
...
@@ -14,7 +14,14 @@ class MerchantUserCtl extends CtlBase {
...
@@ -14,7 +14,14 @@ class MerchantUserCtl extends CtlBase {
async
merchanttradesOfList
(
params
,
pobj2
,
req
)
{
async
merchanttradesOfList
(
params
,
pobj2
,
req
)
{
try
{
try
{
return
await
this
.
merchanttradeSve
.
merchanttradesOfList
(
params
);
let
resule
=
await
this
.
merchanttradeSve
.
merchanttradesOfList
(
params
);
if
(
resule
.
data
.
rows
){
for
(
let
item
of
resule
.
data
.
rows
){
item
.
amount
=
(
item
.
amount
/
100
).
toFixed
(
2
)
}
}
return
resule
;
}
catch
(
error
)
{
}
catch
(
error
)
{
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
}
}
...
@@ -23,6 +30,9 @@ class MerchantUserCtl extends CtlBase {
...
@@ -23,6 +30,9 @@ class MerchantUserCtl extends CtlBase {
//调账添加
//调账添加
async
addMerchanttrades
(
params
,
pobj2
,
req
)
{
async
addMerchanttrades
(
params
,
pobj2
,
req
)
{
try
{
try
{
if
(
params
.
amount
){
params
.
amount
*
100
;
}
return
await
this
.
merchanttradeSve
.
addMerchanttrades
(
params
);
return
await
this
.
merchanttradeSve
.
addMerchanttrades
(
params
);
}
catch
(
error
)
{
}
catch
(
error
)
{
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
...
@@ -32,7 +42,6 @@ class MerchantUserCtl extends CtlBase {
...
@@ -32,7 +42,6 @@ class MerchantUserCtl extends CtlBase {
//充值审核
//充值审核
async
auditMerchanttrade
(
params
,
pobj2
,
req
)
{
async
auditMerchanttrade
(
params
,
pobj2
,
req
)
{
try
{
try
{
params
.
audit_user_id
=
req
.
loginUser
.
id
;
return
await
this
.
merchanttradeSve
.
auditMerchanttrade
(
params
);
return
await
this
.
merchanttradeSve
.
auditMerchanttrade
(
params
);
}
catch
(
error
)
{
}
catch
(
error
)
{
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
...
@@ -42,7 +51,14 @@ class MerchantUserCtl extends CtlBase {
...
@@ -42,7 +51,14 @@ class MerchantUserCtl extends CtlBase {
//资金流水
//资金流水
async
merchanttradesOfListAll
(
params
,
pobj2
,
req
)
{
async
merchanttradesOfListAll
(
params
,
pobj2
,
req
)
{
try
{
try
{
return
await
this
.
merchanttradeSve
.
merchanttradesOfListAll
(
params
);
let
result
=
await
this
.
merchanttradeSve
.
merchanttradesOfListAll
(
params
);
if
(
result
.
data
.
rows
){
for
(
let
item
of
result
.
data
.
rows
){
item
.
balance_amount
=
(
item
.
balance_amount
/
100
).
toFixed
(
2
);
item
.
available_amount
=
(
item
.
available_amount
/
100
).
toFixed
(
2
)
}
}
return
result
;
}
catch
(
error
)
{
}
catch
(
error
)
{
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
}
}
...
...
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