拆班合班

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

@@ -8,13 +8,18 @@ import java.util.List;
 
 public interface MusicGroupOrganizationCourseSettingsDetailDao extends BaseDAO<Integer, MusicGroupOrganizationCourseSettingsDetail> {
 
-    static MusicGroupOrganizationCourseSettingsDetail getClassLastSetting(Integer classGroupId, String courseType) {
-        return null;
-    }
-
     int batchInsert(@Param("settingDetails") List<MusicGroupOrganizationCourseSettingsDetail> settingDetails);
 
     int deleteBySettingId(@Param("settingId") Integer settingId);
     
     List<MusicGroupOrganizationCourseSettingsDetail> queryByMusicGroupOrganizationCourseSettingsId(Integer musicGroupOrganizationCourseSettingsId);
+
+    /**
+     * 获取当前班级对应课程类型的价格
+     * @author zouxuan
+     * @param classGroupId
+     * @param courseType
+     * @return
+     */
+    MusicGroupOrganizationCourseSettingsDetail getClassLastSetting(@Param("classGroupId") Integer classGroupId, @Param("courseType") String courseType);
 }

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

@@ -81,13 +81,4 @@ public interface MusicGroupPaymentCalenderCourseSettingsDao extends BaseDAO<Inte
 	 * @time 16:04
 	 */
 	List<MusicGroupPaymentCalenderCourseSettings> queryCalenderCourseSettingsByBatchNo(String batchNo);
-
-	/**
-	 * 获取当前班级对应课程类型的价格
-	 * @author zouxuan
-	 * @param classGroupId
-	 * @param courseType
-	 * @return
-	 */
-    MusicGroupOrganizationCourseSettingsDetail getClassLastSetting(@Param("classGroupId") Integer classGroupId, @Param("courseType") String courseType);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupPaymentCalenderCourseSettings.java

@@ -1,11 +1,8 @@
 package com.ym.mec.biz.dal.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
-
 import com.ym.mec.biz.dal.entity.CourseSchedule.CourseScheduleType;
 
-import java.math.BigDecimal;
-
 /**
  * 对应数据库表(music_group_payment_calender_course_settings):
  */

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupPaymentCalenderCourseSettingsService.java

@@ -18,13 +18,4 @@ public interface MusicGroupPaymentCalenderCourseSettingsService extends BaseServ
      * @return java.util.List<com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderCourseSettings>
      */
     Map<String, Integer> getMusicCourseSettingsWithStudents(String musicGroupId, List<Integer> studentIds);
-
-    /**
-     * 获取当前班级对应课程类型的价格
-     * @author zouxuan
-     * @param classGroupId
-     * @param courseType
-     * @return
-     */
-    MusicGroupOrganizationCourseSettingsDetail getClassLastSetting(Integer classGroupId, String courseType);
 }

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

@@ -183,6 +183,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     @Autowired
     private MusicGroupPaymentCalenderCourseSettingsService musicGroupPaymentCalenderCourseSettingsService;
     @Autowired
+    private MusicGroupOrganizationCourseSettingsDetailDao musicGroupOrganizationCourseSettingsDetailDao;
+    @Autowired
     private MusicGroupPaymentCalenderDao musicGroupPaymentCalenderDao;
 
     @Override
@@ -3272,7 +3274,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 }
                 Long subNum = maxNum - currentNum;
                 //生成缴费项目
-                MusicGroupOrganizationCourseSettingsDetail settingsDetail = musicGroupPaymentCalenderCourseSettingsService.getClassLastSetting(classGroupId,courseType);
+                MusicGroupOrganizationCourseSettingsDetail settingsDetail = musicGroupOrganizationCourseSettingsDetailDao.getClassLastSetting(classGroupId,courseType);
                 settingsDetail.setCourseType(CourseScheduleType.valueOf(courseType));
                 settingsDetail.setCourseTotalMinuties(Integer.parseInt(jsonObject.get(courseType).toString()) * subNum.intValue());
                 settingsDetail.setCourseCurrentPrice(settingsDetail.getCourseCurrentPrice().multiply(new BigDecimal(subNum)));

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

@@ -48,9 +48,4 @@ public class MusicGroupPaymentCalenderCourseSettingsServiceImpl extends BaseServ
 		}
 		return result;
 	}
-
-	@Override
-	public MusicGroupOrganizationCourseSettingsDetail getClassLastSetting(Integer classGroupId, String courseType) {
-		return musicGroupPaymentCalenderCourseSettingsDao.getClassLastSetting(classGroupId,courseType);
-	}
 }

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

@@ -117,4 +117,12 @@
         SELECT * FROM music_group_organization_course_settings_detail
         where music_group_organization_course_settings_id_ = #{musicGroupOrganizationCourseSettingsId}
     </select>
+    <select id="getClassLastSetting" resultMap="MusicGroupOrganizationCourseSettingsDetail">
+        SELECT cssp.original_price_ course_original_price_,cssp.expect_price_ course_current_price_
+		FROM course_schedule cs
+		LEFT JOIN course_schedule_student_payment cssp ON cssp.course_schedule_id_ = cs.id_
+		WHERE cs.class_group_id_ = #{classGroupId} AND cs.type_ = #{courseType} AND cssp.original_price_ IS NOT NULL
+		ORDER BY cs.class_date_,cs.start_class_time_ DESC
+		LIMIT 1
+    </select>
 </mapper>

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

@@ -154,12 +154,4 @@
 		WHERE mgpc.batch_no_ = #{batchNo}
 		GROUP BY mgpccs.course_type_
 	</select>
-    <select id="getClassLastSetting" resultMap="MusicGroupPaymentCalenderCourseSettings">
-		SELECT cssp.original_price_ course_original_price_,cssp.expect_price_ course_current_price_
-		FROM course_schedule cs
-		LEFT JOIN course_schedule_student_payment cssp ON cssp.course_schedule_id_ = cs.id_
-		WHERE cs.class_group_id_ = #{classGroupId} AND cs.type_ = #{courseType} AND cssp.original_price_ IS NOT NULL
-		ORDER BY cs.class_date_,cs.start_class_time_ DESC
-		LIMIT 1
-	</select>
 </mapper>