Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUserRole.java

@@ -17,6 +17,8 @@ public class SysUserRole {
 	public static Integer ADMISSIONS_DIRECTOR = 6;
 	//教学主任
 	public static Integer DEAN_OF_STUDIES = 7;
+	//总部管理员
+	public static Integer ADMINISTRATOR = 25;
 
 	/** 用户ID */
 	@ApiModelProperty(value = "用户ID",required = false)

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/handler/BaseAuthenticationSuccessEventHandler.java

@@ -89,7 +89,7 @@ public class BaseAuthenticationSuccessEventHandler extends SavedRequestAwareAuth
 			if(StringUtils.isEmpty(name)){
 				name = sysUser.getUsername();
 			}
-			ImResult register = imFeignService.register(new ImUserModel(sysUser.getId().toString(), name, null));
+			ImResult register = imFeignService.register(new ImUserModel(sysUser.getId().toString(), name, sysUser.getAvatar()));
 			sysUser.setImToken(register.getToken());
 			sysUser.setUpdateTime(new Date());
 			sysUserService.update(sysUser);

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

@@ -3140,6 +3140,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         CourseSchedule courseSchedule = courseScheduleDao.get(courseScheduleComplaints.getCourseScheduleId());
         Set<Integer> roleIds = new HashSet<>(1);
         roleIds.add(SysUserRole.EDUCATIONAL_TEACHER);
+        roleIds.add(SysUserRole.OPERATION_EXECUTIVE);
+        roleIds.add(SysUserRole.SECTION_MANAGER);
+        roleIds.add(SysUserRole.ADMINISTRATOR);
         Map<String, Long> memo = new HashMap<>(1);
         memo.put("courseScheduleComplaintsId", courseScheduleComplaints.getId());
         sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds, user.getOrganId()), MessageTypeEnum.BACKSTAGE_STUDENT_APPEAL, JSONObject.toJSONString(memo), courseSchedule.getName(), user.getUsername());

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

@@ -233,9 +233,9 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 			// 更新订单状态
 			String[] statusArr = { "0", "1", "7" };
 			String responseParameters = queryRs.getResponseParameters();
-			List<Map<String, String>> responseList = JSON.parseObject(responseParameters, List.class);
-			for (Map<String, String> response : responseList) {
-				Map<String, String> rpMap = response;
+			List<Map<String, Object>> responseList = JSON.parseObject(responseParameters, List.class);
+			for (Map<String, Object> response : responseList) {
+				Map<String, Object> rpMap = response;
 				String channelType = rpMap.get("channelType").equals("1") ? "WXPay" : (rpMap.get("channelType").equals("2") ? "Alipay" : "quickPay");
 				rpMap.put("channelType", channelType);
 
@@ -246,7 +246,7 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 				if (Arrays.asList(statusArr).contains(rpMap.get("tradeState"))) {
 					try {
 						DealStatusEnum status = rpMap.get("tradeState").equals("1") ? DealStatusEnum.SUCCESS : DealStatusEnum.FAILED;
-						TenantPaymentOrder order = tenantPaymentOrderDao.findOrderByOrderNo(rpMap.get("merOrderNo"));
+						TenantPaymentOrder order = tenantPaymentOrderDao.findOrderByOrderNo(rpMap.get("merOrderNo").toString());
 						if (order == null || !order.getStatus().equals(DealStatusEnum.ING)) {
 							continue;
 						}
@@ -254,12 +254,12 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 						if (status.equals(DealStatusEnum.SUCCESS)) {
 							order.setPayTime(new Date());
 						} else {
-							order.setMemo(rpMap.get("remarks"));
+							order.setMemo(rpMap.get("remarks").toString());
 						}
 						order.setStatus(status);
-						order.setTransNo(rpMap.get("orderNo"));
+						order.setTransNo(rpMap.get("orderNo").toString());
 						order.setPaymentBusinessChannel(channelType);
-						order.setActualAmount(new BigDecimal(rpMap.get("totalMoney")));
+						order.setActualAmount(new BigDecimal(rpMap.get("totalMoney").toString()));
 						paymentForCallback(order);
 					} catch (Exception e) {
 						e.printStackTrace();