floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

修复

This commit is contained in:
yystopf 2023-03-09 18:37:08 +08:00
parent 6c71994e33
commit 8f680fd7c3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/pull_requests_controller.rb
View File

@ -227,7 +227,7 @@ class PullRequestsController < ApplicationController
# 查看是否fix了相关issue，如果fix就转账 # 查看是否fix了相关issue，如果fix就转账
@pull_request.attached_issues.each do |issue| @pull_request.attached_issues.each do |issue|
next if PullAttachedIssue.exist?(issue_id: issue.id, fixed: true) next if PullAttachedIssue.exists?(issue_id: issue.id, fixed: true)
token_num = issue.blockchain_token_num token_num = issue.blockchain_token_num
token_num = token_num.nil? ? 0 : token_num token_num = token_num.nil? ? 0 : token_num
author_id = @pull_request.user_id author_id = @pull_request.user_id

6
app/services/api/v1/issues/update_service.rb
View File

@ -42,7 +42,7 @@ class Api::V1::Issues::UpdateService < ApplicationService
check_assigners(assigner_ids) unless assigner_ids.nil? check_assigners(assigner_ids) unless assigner_ids.nil?
check_attachments(attachment_ids) unless attachment_ids.nil? check_attachments(attachment_ids) unless attachment_ids.nil?
check_atme_receivers(receivers_login) unless receivers_login.nil? check_atme_receivers(receivers_login) unless receivers_login.nil?
check_blockchain_token_num(project.user_id, project.id, blockchain_token_num, @issue.blockchain_token_num) if blockchain_token_num.present? check_blockchain_token_num(project.user_id, project.id, blockchain_token_num, (@issue.blockchain_token_num || 0)) if blockchain_token_num.present?
load_assigners(assigner_ids) load_assigners(assigner_ids)
load_attachments(attachment_ids) load_attachments(attachment_ids)
load_issue_tags(issue_tag_ids) load_issue_tags(issue_tag_ids)
@ -137,8 +137,8 @@ class Api::V1::Issues::UpdateService < ApplicationService
def build_cirle_blockchain_token def build_cirle_blockchain_token
if @updated_issue.previous_changes["blockchain_token_num"].present? if @updated_issue.previous_changes["blockchain_token_num"].present?
unlock_balance_on_blockchain(@updated_issue.project&.user_id, @updated_issue.project_id, @updated_issue.previous_changes["blockchain_token_num"][0]) unlock_balance_on_blockchain(@updated_issue.project&.user_id.to_s, @updated_issue.project_id.to_s, @updated_issue.previous_changes["blockchain_token_num"][0].to_i) if @updated_issue.previous_changes["blockchain_token_num"][0].present?
lock_balance_on_blockchain(@updated_issue.project&.user_id, @updated_issue.project_id, @updated_issue.previous_changes["blockchain_token_num"][1]) lock_balance_on_blockchain(@updated_issue.project&.user_id.to_s, @updated_issue.project_id.to_s, @updated_issue.previous_changes["blockchain_token_num"][1].to_i) if @updated_issue.previous_changes["blockchain_token_num"][1].present?
end end
end end