Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/CourseScheduleStudentPaymentDao.java

@@ -70,7 +70,9 @@ public interface CourseScheduleStudentPaymentDao extends BaseMapper<CourseSchedu
     void adjustPlayMidi(@Param("courseScheduleId") long courseScheduleId, @Param("userId") String userId, @Param("content") String content);
 
     //调整伴奏
-    void adjustExamSong(@Param("courseScheduleId") long courseScheduleId, @Param("userId") Long userId, @Param("examSongJson") String examSongJson);
+    void adjustExamSong(@Param("courseScheduleId") long courseScheduleId,
+                        @Param("userId") Long userId,
+                        @Param("musicSheetJson") String musicSheetJson);
 
     //获取课程学员关联
     List<CourseScheduleStudentPayment> queryByCourseId(@Param("courseScheduleId") Long courseScheduleId);

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseScheduleStudentPaymentMapper.xml

@@ -54,7 +54,7 @@
         </where>
     </update>
     <update id="adjustExamSong">
-        UPDATE course_schedule_student_payment SET music_sheet_download_json_ = #{examSongJson}
+        UPDATE course_schedule_student_payment SET music_sheet_download_json_ = #{musicSheetJson}
         WHERE course_id_ = #{courseScheduleId}
         <if test="userId != null">
             AND user_id_ = #{userId}
@@ -64,17 +64,17 @@
         UPDATE course_schedule_student_payment cssp
         <set>
             <if test="content == null or content == ''">
-                cssp.open_play_midi_ = NULL,cssp.updated_time_ = NOW(),
+                cssp.play_midi_ = NULL,cssp.updated_time_ = NOW(),
             </if>
             <if test="content != null and content != ''">
-                cssp.open_play_midi_ = #{content},cssp.updated_time_ = NOW(),
+                cssp.play_midi_ = #{content},cssp.updated_time_ = NOW(),
             </if>
             <if test="musicSheetJson != null">
                 cssp.music_sheet_download_json_ = #{musicSheetJson}
             </if>
         </set>
         <where>
-            cssp.course_schedule_id_ = #{courseScheduleId}
+            cssp.course_id_ = #{scheduleId}
             <if test="userId != null and userId != ''">
                 AND FIND_IN_SET(cssp.user_id_,#{userId})
             </if>