Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleDao.java

@@ -1671,12 +1671,4 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      * @return
      */
     List<Long> findNoStudentCourseIds(@Param("courseIds") List<Long> courseIds);
-
-    /**
-     * 获取班级中未开始的合班课程
-     * @author zouxuan
-     * @param classGroupIds
-     * @return
-     */
-    List<CourseSchedule> queryNoStartNewCourseList(@Param("classGroupIds") List<Integer> classGroupIds);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -3779,10 +3779,17 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             throw new BizException("主教与助教存在冲突");
         }
         //所选班级不能有未开始的临时合并课程
-        List<CourseSchedule> noStartNewCourseList = courseScheduleDao.queryNoStartNewCourseList(mergeClassSplitClassAffirmDto.getClassGroupIds());
-        if(noStartNewCourseList != null && noStartNewCourseList.size() > 0){
-            throw new BizException("所选班级不能有未开始的临时合并课程");
+        List<Integer> classGroupIds = mergeClassSplitClassAffirmDto.getClassGroupIds();
+        if(classGroupIds == null || classGroupIds.size() == 0){
+            throw new BizException("请填写班级信息");
         }
+        for (Integer classGroupId : classGroupIds) {
+            List<CourseSchedule> courseSchedules = courseScheduleService.classGroupNotStartMergeCourseReplace(classGroupId.longValue());
+            if(courseSchedules != null && courseSchedules.size() > 0){
+                throw new BizException("所选班级不能有未开始的临时合并课程");
+            }
+        }
+
         List<Integer> allTeacherIds = classGroupTeacherMapperList.stream()
                 .map(ClassGroupTeacherMapper::getUserId)
                 .collect(Collectors.toList());

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -2066,7 +2066,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 sysMessageService.batchSendMessage(MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_MUSIC_GROUP_RENEW_SUCCESS, yimei, null, 0, "1", "",
                         studentRegistration.getParentsName(), studentPaymentOrder.getActualAmount());
             }
-            studentRegistrationService.updateUserSurplusCourseFee(userId,musicGroupId,amount.negate(),"",userId);
+            studentRegistrationService.updateUserSurplusCourseFee(userId,musicGroupId,amount,"乐团续费",userId);
             return true;
         } else {
             if (studentPaymentOrder.getBalancePaymentAmount() != null && studentPaymentOrder.getBalancePaymentAmount().doubleValue() > 0) {

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -3426,15 +3426,4 @@
         SELECT * FROM course_schedule WHERE id_ = #{courseId} FOR UPDATE
     </select>
 
-    <select id="queryNoStartNewCourseList" resultMap="CourseSchedule">
-        SELECT * FROM course_schedule
-        WHERE new_course_id_ IS NOT NULL AND new_course_id_ > 0
-        AND CONCAT(class_date_,' ',start_class_time_) > NOW()
-        AND del_flag_ = 0 AND is_lock_ = 0
-        AND class_group_id_ IN
-        <foreach collection="classGroupIds" open="(" close=")" separator="," item="item">
-            #{item}
-        </foreach>
-    </select>
-
 </mapper>

mec-biz/src/main/resources/config/mybatis/GoodsMapper.xml

@@ -396,7 +396,7 @@
     <select id="getMusicGroupGoodsAndDiscount" resultMap="MusicGroupGoods">
         SELECT g.* FROM subject_goods_mapper sgm
         LEFT JOIN goods g ON sgm.goods_category_id_ = g.goods_category_id_
-        WHERE sgm.subject_id_ = #{subjectId} and g.status_ != 0
+        WHERE sgm.subject_id_ = #{subjectId} AND g.music_group_show_=1 AND g.status_ != 0
         <if test="type!=null">
             AND g.type_ = #{type}
         </if>