From 50ed200ca4a083e14b5cc7b031c09f32d2a5b68f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 14 Apr 2017 14:38:29 +0800
Subject: [PATCH] =?UTF-8?q?game=E7=BA=A0=E9=94=99=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=8F=91=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/words_controller.rb | 12 ++++++------
 app/models/journals_for_message.rb  |  3 +++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb
index e66abaf33..b3e8ec91c 100644
--- a/app/controllers/words_controller.rb
+++ b/app/controllers/words_controller.rb
@@ -515,13 +515,13 @@ class WordsController < ApplicationController
           # @user.add_jour(me, params[:text])
           #私信
         if params[:shixun_name]
-          master = User.find(params[:shixun_author])
           game_id = params[:game_id]
-          message = "<span style='color:red;'>【#{master.show_name}导师/#{params[:shixun_name]}>第#{params[:position]}关】问题报告：</span><br>" + params[:text]
-         # game.journals_for_messages << JournalsForMessage.new(:user_id => me.id, :notes => message, :reply_id => 0, :status => true, :is_readed => false, :private => 1)
-         jfm = JournalsForMessage.new(:jour_id => game_id, :jour_type => "Game", :user_id => master.id, :notes => message, :reply_id => 0, :status => true, :is_readed => false, :private => 1)
-         jfm.save
-        JournalsForMessage.create(:jour_id => game_id, :jour_type => "Game", :user_id => 1, :notes => message, :reply_id => 0, :status => true, :is_readed => false, :private => 1)
+          message = params[:text]
+          admin_id = User.where(:admin => 1).first.try(:id)
+          user_ids = [admin_id, params[:shixun_author_id].to_i]
+          user_ids.each do |user_id|
+            JournalsForMessage.create(:jour_id => game_id, :jour_type => "Game", :user_id => user_id, :notes => message, :reply_id => 0, :status => true, :is_readed => false, :private => 1)
+          end
         else
           message = "<span style='color:red;'>【未收到激活邮件的用户反馈，用户邮箱："+me.mail+"】</span><br>"+params[:text]
           @user.journals_for_messages << JournalsForMessage.new(:user_id => me.id, :notes => message, :reply_id => 0, :status => true, :is_readed => false, :private => 1)
diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb
index d1f32f82d..885bdc0b8 100644
--- a/app/models/journals_for_message.rb
+++ b/app/models/journals_for_message.rb
@@ -322,6 +322,9 @@ class JournalsForMessage < ActiveRecord::Base
       receivers.each do |r|
         self.user_feedback_messages << UserFeedbackMessage.new(:user_id => r.id, :journals_for_message_id => self.id, :journals_for_message_type => "Principal", :viewed => false)
       end
+    elsif self.jour_type == 'Game'
+      # game不存在回复
+      self.user_feedback_messages << UserFeedbackMessage.new(:user_id => self.user_id, :journals_for_message_id => self.id, :journals_for_message_type => "Game", :viewed => false)
     end
   end