Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -146,16 +146,19 @@ public class UserController extends BaseController {
 		if (sysUser == null) {
 			return failed("用户不存在");
 		}
+		String userType;
 		if(sysUser.getUserType().contains("TEACHER") || sysUser.getUserType().contains("SYSTEM")){
+			userType = "TEACHER";
 			sysUser.setRealName(username);
 		}else {
+			userType = "STUDENT";
 			sysUser.setUsername(username);
 		}
 		if(StringUtils.isEmpty(sysUser.getImToken())){
 			ImResult register = imFeignService.register(new ImUserModel(sysUser.getId().toString(), username, sysUser.getAvatar()));
 			sysUser.setImToken(register.getToken());
 		}
-		webFeignService.updateNickName(sysUser.getId(),username,null);
+		webFeignService.updateNickName(sysUser.getId(),username,userType,sysUser.getAvatar());
 		password = new BCryptPasswordEncoder().encode(password);
 		sysUser.setPassword(password);
 		sysUser.setUpdateTime(new Date());

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

@@ -56,7 +56,9 @@ public interface ImGroupService extends BaseService<Long, ImGroup> {
 	 * 修改用户在群、通讯录的备注
 	 * @param userId
 	 * @param nickName
+	 * @param userType
+	 * @param avatar
 	 * @return
 	 */
-    int updateNickName(Integer userId, String nickName,String userType);
+    int updateNickName(Integer userId, String nickName,String userType,String avatar);
 }

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

@@ -112,8 +112,8 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 			throw new BizException("员工信息不存在");
 		}
 		employee.setUserId(employee.getId());
+		SysUser sysUser = sysUserFeignService.queryUserByMobile(employee.getPhone());
 		if(StringUtils.isNotEmpty(employee.getPhone())){
-			SysUser sysUser = sysUserFeignService.queryUserByMobile(employee.getPhone());
 			if(sysUser != null && !sysUser.getId().equals(employee.getUserId())){
 				throw new BizException("手机号已存在");
 			}
@@ -124,7 +124,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		//新增用户角色
 		employeeDao.batchAddEmployeeRole(employee.getId(),employee.getRoleIds());
 		teacherDao.updateUser(employee);
-		imGroupService.updateNickName(employee.getUserId(),employee.getRealName(),"SYSTEM");
+		imGroupService.updateNickName(employee.getUserId(),employee.getRealName(),"SYSTEM",sysUser.getAvatar());
 	}
 
 	@Override

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

@@ -128,18 +128,13 @@ public class ImGroupServiceImpl extends BaseServiceImpl<Long, ImGroup> implement
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public int updateNickName(Integer userId, String nickName,String userType) {
+	public int updateNickName(Integer userId, String nickName,String userType,String avatar) {
 		//修改群成员备注
 		int i = imGroupDao.updateNickname(userId, nickName);
-		//修改sysUser名称，如果包含学员的角色，那么修改userName。否则修改realName
-		SysUser sysUser = sysUserFeignService.queryUserById(userId);
-		if(StringUtils.isNotEmpty(userType)){
-			if("STUDENT" == userType){
-				sysUser.setUsername(nickName);
-			}else {
-				sysUser.setRealName(nickName);
-			}
-		}else {
+		if(StringUtils.isEmpty(userType)){
+			//修改sysUser名称，如果包含学员的角色，那么修改userName。否则修改realName
+			SysUser sysUser = sysUserFeignService.queryUserById(userId);
+			avatar = sysUser.getAvatar();
 			if(sysUser.getUserType().contains("STUDENT")){
 				sysUser.setUsername(nickName);
 			}else {
@@ -148,7 +143,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<Long, ImGroup> implement
 			sysUserFeignService.updateSysUser(sysUser);
 		}
 		//同步融云基本信息
-		imFeignService.update(new ImUserModel(sysUser.getId().toString(),nickName,sysUser.getAvatar()));
+		imFeignService.update(new ImUserModel(userId.toString(),nickName,avatar));
 		return i;
 	}
 

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

@@ -247,7 +247,7 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
                 sysUserCashAccountService.updateBalance(studentPaymentOrder.getUserId(), studentPaymentOrder.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, "乐保购买支付失败");
             }
 
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_SPORADIC_PAYMENT_FAILED, map, null, 0, "", "STUDENT",
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_SPORADIC_PAYMENT_FAILED, map, null, 0, null, "STUDENT",
                     studentPaymentOrder.getActualAmount(), "乐保购买");
             return false;
         }

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

