update

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/PeriodEnum.java

@@ -5,22 +5,15 @@ import com.ym.mec.common.enums.BaseEnum;
 /**
  * 周期
  */
-public enum PeriodEnum implements BaseEnum<Integer, PeriodEnum> {
-	DAY(1,"日"), MONTH(2,"月"), QUARTERLY(3,"季度"), YEAR_HALF(4,"半年"), YEAR(5,"年");
-
-	private Integer code;
+public enum PeriodEnum implements BaseEnum<String, PeriodEnum> {
+	DAY("日"), MONTH("月"), QUARTERLY("季度"), YEAR_HALF("半年"), YEAR("年");
 
 	private String msg;
 
-	PeriodEnum(Integer code,String msg) {
-		this.code = code;
+	PeriodEnum(String msg) {
 		this.msg = msg;
 	}
 
-	public void setCode(Integer code) {
-		this.code = code;
-	}
-
 	public String getMsg() {
 		return msg;
 	}
@@ -30,7 +23,7 @@ public enum PeriodEnum implements BaseEnum<Integer, PeriodEnum> {
 	}
 
 	@Override
-	public Integer getCode() {
-		return this.code;
+	public String getCode() {
+		return name();
 	}
 }

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

@@ -679,7 +679,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 
 	@Override
 	public Object getDetail(Long id) {
-		Map<String, Object> result = new HashMap<>(6);
+		Map<String, Object> result = new HashMap<>(9);
 		//获取缴费项目详情
 		MusicGroupPaymentCalender calender = musicGroupPaymentCalenderDao.get(id);
 		//统计预计缴费人数
@@ -692,11 +692,23 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		//汇总收款金额
 		BigDecimal sumActualAmount = musicGroupPaymentCalenderDetailDao.sumActualAmount(id);
 		result.put("sumActualAmount", sumActualAmount);
-		//收费标准名称
-//		String name = musicGroupPaymentCalenderDao.getCalenderSettingsName(id);
-//		result.put("calenderSettingsName", name);
+		//进行中加学员
+		if(calender.getPaymentType() == ADD_STUDENT){
+			try {
+				String studentIds = calender.getStudentIds();
+				if(StringUtils.isNotEmpty(studentIds)){
+					SysUser sysUser = sysUserFeignService.queryUserById(Integer.parseInt(studentIds));
+					result.put("phone",sysUser.getPhone());
+					result.put("username",sysUser.getUsername());
+				}
+			}catch (Exception e){
+				e.printStackTrace();
+			}
+		}
 		//课程
 		result.put("course", musicGroupPaymentCalenderCourseSettingsService.queryCalenderCourseSettings(id));
+		//获取跨团合班学员缴费详情
+		result.put("musicMerger",musicGroupPaymentCalenderStudentDetailDao.findByBatchNo(calender.getBatchNo()));
 		//乐保
 		result.put("repair",musicGroupPaymentCalenderRepairService.findByCalenderId(id));
 		//会员信息

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

@@ -41,8 +41,7 @@
         <result column="payment_pattern_" property="paymentPattern"/>
         <result column="is_classroom_lessons_" property="isClassroomLessons"/>
         <result column="cloud_teacher_type_" property="cloudTeacherType"/>
-        <result column="course_view_type_" property="courseViewType"
-                typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="course_view_type_" property="courseViewType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="is_show_record_of_student_" property="isShowRecordOfStudent"/>
         <result column="musical_instruments_provide_status_" property="musicalInstrumentsProvideStatus"/>
         <result column="member_course_show_flag_" property="memberCourseShowFlag"/>

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

@@ -32,19 +32,19 @@
         <result column="attribute1_" property="attribute1"/>
         <result column="attribute2_" property="attribute2"/>
         <result column="student_ids_" property="studentIds"/>
-<!--        <result column="member_payment_amount_" property="memberPaymentAmount"/>-->
-<!--        <result column="original_member_payment_amount_" property="originalMemberPaymentAmount"/>-->
-<!--        <result column="member_rank_setting_id_" property="memberRankSettingId"/>-->
-<!--        <result column="member_valid_date_" property="memberValidDate"/>-->
-<!--        <result column="member_period_" property="memberPeriod" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>-->
-<!--        <result column="member_optional_flag_" property="memberOptionalFlag"/>-->
-<!--        <result column="music_repair_num_" property="musicRepairNum"/>-->
-<!--        <result column="music_repair_actual_price_" property="musicRepairActualPrice"/>-->
-<!--        <result column="music_repair_optional_flag_" property="musicRepairOptionalFlag"/>-->
+        <result column="member_payment_amount_" property="memberPaymentAmount"/>
+        <result column="original_member_payment_amount_" property="originalMemberPaymentAmount"/>
+        <result column="member_rank_setting_id_" property="memberRankSettingId"/>
+        <result column="member_valid_date_" property="memberValidDate"/>
+        <result column="member_period_" property="memberPeriod" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="member_optional_flag_" property="memberOptionalFlag"/>
+        <result column="music_repair_num_" property="musicRepairNum"/>
+        <result column="music_repair_actual_price_" property="musicRepairActualPrice"/>
+        <result column="music_repair_optional_flag_" property="musicRepairOptionalFlag"/>
         <result column="current_total_amount_" property="currentTotalAmount"/>
         <result column="original_total_amount_" property="originalTotalAmount"/>
     </resultMap>
-
+    
     <!-- 根据主键查询一条记录 -->
     <select id="get" resultMap="MusicGroupPaymentCalender">
 		SELECT * FROM music_group_payment_calender WHERE id_ = #{id}