Merge remote-tracking branch 'origin/master_saas' into master_saas

audio-analysis/src/main/java/com/yonge/netty/server/service/AudioCompareHandler.java

@@ -25,6 +25,8 @@ import org.springframework.stereotype.Component;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONPath;
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.SysMusicCompareRecord;
 import com.ym.mec.biz.dal.enums.DeviceTypeEnum;
 import com.ym.mec.biz.dal.enums.FeatureType;
@@ -57,6 +59,9 @@ public class AudioCompareHandler implements MessageHandler {
 	
 	@Autowired
 	private SysMusicCompareRecordService sysMusicCompareRecordService;
+	
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
 
     @Autowired
     private StoragePluginContext storagePluginContext;
@@ -149,6 +154,9 @@ public class AudioCompareHandler implements MessageHandler {
 				sysMusicCompareRecord.setSpeed(musicXmlBasicInfo.getSpeed());
 				sysMusicCompareRecord.setPartIndex(musicXmlBasicInfo.getPartIndex());
 				
+				SysUser sysUser = sysUserFeignService.queryUserById(sysMusicCompareRecord.getUserId());
+				sysMusicCompareRecord.setTenantId(sysUser.getTenantId());
+				
 				MusicXmlNote musicXmlNote = musicXmlBasicInfo.getMusicXmlInfos().stream().max(Comparator.comparing(MusicXmlNote::getTimeStamp)).get();
 				sysMusicCompareRecord.setSourceTime((float) ((musicXmlNote.getTimeStamp()+musicXmlNote.getDuration())/1000));
 				sysMusicCompareRecordService.insert(sysMusicCompareRecord);

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

@@ -33,5 +33,14 @@ public enum SixPlusGradeEnum implements BaseEnum<Integer, SixPlusGradeEnum> {
 	public String getDesc() {
 		return desc;
 	}
+	
+	public static SixPlusGradeEnum get(String desc) {
+		for (SixPlusGradeEnum vpg : SixPlusGradeEnum.values()) {
+			if (vpg.getDesc().equals(desc)) {
+				return vpg;
+			}
+		}
+		return null;
+	}
 
 }

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

@@ -467,7 +467,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 			sysUser = new SysUser();
 			sysUser.setPhone(si.getMobileNo());
 			sysUser.setUsername(si.getName());
-			sysUser.setGender(si.getGradeName().equals("男") ? 1 : 0);
+			sysUser.setGender(si.getSex().equals("男") ? 1 : 0);
 			sysUser.setUserType("STUDENT");
 			sysUser.setOrganId(musicGroup.getOrganId());
 			sysUser.setCreateTime(nowDate);
@@ -478,7 +478,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 			si.setUserId(userId);
 			
 			student = new Student(userId, subjectMap.get(si.getSubjectName()) + "");
-	        student.setCurrentGradeNum(FivePlusGradeEnum.get(si.getGradeName()).getCode());
+	        student.setCurrentGradeNum(SixPlusGradeEnum.get(si.getGradeName()).getCode());
 			studentDao.insert(student);
 			// 添加用户现金账户
 			sysUserCashAccountDao.insert(new SysUserCashAccount(userId, "CNY"));
@@ -491,7 +491,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 	        studentRegistration.setSubjectId(subjectMap.get(si.getSubjectName()));
 	        studentRegistration.setUserId(userId);
 	        studentRegistration.setName(si.getName());
-	        studentRegistration.setGender(student.getCurrentGradeNum());
+	        studentRegistration.setGender(sysUser.getGender());
 	        studentRegistration.setPaymentStatus(PaymentStatusEnum.YES);
 	        studentRegistration.setMusicGroupStatus(StudentMusicGroupStatusEnum.NORMAL);
 	        studentRegistration.setTemporaryCourseFee(BigDecimal.ZERO);
@@ -580,7 +580,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 					}
 					MusicGroupPaymentStudentCourseDetail musicGroupPaymentStudentCourseDetail = new MusicGroupPaymentStudentCourseDetail();
 					musicGroupPaymentStudentCourseDetail.setMusicGroupPaymentCalenderId(musicGroupPaymentCalender.getId());
-					musicGroupPaymentStudentCourseDetail.setMusicGroupPaymentCalenderDetailId(musicGroupPaymentCalenderDetail.getId());
+					//musicGroupPaymentStudentCourseDetail.setMusicGroupPaymentCalenderDetailId(musicGroupPaymentCalenderDetail.getId());
 					musicGroupPaymentStudentCourseDetail.setUserId(si.getUserId());
 					musicGroupPaymentStudentCourseDetail.setCourseType(courseSetting.getCourseType());
 					musicGroupPaymentStudentCourseDetail.setTotalCourseMinutes(courseSetting.getCourseTotalMinuties());
@@ -595,9 +595,15 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 			}
 			if (insertMusicGroupPaymentCalenderDetailList.size() > 0) {
 				musicGroupPaymentCalenderDetailDao.batchInsert(insertMusicGroupPaymentCalenderDetailList);
-			}
-			if (musicGroupPaymentStudentCourseDetails.size() > 0) {
-				musicGroupPaymentStudentCourseDetailDao.batchInsert(musicGroupPaymentStudentCourseDetails);
+				
+				Map<Integer,Long> musicGroupPaymentCalenderDetailIdMap =  insertMusicGroupPaymentCalenderDetailList.stream().collect(Collectors.toMap(MusicGroupPaymentCalenderDetail :: getUserId, MusicGroupPaymentCalenderDetail :: getId));
+				
+				if (musicGroupPaymentStudentCourseDetails.size() > 0) {
+					for(MusicGroupPaymentStudentCourseDetail cd : musicGroupPaymentStudentCourseDetails){
+						cd.setMusicGroupPaymentCalenderDetailId(musicGroupPaymentCalenderDetailIdMap.get(cd.getUserId()));
+					}
+					musicGroupPaymentStudentCourseDetailDao.batchInsert(musicGroupPaymentStudentCourseDetails);
+				}
 			}
 		}