@@ -673,7 +673,7 @@ public class StudentManageServiceImpl implements StudentManageService {
             LocalDate monDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
             studentExtracurricularExercisesSituationDao.deleteByStudent(student.getId(), monDayDate.toString());
         }
-        webFeignService.updateNickName(userId,student.getUsername(),"STUDENT");
+        webFeignService.updateNickName(userId,student.getUsername(),"STUDENT",sysUser1.getAvatar());
         return userId;
     }
 

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

@@ -347,7 +347,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         student.setCurrentClass(studentRegistration.getCurrentClass());
         studentDao.update(student);
 
-        //webFeignService.updateNickName(sysUser.getId(),studentRegistration.getName(),"STUDENT");
+        webFeignService.updateNickName(sysUser.getId(),studentRegistration.getName(),"STUDENT",sysUser.getAvatar());
         // 增加报名学生数
         musicGroupSubjectPlanService.addApplyStudentNum(studentRegistration.getMusicGroupId(), studentRegistration.getSubjectId(), 1);
         // 报名成功后，发送短信
@@ -688,12 +688,15 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                         studentDao.update(student);
                     }
                 }
-                webFeignService.updateNickName(userId,sysUser.getUsername(),"STUDENT");
+                webFeignService.updateNickName(userId,sysUser.getUsername(),"STUDENT",sysUser.getAvatar());
             }
             MusicGroupStudentFee studentFeeDaoByUser = musicGroupStudentFeeDao.findByUser(userId, musicGroupId);
             if (studentFeeDaoByUser != null) {
                 throw new BizException("该学员已存在");
             }
+            Organization organization = organizationDao.get(musicGroup.getOrganId());
+            String studentGrade = studentService.getStudentGrade(organization.getGradeType(), studentRegistration.getCurrentGradeNum());
+            studentRegistration.setCurrentGrade(studentGrade);
             studentRegistration.setActualSubjectId(studentRegistration.getSubjectId());
             studentRegistration.setUserId(userId);
             studentRegistration.setPaymentStatus(PaymentStatusEnum.OPEN);
@@ -770,12 +773,6 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     @Override
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void insertStudent(String studentIds, String oldMusicGroupId, String newMusicGroupId, Map<Integer, List<MusicGroupPaymentCalenderStudentDetail>> collect) {
-        //获取欠费学员列表
-        List<Integer> studentIdList = Arrays.asList(studentIds.split(",")).stream().mapToInt(idStr -> Integer.valueOf(idStr)).boxed().collect(Collectors.toList());
-        List<Integer> noPaymentUserIds = musicGroupPaymentCalenderDetailDao.queryNoPaymentUserIds(newMusicGroupId,studentIdList);
-        if(noPaymentUserIds.size() > 0){
-            throw new BizException("操作失败：有欠费的学员不允许创建缴费");
-        }
         SysUser sysUser1 = sysUserFeignService.queryUserInfo();
         //获取旧乐团学员注册信息
         List<StudentRegistration> studentRegistrations = studentRegistrationDao.queryByUserIdsAndMusicGroupId(studentIds, oldMusicGroupId);
@@ -1114,13 +1111,13 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 Map<Integer, String> map = new HashMap<>(1);
                 map.put(studentPaymentOrder.getUserId(), studentRegistration.getParentsPhone());
                 sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS,
-                        MessageTypeEnum.STUDENT_SMS_PAYMENT_SUCCESS, map, null, 0, "1", "",
+                        MessageTypeEnum.STUDENT_SMS_PAYMENT_SUCCESS, map, null, 0, null, "",
                         studentRegistration.getName(), studentPaymentOrder.getActualAmount());
                 //push
                 Map<Integer, String> map1 = new HashMap<>(1);
                 map1.put(studentPaymentOrder.getUserId(), studentPaymentOrder.getUserId().toString());
                 sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,
-                        MessageTypeEnum.STUDENT_SMS_PAYMENT_SUCCESS, map1, null, 0, "1", "STUDENT",
+                        MessageTypeEnum.STUDENT_SMS_PAYMENT_SUCCESS, map1, null, 0, null, "STUDENT",
                         studentRegistration.getName(), studentPaymentOrder.getActualAmount());
             }
             try {
@@ -1155,7 +1152,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 Map<Integer, String> map = new HashMap<>(1);
                 map.put(studentPaymentOrder.getUserId(), studentRegistration.getParentsPhone());
                 sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS,
-                        MessageTypeEnum.STUDENT_SMS_PAYMENT_FAILED, map, null, 0, "1", "",
+                        MessageTypeEnum.STUDENT_SMS_PAYMENT_FAILED, map, null, 0, null, "",
                         HttpUtil.getSortUrl(studentApplyUrl));
             }
 //            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,

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

