Parcourir la source

缴费审核列表如果是新增学员,展示学员信息

zouxuan il y a 4 ans
Parent
commit
24aca5082e

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

@@ -994,14 +994,27 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		calenderAuditDetailDto.setAuditDto(auditDto);
 		//获取缴费周期
 		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.setMusicGroupPaymentCalenders(groupPaymentCalenders);
 		//获取跨团合班学员缴费详情
 		calenderAuditDetailDto.setMusicGroupPaymentCalenderStudentDetails(musicGroupPaymentCalenderStudentDetailDao.findByBatchNo(batchNo));
 		return calenderAuditDetailDto;