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
6fab3c78
Commit
6fab3c78
authored
Jan 03, 2020
by
shajiaiming
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/optimize' into 'master'
Feature/optimize See merge request
!260
parents
dbc900ff
81e43609
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
3 deletions
+10
-3
NoticeController.php
api/controllers/NoticeController.php
+1
-1
IssueChainTransferController.php
console/controllers/IssueChainTransferController.php
+9
-2
No files found.
api/controllers/NoticeController.php
View file @
6fab3c78
...
@@ -50,7 +50,7 @@ class NoticeController extends BaseController
...
@@ -50,7 +50,7 @@ class NoticeController extends BaseController
if
(
false
!=
$type
)
{
if
(
false
!=
$type
)
{
$query
->
andWhere
([
'type'
=>
(
int
)
$type
]);
$query
->
andWhere
([
'type'
=>
(
int
)
$type
]);
if
(
Notice
::
T
OP_TRUE
==
(
int
)
$type
)
{
if
(
Notice
::
T
YPE_POP
==
(
int
)
$type
)
{
$size
=
1
;
$size
=
1
;
}
}
}
}
...
...
console/controllers/IssueChainTransferController.php
View file @
6fab3c78
...
@@ -241,6 +241,13 @@ class IssueChainTransferController extends Controller
...
@@ -241,6 +241,13 @@ class IssueChainTransferController extends Controller
]);
]);
}
}
if
(
1
!=
$val
->
coin
->
platform_id
)
{
$platform_ids
=
explode
(
','
,
$val
->
coin
->
platform_id
);
$platform_ids
=
implode
(
','
,
array_unique
(
array_merge
([
1
],
$platform_ids
)));
}
else
{
$platform_ids
=
1
;
}
//1.1查询后,交易成功
//1.1查询后,交易成功
if
(
1
==
$step
)
{
if
(
1
==
$step
)
{
CoinIssueCoin
::
updateAll
([
'status'
=>
$status
],
[
CoinIssueCoin
::
updateAll
([
'status'
=>
$status
],
[
...
@@ -255,7 +262,7 @@ class IssueChainTransferController extends Controller
...
@@ -255,7 +262,7 @@ class IssueChainTransferController extends Controller
'price'
=>
isset
(
$val
->
coin
->
platform
->
issue_charge
)
?
(
int
)
$val
->
coin
->
platform
->
issue_charge
:
0
,
'price'
=>
isset
(
$val
->
coin
->
platform
->
issue_charge
)
?
(
int
)
$val
->
coin
->
platform
->
issue_charge
:
0
,
'category'
=>
(
int
)
$val
->
coin
->
category
,
'category'
=>
(
int
)
$val
->
coin
->
category
,
'owner'
=>
$val
->
coin
->
owner
,
'owner'
=>
$val
->
coin
->
owner
,
'platform_id'
=>
$
val
->
coin
->
platform_id
,
'platform_id'
=>
$
platform_ids
,
'platform'
=>
$val
->
coin
->
chain
->
platform
'platform'
=>
$val
->
coin
->
chain
->
platform
];
];
$this
->
syncCoin
(
$params
);
$this
->
syncCoin
(
$params
);
...
@@ -276,7 +283,7 @@ class IssueChainTransferController extends Controller
...
@@ -276,7 +283,7 @@ class IssueChainTransferController extends Controller
'price'
=>
isset
(
$val
->
coin
->
platform
->
issue_charge
)
?
(
int
)
$val
->
coin
->
platform
->
issue_charge
:
0
,
'price'
=>
isset
(
$val
->
coin
->
platform
->
issue_charge
)
?
(
int
)
$val
->
coin
->
platform
->
issue_charge
:
0
,
'category'
=>
(
int
)
$val
->
coin
->
category
,
'category'
=>
(
int
)
$val
->
coin
->
category
,
'owner'
=>
$val
->
coin
->
owner
,
'owner'
=>
$val
->
coin
->
owner
,
'platform_id'
=>
$
val
->
coin
->
platform_id
,
'platform_id'
=>
$
platform_ids
,
'platform'
=>
$val
->
coin
->
chain
->
platform
'platform'
=>
$val
->
coin
->
chain
->
platform
];
];
$this
->
syncCoin
(
$params
);
$this
->
syncCoin
(
$params
);
...
...
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