@@ -1062,10 +1062,10 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
                         "联系人：" + repairInfo.getEmployeeName() + "（" + repairInfo.getEmployeePhone() + "）\n" +
                         "地址：" + repairInfo.getEmployeeAddress() + "";
 
-                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_REPAIR_ONLINE_PAYMENT_SUCCESS, map, null, 0, "1", "STUDENT",
+                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_REPAIR_ONLINE_PAYMENT_SUCCESS, map, null, 0, null, "STUDENT",
                         repairInfo.getStudentName(), repairInfo.getEmployeeName(), repairInfo.getEmployeePhone(), repairInfo.getEmployeeAddress());
             } else {
-                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_REPAIR_OFFLINE_PAYMENT_SUCCESS, map, null, 0, "1", "STUDENT",
+                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_REPAIR_OFFLINE_PAYMENT_SUCCESS, map, null, 0, null, "STUDENT",
                         repairInfo.getStudentName());
             }
             sysMessageService.sendNoAuthPrivateMessage(repairInfo.getEmployeeId().toString(), userId.toString(), imContent);
@@ -1082,7 +1082,7 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
                 sysUserCashAccountService.updateBalance(studentPaymentOrder.getUserId(), studentPaymentOrder.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, "乐器维修支付失败");
             }
 
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_SPORADIC_PAYMENT_FAILED, map, null, 0, "", "STUDENT",
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_SPORADIC_PAYMENT_FAILED, map, null, 0, null, "STUDENT",
                     studentPaymentOrder.getActualAmount(), "乐器维修");
             return false;
         }

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

@@ -545,7 +545,7 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
                 sysUserCashAccountService.updateBalance(studentPaymentOrder.getUserId(), studentPaymentOrder.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, "声部更改支付失败");
             }
 
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_SPORADIC_PAYMENT_FAILED, map, null, 0, "", "STUDENT",
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_SPORADIC_PAYMENT_FAILED, map, null, 0, null, "STUDENT",
                     studentPaymentOrder.getActualAmount(), "声部更换");
             return false;
         }

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

@@ -157,7 +157,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 		teacherDao.update(teacher);
 		teacher.setOrganId(null);
 		teacherDao.updateUser(teacher);
-		webFeignService.updateNickName(teacher.getId(),teacher.getRealName(),"TEACHER");
+		webFeignService.updateNickName(teacher.getId(),teacher.getRealName(),"TEACHER",teacher.getAvatar());
 //		imFeignService.update(new ImUserModel(teacher.getId().toString(),teacher.getRealName(),teacher.getAvatar()));
 	}
 

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

@@ -79,12 +79,8 @@
             <if test="operation != null">
                 operation_ = #{operation},
             </if>
-            <if test="startTime != null">
-                start_time_ = #{startTime},
-            </if>
-            <if test="endTime != null">
-                end_time_ = #{endTime},
-            </if>
+            start_time_ = #{startTime},
+            end_time_ = #{endTime},
             <if test="changeOrderId != null">
                 change_order_id_ = #{changeOrderId},
             </if>

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

@@ -593,7 +593,7 @@
         GROUP BY sr.music_group_id_
     </select>
     <select id="queryUserByPhone" resultMap="StudentRegistration">
-        SELECT su.id_,su.real_name_ parents_name_,su.phone_,sr.current_grade_,
+        SELECT su.id_,su.real_name_ parents_name_,su.phone_,sr.current_grade_,sr.current_grade_num_,
         sr.current_class_,su.username_ name_,su.birthdate_,su.gender_
         FROM sys_user su
         LEFT JOIN student_registration sr ON sr.user_id_ = su.id_

mec-client-api/src/main/java/com/ym/mec/im/WebFeignService.java

@@ -20,5 +20,8 @@ public interface WebFeignService {
 	Boolean isPurchasedPracticeCourse(@RequestParam("userId") Integer userId);
 
 	@RequestMapping(value = "api/updateNickName")
-	int updateNickName(@RequestParam("userId") Integer userId,@RequestParam("nickName") String nickName,@RequestParam("userType") String userType);
+	int updateNickName(@RequestParam("userId") Integer userId,
+					   @RequestParam("nickName") String nickName,
+					   @RequestParam("userType") String userType,
+					   @RequestParam("avatar") String avatar);
 }

mec-client-api/src/main/java/com/ym/mec/im/fallback/WebFeignServiceFallback.java

@@ -24,7 +24,7 @@ public class WebFeignServiceFallback implements WebFeignService {
 	}
 
 	@Override
