forked from Gitlink/forgeplus
after merge pr
This commit is contained in:
parent
06a6794245
commit
ba9b66df3d
|
@ -241,8 +241,10 @@ class PullRequestsController < ApplicationController
|
|||
raise ActiveRecord::Rollback
|
||||
else
|
||||
author_id = pr.user_id
|
||||
author = User.find(author_id)
|
||||
if token_num > 0
|
||||
Blockchain::FixIssue.call({user_id: author_id.to_s, project_id: project.id.to_s, token_num: token_num})
|
||||
Blockchain::TransferService.call({payer_id: issue.author_id.to_s, transfer_login: author.login, transfer_amount: token_num, project_id: project.id})
|
||||
end
|
||||
# update issue to state 5
|
||||
issue.update(status_id: 5)
|
||||
|
|
|
@ -8,19 +8,19 @@ class Blockchain::TransferService < ApplicationService
|
|||
|
||||
def call
|
||||
ActiveRecord::Base.transaction do
|
||||
transfer_amount = params['transfer_amount']
|
||||
transfer_amount = params[:transfer_amount]
|
||||
if (Float(transfer_amount) rescue false) == false or transfer_amount.to_i < 0 or Float(transfer_amount) != transfer_amount.to_i
|
||||
raise Error, "请输入正确的转账金额"
|
||||
end
|
||||
transfer_amount = params['transfer_amount'].to_i
|
||||
transfer_login = params['transfer_login']
|
||||
payer = params['payer_id'].to_s
|
||||
transfer_amount = transfer_amount.to_i
|
||||
transfer_login = params[:transfer_login]
|
||||
payer = params[:payer_id].to_s
|
||||
payee = User.find_by(login: transfer_login)
|
||||
if payee.nil?
|
||||
raise Error, "未找到接收转账的用户"
|
||||
else
|
||||
payee = payee.id.to_s
|
||||
token_name = params['project_id'].to_s
|
||||
token_name = params[:project_id].to_s
|
||||
# 调用token转移函数
|
||||
transfer_balance_on_blockchain(payer, payee, token_name, transfer_amount)
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue