Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
smartcontracts
transactionCC
Commits
bae59f2d
Commit
bae59f2d
authored
4 years ago
by
a.gribushka
Browse files
Options
Download
Email Patches
Plain Diff
fix отображения коммиссий у пользователя SYSTE_COMMISSION_USER
parent
5cf8626c
develop
feature/board-offer-662
feature/commission-720
feature/cryp-708
master
revert-099620a0
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
mngr/lockOutFundsOnAccount.go
+3
-9
mngr/lockOutFundsOnAccount.go
with
3 additions
and
9 deletions
+3
-9
mngr/lockOutFundsOnAccount.go
View file @
bae59f2d
...
...
@@ -281,7 +281,7 @@ func (this *TransactionManagerImpl) lockOutCommission(lockCommissionAmountAccoun
UserAccountInfo
:
from
,
Amount
:
commissionAmount
.
Plain
(),
OperationID
:
txnArgs
.
OperationID
,
OperationType
:
transactionCC
.
Lock
Commission
,
OperationType
:
transactionCC
.
Transfer
Commission
ToSystem
,
ProcessType
:
txnArgs
.
ProcessType
,
Timestamp
:
transactionCC
.
Timestamp
(
this
.
GetTime
()),
InOutType
:
transactionCC
.
OUTPUT
,
...
...
@@ -291,19 +291,13 @@ func (this *TransactionManagerImpl) lockOutCommission(lockCommissionAmountAccoun
// The reciprocal commission lock record
inTransactionRecord
:=
&
transactionCC
.
TransactionRecord
{
UserAccountInfo
:
&
accountCC
.
UserAccountInfo
{
// Keep default values for time being, has to be replaced with
// call to system chaincode to obtain system user and account information
UserID
:
system_user
.
LOCK_COMMISSION_USER
,
TxnAccountInfo
:
lockCommissionAmountAccountInfo
,
},
UserAccountInfo
:
to
,
Amount
:
commissionAmount
.
Plain
(),
OperationID
:
txnArgs
.
OperationID
,
OperationType
:
transactionCC
.
Lock
Commission
,
OperationType
:
transactionCC
.
Transfer
Commission
ToSystem
,
ProcessType
:
txnArgs
.
ProcessType
,
Timestamp
:
transactionCC
.
Timestamp
(
this
.
GetTime
()),
InOutType
:
transactionCC
.
INPUT
,
DestinationUserAccountInfo
:
SYSTEM_COMMISSION_USER_AccountInfo
.
ToUserAccountInfo
(),
FromUserAccountInfo
:
from
,
ToUserAccountInfo
:
to
,
}
...
...
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
Menu
Projects
Groups
Snippets
Help