-	public int updateNickName(Integer userId, String nickName,String userType) {
+	public int updateNickName(Integer userId, String nickName,String userType,String avatar) {
 		return 0;
 	}
 }

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupRegisterController.java

@@ -72,6 +72,7 @@ public class MusicGroupRegisterController extends BaseController {
             return failed("乐团已截止报名");
         }
 
+        studentRegistration.setOrganId(musicGroup.getOrganId());
         if (studentRegistration.getId() != null) {
             return succeed(studentRegistrationService.updateStudent(studentRegistration));
         }
@@ -101,7 +102,6 @@ public class MusicGroupRegisterController extends BaseController {
             studentRegistration.setUserId(sysUser.getId());
         }
 
-        studentRegistration.setOrganId(musicGroup.getOrganId());
         return succeed(studentRegistrationService.addStudent(studentRegistration));
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/APIController.java

@@ -63,8 +63,8 @@ public class APIController extends BaseController {
 	}
 
 	@GetMapping("/updateNickName")
-	public int updateNickName(Integer userId,String nickName,String userType) {
-		return imGroupService.updateNickName(userId,nickName,userType);
+	public int updateNickName(Integer userId,String nickName,String userType,String avatar) {
+		return imGroupService.updateNickName(userId,nickName,userType,avatar);
 	}
 
 }

mec-web/src/main/java/com/ym/mec/web/controller/ImGroupController.java

@@ -79,8 +79,8 @@ public class ImGroupController extends BaseController {
 
 	@ApiOperation("修改群成员信息")
 	@PostMapping(value = "/updateNickName")
-	public Object updateNickName(Integer userId,String nickName,String userType) {
-		return succeed(imGroupService.updateNickName(userId,nickName,userType));
+	public Object updateNickName(Integer userId,String nickName,String userType,String avatar) {
+		return succeed(imGroupService.updateNickName(userId,nickName,userType,avatar));
 	}
 
 	@ApiOperation("查询群成员列表")

mec-web/src/main/java/com/ym/mec/web/controller/StudentInstrumentController.java

@@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.math.BigDecimal;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 @RequestMapping("studentInstrument")
@@ -80,6 +81,26 @@ public class StudentInstrumentController extends BaseController {
         if (studentInstrument.getStudentId() == null) {
             return failed("学生id不能为空");
         }
+        Date nowDate = new Date();
+        //不是乐保
+        if (studentInstrument.getStatus().equals(0)) {
+            studentInstrument.setStartTime(null);
+            studentInstrument.setEndTime(null);
+        }
+        if (studentInstrument.getStatus().equals(1)) {
+            if (studentInstrument.getStartTime() == null) {
+                return failed("乐保开始时间不能为空");
+            }
+            if (studentInstrument.getEndTime() == null) {
+                return failed("乐保结束时间不能为空");
+            }
+            if (studentInstrument.getStartTime().compareTo(nowDate) > 0) {
+                return failed("乐保开始时间不能大于当前时间");
+            }
+            if (studentInstrument.getEndTime().compareTo(nowDate) <= 0) {
+                return failed("乐保结束时间不能小于当前时间");
+            }
+        }
         studentInstrument.setOperation(sysUser.getId());
         SysUser student = sysUserFeignService.queryUserById(studentInstrument.getStudentId());
         studentInstrument.setOrganId(student.getOrganId());
@@ -114,6 +135,26 @@ public class StudentInstrumentController extends BaseController {
         if (studentInstrument.getStudentId() == null) {
             return failed("学生id不能为空");
         }
+        Date nowDate = new Date();
+        //不是乐保
+        if (studentInstrument.getStatus().equals(0)) {
+            studentInstrument.setStartTime(null);
+            studentInstrument.setEndTime(null);
+        }
+        if (studentInstrument.getStatus().equals(1)) {
+            if (studentInstrument.getStartTime() == null) {
+                return failed("乐保开始时间不能为空");
+            }
+            if (studentInstrument.getEndTime() == null) {
+                return failed("乐保结束时间不能为空");
+            }
+            if (studentInstrument.getStartTime().compareTo(nowDate) > 0) {
+                return failed("乐保开始时间不能大于当前时间");
+            }
+            if (studentInstrument.getEndTime().compareTo(nowDate) <= 0) {
+                return failed("乐保结束时间不能小于当前时间");
+            }
+        }
         studentInstrument.setOperation(sysUser.getId());
         SysUser student = sysUserFeignService.queryUserById(studentInstrument.getStudentId());
         studentInstrument.setOrganId(student.getOrganId());