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
db6b650c
Commit
db6b650c
authored
Nov 04, 2019
by
shajiaiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复已知问题
parent
f3648d20
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
IssueCoinController.php
api/controllers/IssueCoinController.php
+1
-1
IssueChainTransferController.php
console/controllers/IssueChainTransferController.php
+7
-7
No files found.
api/controllers/IssueCoinController.php
View file @
db6b650c
...
...
@@ -192,7 +192,7 @@ class IssueCoinController extends BaseController
$params
=
[
'pre_create_tx'
=>
$pre_create_tx
,
'pre_send_transaction'
=>
$pre_send_transaction
,
'pre_query_transaction'
=>
's
tandby
'
,
'pre_query_transaction'
=>
's
uccess
'
,
'finish_tx'
=>
'standby'
,
'finish_send_transaction'
=>
'standby'
,
'finish_query_transaction'
=>
'standby'
,
...
...
console/controllers/IssueChainTransferController.php
View file @
db6b650c
...
...
@@ -82,8 +82,8 @@ class IssueChainTransferController extends Controller
}
$txHex
=
$result
[
'result'
];
$privkey
=
'72c3879f1f9b523f266a9545b69bd41c0251483a93e21e348e85118afe17a5e21'
;
#
$privkey = $val->coin->chain->private_key;
#
$privkey = '72c3879f1f9b523f266a9545b69bd41c0251483a93e21e348e85118afe17a5e21';
$privkey
=
$val
->
coin
->
chain
->
private_key
;
$expire
=
'1m'
;
//执行1.2签名
$signRawTx
=
$chain_service
->
signRawTx
(
$privkey
,
$txHex
,
$expire
);
...
...
@@ -128,11 +128,11 @@ class IssueChainTransferController extends Controller
public
function
actionQueryTransaction
(
$step
)
{
if
(
1
==
$step
)
{
$model
=
CoinIssueChainRecord
::
find
()
->
where
([
'
<>'
,
'pre_send_transaction'
,
'standby'
])
->
all
();
$model
=
CoinIssueChainRecord
::
find
()
->
where
([
'
pre_query_transaction'
=>
'standby'
])
->
all
();
}
if
(
2
==
$step
)
{
$model
=
CoinIssueChainRecord
::
find
()
->
where
([
'pre_
send
_transaction'
=>
'success'
])
->
andWhere
([
'<>'
,
'finish_send_transaction'
,
'standby'
])
->
all
();
$model
=
CoinIssueChainRecord
::
find
()
->
where
([
'pre_
query
_transaction'
=>
'success'
])
->
andWhere
([
'<>'
,
'finish_send_transaction'
,
'standby'
])
->
all
();
}
if
(
false
==
$model
)
{
...
...
@@ -140,7 +140,7 @@ class IssueChainTransferController extends Controller
return
0
;
}
$node
=
\Yii
::
$app
->
params
[
'chain_parallel'
][
'primary
'
];
$node
=
Yii
::
$app
->
params
[
'chain_nodes'
][
'STO
'
];
$service
=
new
Chain33Service
(
$node
);
foreach
(
$model
as
$val
)
{
if
(
1
==
$step
)
{
...
...
@@ -167,7 +167,7 @@ class IssueChainTransferController extends Controller
foreach
(
$result
[
'result'
][
'receipt'
][
'logs'
]
as
$log
)
{
if
(
isset
(
$log
[
'tyName'
])
&&
'LogErr'
==
$log
[
'tyName'
])
{
$data
=
[
'finish_query_transaction'
=>
$log
[
'
tyName
'
]
'finish_query_transaction'
=>
$log
[
'
log
'
]
];
break
;
}
...
...
@@ -192,7 +192,7 @@ class IssueChainTransferController extends Controller
]);
}
//查询后,交易成功
if
(
$status
=
CoinIssueCoin
::
SUCCESS_ISSUE
)
{
if
(
$status
=
=
CoinIssueCoin
::
SUCCESS_ISSUE
)
{
CoinIssueCoin
::
updateAll
([
'status'
=>
$status
,
'charge_pay'
=>
CoinIssueCoin
::
SUCCESS_PAY
],
[
'id'
=>
$val
->
coin
->
id
,
]);
...
...
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