Merge branch 'fee_audit' of http://git.dayaedu.com/yonge/mec into test

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

@@ -41,6 +41,26 @@ public class MusicGroupPaymentCalenderCourseSettings {
 	/**  */
 	private java.util.Date updateTime;
 
+	private String username;
+
+	private String phone;
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getPhone() {
+		return phone;
+	}
+
+	public void setPhone(String phone) {
+		this.phone = phone;
+	}
+
 	public void setStudentOptional(boolean studentOptional) {
 		isStudentOptional = studentOptional;
 	}

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

@@ -992,11 +992,29 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		MusicGroupPaymentCalenderAuditDetailDto calenderAuditDetailDto = new MusicGroupPaymentCalenderAuditDetailDto();
 		MusicGroupPaymentCalenderAuditDto auditDto = musicGroupPaymentCalenderDao.getAuditDetail(batchNo);
 		calenderAuditDetailDto.setAuditDto(auditDto);
-		//获取收费标准
-		calenderAuditDetailDto.setMusicGroupPaymentCalenderCourseSettings(musicGroupPaymentCalenderCourseSettingsDao.queryCalenderCourseSettingsByBatchNo(batchNo));
 		//获取缴费周期
 		List<MusicGroupPaymentCalender> groupPaymentCalenders = musicGroupPaymentCalenderDao.findByBatchNo(batchNo);
 		calenderAuditDetailDto.setMusicGroupPaymentCalenders(groupPaymentCalenders);
+		//获取收费标准
+		List<MusicGroupPaymentCalenderCourseSettings> courseSettings = musicGroupPaymentCalenderCourseSettingsDao.queryCalenderCourseSettingsByBatchNo(batchNo);
+		if(courseSettings != null && courseSettings.size() > 0){
+			MusicGroupPaymentCalender paymentCalender = groupPaymentCalenders.get(0);
+			if(paymentCalender.getPaymentType() == ADD_STUDENT){
+				try {
+					String studentIds = groupPaymentCalenders.get(0).getStudentIds();
+					if(StringUtils.isNotEmpty(studentIds)){
+						SysUser sysUser = sysUserFeignService.queryUserById(Integer.parseInt(studentIds));
+						courseSettings.forEach(e->{
+							e.setUsername(sysUser.getUsername());
+							e.setPhone(sysUser.getPhone());
+						});
+					}
+				}catch (Exception e){
+					e.printStackTrace();
+				}
+			}
+		}
+		calenderAuditDetailDto.setMusicGroupPaymentCalenderCourseSettings(courseSettings);
 		//获取跨团合班学员缴费详情
 		calenderAuditDetailDto.setMusicGroupPaymentCalenderStudentDetails(musicGroupPaymentCalenderStudentDetailDao.findByBatchNo(batchNo));
 		return calenderAuditDetailDto;