mirror of
https://github.com/IT4Change/gradido.git
synced 2025-12-13 07:45:54 +00:00
Merge branch 'master' into fix_corrupted_sender_balance
This commit is contained in:
commit
9b36c4db46
@ -83,7 +83,7 @@ export class AdminResolver {
|
|||||||
|
|
||||||
await pendingCreationRepository.save(updatedCreation)
|
await pendingCreationRepository.save(updatedCreation)
|
||||||
const result = new UpdatePendingCreation()
|
const result = new UpdatePendingCreation()
|
||||||
result.amount = parseInt(updatedCreation.amount.toString())
|
result.amount = parseInt(amount.toString())
|
||||||
result.memo = updatedCreation.memo
|
result.memo = updatedCreation.memo
|
||||||
result.date = updatedCreation.date
|
result.date = updatedCreation.date
|
||||||
result.moderator = updatedCreation.moderator
|
result.moderator = updatedCreation.moderator
|
||||||
@ -176,7 +176,7 @@ export class AdminResolver {
|
|||||||
} else {
|
} else {
|
||||||
newBalance = lastUserTransaction.balance
|
newBalance = lastUserTransaction.balance
|
||||||
}
|
}
|
||||||
newBalance = Number(newBalance) + Number(parseInt(pendingCreation.amount.toString()) / 10000)
|
newBalance = Number(newBalance) + Number(parseInt(pendingCreation.amount.toString()))
|
||||||
|
|
||||||
const newUserTransaction = new UserTransaction()
|
const newUserTransaction = new UserTransaction()
|
||||||
newUserTransaction.userId = pendingCreation.userId
|
newUserTransaction.userId = pendingCreation.userId
|
||||||
@ -194,7 +194,7 @@ export class AdminResolver {
|
|||||||
|
|
||||||
if (!userBalance) userBalance = balanceRepository.create()
|
if (!userBalance) userBalance = balanceRepository.create()
|
||||||
userBalance.userId = pendingCreation.userId
|
userBalance.userId = pendingCreation.userId
|
||||||
userBalance.amount = Number(newBalance * 10000)
|
userBalance.amount = Number(newBalance)
|
||||||
userBalance.modified = new Date()
|
userBalance.modified = new Date()
|
||||||
userBalance.recordDate = userBalance.recordDate ? userBalance.recordDate : new Date()
|
userBalance.recordDate = userBalance.recordDate ? userBalance.recordDate : new Date()
|
||||||
await balanceRepository.save(userBalance)
|
await balanceRepository.save(userBalance)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user