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
1adc57b4
Commit
1adc57b4
authored
5 years ago
by
shajiaiming
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/ticker' into 'master'
fix See merge request
!201
parents
0e30f6c8
b0fdad79
master
develop
No related merge requests found
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
TickerController.php
api/controllers/TickerController.php
+3
-3
No files found.
api/controllers/TickerController.php
View file @
1adc57b4
...
...
@@ -103,7 +103,7 @@ class TickerController extends BaseController
$msg
=
'参数错误'
;
goto
doEnd
;
}
$model
=
CoinOptional
::
find
()
->
where
([
'device_code'
=>
$device_code
,
'symbol'
=>
$symbol
,
'platform_id'
=>
(
int
)
$platform_id
])
->
one
();
$model
=
CoinOptional
::
find
()
->
where
([
'device_code'
=>
$device_code
,
'symbol'
=>
$symbol
,
'platform
'
=>
$platform
,
'platform
_id'
=>
(
int
)
$platform_id
])
->
one
();
if
(
$model
)
{
$msg
=
'数据已存在!'
;
goto
doEnd
;
...
...
@@ -164,7 +164,7 @@ class TickerController extends BaseController
$exchange
=
'Binance'
;
}
else
if
(
'zhaobi'
==
$val
[
'platform'
])
{
$exchange
=
'Zhaobi'
;
}
else
if
(
'bitnasdaq'
==
strtolower
(
$val
[
'platform'
])){
}
else
if
(
'bitnasdaq'
==
strtolower
(
$val
[
'platform'
]))
{
$exchange
=
'Bitnasdaq'
;
}
else
{
...
...
@@ -173,7 +173,7 @@ class TickerController extends BaseController
$symbol
=
explode
(
'/'
,
$val
[
'symbol'
]);
$tag_first
=
$currency
=
$symbol
[
0
];
$tag_second
=
$symbol
[
1
];
if
(
'BCH'
==
strtoupper
(
$tag_first
)){
if
(
'BCH'
==
strtoupper
(
$tag_first
))
{
$tag_first
=
'BCC'
;
}
$exchange
=
ExchangeFactory
::
createExchange
(
$exchange
);
...
...
This diff is collapsed.
Click to expand it.
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