Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
token
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
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
wallet
token
Commits
b75921b9
Commit
b75921b9
authored
Jan 10, 2020
by
shajiaiming
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/issue_coin' into develop
parents
6afbbba0
b8b94f03
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
IssueCoinController.php
api/controllers/IssueCoinController.php
+2
-1
CoinIssueCoin.php
common/models/psources/CoinIssueCoin.php
+3
-2
No files found.
api/controllers/IssueCoinController.php
View file @
b75921b9
...
@@ -257,7 +257,8 @@ class IssueCoinController extends BaseController
...
@@ -257,7 +257,8 @@ class IssueCoinController extends BaseController
$data
->
total
=
(
int
)
$data
->
total
*
1e4
;
$data
->
total
=
(
int
)
$data
->
total
*
1e4
;
$data
->
chain_name
=
$data
->
chain
->
platform
;
$data
->
chain_name
=
$data
->
chain
->
platform
;
$data
->
issue_charge
=
rtrim
(
sprintf
(
'%.3f'
,
floatval
(
$data
->
charge
)),
'0'
);
$data
->
issue_charge
=
rtrim
(
sprintf
(
'%.3f'
,
floatval
(
$data
->
charge
)),
'0'
);
$data
->
template
=
isset
(
$data
->
templated
->
template
)
?
$data
->
templated
->
template
:
[];
$data
->
template
=
isset
(
$data
->
templated
->
template
)
?
$data
->
templated
->
template
:
null
;
$data
->
origin
=
isset
(
$data
->
templated
->
origin
)
?
$data
->
templated
->
origin
:
null
;
$code
=
0
;
$code
=
0
;
$msg
=
'success'
;
$msg
=
'success'
;
if
(
CoinIssueCoin
::
STATUS_FAILED
==
$data
->
status
)
{
if
(
CoinIssueCoin
::
STATUS_FAILED
==
$data
->
status
)
{
...
...
common/models/psources/CoinIssueCoin.php
View file @
b75921b9
...
@@ -184,7 +184,7 @@ class CoinIssueCoin extends CommonActiveRecord
...
@@ -184,7 +184,7 @@ class CoinIssueCoin extends CommonActiveRecord
public
function
attributes
()
public
function
attributes
()
{
{
return
array_merge
(
parent
::
attributes
(),
[
'issue_charge'
,
'url'
,
'chain_name'
,
'template'
]);
return
array_merge
(
parent
::
attributes
(),
[
'issue_charge'
,
'url'
,
'chain_name'
,
'template'
,
'origin'
]);
}
}
public
function
getChain
()
public
function
getChain
()
...
@@ -209,6 +209,6 @@ class CoinIssueCoin extends CommonActiveRecord
...
@@ -209,6 +209,6 @@ class CoinIssueCoin extends CommonActiveRecord
public
function
getTemplated
()
public
function
getTemplated
()
{
{
return
$this
->
hasOne
(
CoinIssueAttachment
::
className
(),
[
'issue_coin_id'
=>
'id'
])
->
select
(
'template'
);
return
$this
->
hasOne
(
CoinIssueAttachment
::
className
(),
[
'issue_coin_id'
=>
'id'
])
->
select
(
'template
, origin
'
);
}
}
}
}
\ No newline at end of file
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