diff --git a/app/models/applied_project.rb b/app/models/applied_project.rb index abab2ab6f..a6eef8417 100644 --- a/app/models/applied_project.rb +++ b/app/models/applied_project.rb @@ -17,7 +17,7 @@ class AppliedProject < ActiveRecord::Base count = ShieldWechatMessage.where("container_type='User' and container_id=#{member.user_id} and shield_type='Project' and shield_id=#{self.project_id}").count if count == 0 ws = WechatService.new - ws.project_review_notice member.user_id, "review_project_member", self.project_id, "项目成员审批通知", self.project.name, self.user.show_name, format_time(Time.now),"点击查看申请详情。",self.user.id + ws.project_review_notice member.user_id, "review_project_member", self.project_id, "项目成员审批通知。", self.project.name, self.user.show_name, format_time(Time.now),"点击查看申请详情。",self.user.id end #-------------------------------------------- end diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb index 9ed6faaa6..2f5745892 100644 --- a/app/services/courses_service.rb +++ b/app/services/courses_service.rb @@ -615,7 +615,7 @@ class CoursesService rolename = role_ids.include?("7") ? "助教" : "教师" content = current_user.show_name + "申请以"+rolename+"身份加入班级,等待您的审批。" ws = WechatService.new - ws.class_notice tea_user.id, "review_class_member", course.id, "班级成员审批通知", course.name, tea_user.show_name, format_time(Time.now), content, "点击查看申请详情。",current_user.id + ws.class_notice tea_user.id, "review_class_member", course.id, "班级成员审批通知。", course.name, tea_user.show_name, format_time(Time.now), content, "点击查看申请详情。",current_user.id end end #-------------------------------------------- diff --git a/app/services/projects_service.rb b/app/services/projects_service.rb index dd1e6c2d7..b1d917b08 100644 --- a/app/services/projects_service.rb +++ b/app/services/projects_service.rb @@ -161,7 +161,7 @@ class ProjectsService end end else - status = 4 + status = 1 end status end diff --git a/config/wechat.yml.test b/config/wechat.yml.test index 3d1861d67..8dbd9850f 100644 --- a/config/wechat.yml.test +++ b/config/wechat.yml.test @@ -22,7 +22,7 @@ default: &default class_notice: "8LVu33l6bP-56SDomVgHn-yJc57YpCwwJ81rAJgRONk" create_class_notice: "9CDIvHIKiGwPEQWRw_-wieec1o50tMXQPPZIfECKu0I" create_project_notice: "R2ZaQKJfDJgujPcHWPzadKHIRkIyj2CjX2o_qIuRqig" - project_review_notice: "cwpAHzdrYQo0Gc5ZKCBHMYEe8NjlOF6KpMGklMch8RM" + project_review_notice: "ip192wVXTav3qchgUn9_7B6lFfTlCZjwL7A1tncTOuc" production: <<: *default diff --git a/public/assets/wechat/review_class_member.html b/public/assets/wechat/review_class_member.html index c13571e4c..85d16fb64 100644 --- a/public/assets/wechat/review_class_member.html +++ b/public/assets/wechat/review_class_member.html @@ -14,5 +14,13 @@ +