From ba9b66df3de65b63b3e4555520cd44a84f1176df Mon Sep 17 00:00:00 2001
From: zhangxunhui <zhangxunhui@nudt.edu.cn>
Date: Fri, 10 Feb 2023 16:02:28 +0800
Subject: [PATCH] after merge pr

---
 app/controllers/pull_requests_controller.rb |  2 ++
 app/services/blockchain/transfer_service.rb | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
index 778038aec..e1599093c 100644
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -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)
diff --git a/app/services/blockchain/transfer_service.rb b/app/services/blockchain/transfer_service.rb
index 4f7425e5d..1b918a47c 100644
--- a/app/services/blockchain/transfer_service.rb
+++ b/app/services/blockchain/transfer_service.rb
@@ -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