Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into dev

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/service/ImGroupMemberService.java
#	mec-biz/src/main/java/com/ym/mec/biz/service/im/impl/ImGroupCoreServiceImpl.java
#	mec-biz/src/main/java/com/ym/mec/biz/service/impl/EmployeeServiceImpl.java

mec-application/src/main/java/com/ym/mec/student/controller/PracticeGroupController.java

@@ -13,6 +13,7 @@ import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.enums.PracticeGroupType;
 import com.ym.mec.biz.service.PracticeGroupService;
+import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.biz.service.SysMessageService;
 import com.ym.mec.biz.service.SysUserService;
 import com.ym.mec.common.controller.BaseController;
@@ -276,7 +277,7 @@ public class PracticeGroupController extends BaseController {
     @GetMapping(value = "/freePush")
     public HttpResponseResult freePush(Integer userId, String pushType){
         sysUserService.getUser();
-        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL_MDAYA);
 
         String pushUrl = baseApiUrl + "/#/auditionbanner/id";
 
@@ -305,7 +306,7 @@ public class PracticeGroupController extends BaseController {
     @GetMapping(value = "/reportPush")
     public HttpResponseResult reportPush(Integer userId, String pushType){
         sysUserService.getUser();
-        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL_MDAYA);
         PracticeGroup userFreePracticeGroup = practiceGroupDao.getUserFreePracticeGroup(userId);
         ClassGroup classGroup = classGroupDao.findByMusicGroupAndType(userFreePracticeGroup.getId().toString(), GroupType.PRACTICE.getCode());
 
@@ -323,14 +324,14 @@ public class PracticeGroupController extends BaseController {
         if(pushType.equals("ALL")||pushType.equals("JIGUANG")){
             Map<Integer, String> userMap = new HashMap<>();
             userMap.put(userId, userId.toString());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_SMS_PUSH_PRACTICE_COMPLETED_STUDY_REPORT,
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_PRACTICE_COMPLETED_STUDY_REPORT,
                     userMap, null, 0, "5?" + pushUrl, "STUDENT", pushUrl);
         }
 
         if(pushType.equals("ALL")||pushType.equals("SMS")){
             Map<Integer, String> userPhoneMap = new HashMap<>();
             userPhoneMap.put(userId, student.getPhone());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_PUSH_PRACTICE_COMPLETED_STUDY_REPORT,
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_PRACTICE_COMPLETED_STUDY_REPORT,
                     userPhoneMap, null, 0, null, "STUDENT", HttpUtil.getSortUrl(smsUrl));
         }
 

mec-application/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -514,12 +514,12 @@ public class StudentOrderController extends BaseController {
         return succeed();
     }
 
-    @RequestMapping("${app-config.url.student:}/paymentResult")
+    @RequestMapping("/paymentResult")
     public void paymentResult(HttpServletResponse response, String orderNo, String type) {
         try {
-            String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
+            String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL_MDAYA);
             if (type != null && type.equals("edu")) {
-                baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.EDU_TEACHER_BASE_URL);
+                baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.EDU_TEACHER_BASE_URL_MANAGER);
             }
             response.sendRedirect(baseApiUrl + "/#/paymentresult?orderNo=" + orderNo);
         } catch (IOException e) {

mec-application/src/main/java/com/ym/mec/teacher/controller/StudyReportController.java

@@ -41,7 +41,7 @@ public class StudyReportController extends BaseController {
     @GetMapping("getGroupReviews")
     public Object getGroupReviews(Integer groupId) {
         List<CourseScheduleEvaluate> courseScheduleEvaluates = courseScheduleEvaluateService.findByGroupId(groupId,null);
-        String teacherBaseUrl = sysConfigDao.findConfigValue(SysConfigService.TEACHER_BASE_URL);
+        String teacherBaseUrl = sysConfigDao.findConfigValue(SysConfigService.TEACHER_BASE_URL_MTEACHER);
         for (CourseScheduleEvaluate courseScheduleEvaluate : courseScheduleEvaluates) {
             courseScheduleEvaluate.setReportLink(teacherBaseUrl + "/#/studyReportNew?id=" + courseScheduleEvaluate.getId() + "&classGroupId=" + courseScheduleEvaluate.getClassGroupId());
             if (courseScheduleEvaluate.getStatus().equals(1) && courseScheduleEvaluate.getVersion().equals(2)) {

mec-application/src/main/java/com/ym/mec/teacher/controller/TeacherOrderController.java

@@ -3,6 +3,7 @@ package com.ym.mec.teacher.controller;
 import com.ym.mec.biz.dal.dao.SysConfigDao;
 import com.ym.mec.biz.dal.dao.TenantPaymentOrderDao;
 import com.ym.mec.biz.dal.entity.TenantPaymentOrder;
+import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.biz.service.TenantPaymentOrderService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.thirdparty.yqpay.YqPayFeignService;
@@ -34,7 +35,7 @@ public class TeacherOrderController extends BaseController {
 	@RequestMapping("paymentResult")
 	public void paymentResult(HttpServletResponse response, String orderNo) {
 		try {
-			String baseApiUrl = sysConfigDao.findConfigValue("teacher_base_url");
+			String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.TEACHER_BASE_URL_MTEACHER);
 			response.sendRedirect(baseApiUrl + "/#/paymentresult?orderNo=" + orderNo);
 		} catch (IOException e) {
 			e.printStackTrace();

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

@@ -194,7 +194,7 @@ public class APIController extends BaseController {
 	@GetMapping("/getRefundInfo")
 	public HttpResponseResult<Map<String,String>> getBaseUrl(@RequestParam String orderNo) {
 
-		SysConfig baseApiUrl = sysConfigService.findByParamName("base_api_url");
+		SysConfig baseApiUrl = sysConfigService.findByParamName(SysConfigService.BASE_API_URL);
 		StudentPaymentOrder orderByOrderNo = studentPaymentOrderService.findOrderByOrderNo(orderNo);
 		Map<String,String> result = new HashMap<>();
 		result.put("transNo",orderByOrderNo.getTransNo());

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

@@ -389,4 +389,11 @@ public class ImGroupController extends BaseController {
         return succeed();
     }
 
+	@ApiOperation("主动退群")
+	@PostMapping(value = "/quitGroup/v2")
+	public Object quitGroupV2(String imGroupId, String userId) {
+		List<Integer> userIds = Arrays.stream(userId.split(",")).mapToInt(Integer::valueOf).boxed().collect(Collectors.toList());
+		return succeed(imGroupMemberService.quit(imGroupId,userIds,false));
+	}
+
 }

mec-application/src/main/java/com/ym/mec/web/controller/ReplacementInstrumentActivityController.java

@@ -94,14 +94,14 @@ public class ReplacementInstrumentActivityController extends BaseController {
             Map<Integer, String> userMap = new HashMap<>();
             Map<Integer, String> userPhoneMap = new HashMap<>();
             Integer userId = oldReplacementInstrumentActivity.getUserId();
-            String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+            String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL_MDAYA);
             String pushUrl = baseApiUrl + "/#/questionGoodsSale?id=";
             userMap.put(userId, userId.toString());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_SMS_PUSH_REPLACEMENT_PAY,
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_REPLACEMENT_PAY,
                     userMap, null, 0, "5?" + pushUrl + replacementInstrumentActivity.getId(), "STUDENT", goods.getBrand(), "");
 
             userPhoneMap.put(userId, oldReplacementInstrumentActivity.getMobileNo());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_PUSH_REPLACEMENT_PAY,
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_REPLACEMENT_PAY,
                     userPhoneMap, null, 0, null, null, goods.getBrand(), HttpUtil.getSortUrl(pushUrl + replacementInstrumentActivity.getId()));
         }
 
@@ -132,14 +132,14 @@ public class ReplacementInstrumentActivityController extends BaseController {
             Map<Integer, String> userMap = new HashMap<>();
             Map<Integer, String> userPhoneMap = new HashMap<>();
             Integer userId = replacementInstrumentActivity.getUserId();
-            String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+            String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL_MDAYA);
             String pushUrl = baseApiUrl + "/#/questionGoodsSale?id=";
             userMap.put(userId, userId.toString());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_SMS_PUSH_REPLACEMENT_PAY,
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_REPLACEMENT_PAY,
                     userMap, null, 0, "5?" + pushUrl + replacementInstrumentActivity.getId(), "STUDENT", goods.getBrand(), "");
 
             userPhoneMap.put(userId, replacementInstrumentActivity.getMobileNo());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_PUSH_REPLACEMENT_PAY,
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_REPLACEMENT_PAY,
                     userPhoneMap, null, 0, null, null, goods.getBrand(), HttpUtil.getSortUrl(pushUrl + replacementInstrumentActivity.getId()));
         }
 

mec-application/src/main/java/com/ym/mec/web/controller/SchoolMessageController.java

@@ -47,7 +47,7 @@ public class SchoolMessageController extends BaseController {
         if(CollectionUtils.isNotEmpty(pageInfo.getRows())){
             pageInfo.getRows().forEach(sysMessage -> {
                 SysMessage message = new SysMessage();
-                message.setId(sysMessage.getId());
+                message.setId(sysMessage.getId().toString());
                 message.setTitle(sysMessage.getTitle());
                 message.setContent(sysMessage.getContent());
                 if(sysMessage.getSendMode() != null){

mec-application/src/main/java/com/ym/mec/web/controller/SysMessageController.java

@@ -49,9 +49,7 @@ public class SysMessageController extends BaseController {
 	@GetMapping(value = "list")
 	public Object list(SysMessageQueryInfo queryInfo){
 		SysUser sysUser = sysUserService.getUser();
-		if(!sysUser.getIsSuperAdmin()){
-			queryInfo.setUserId(sysUser.getId());
-		}
+		queryInfo.setUserId(sysUser.getId());
 		queryInfo.setType(MessageSendMode.SEO.getCode());
 		com.microsvc.toolkit.common.response.paging.PageInfo<CbsMessageWrapper.SysMessage> pageInfo = sysMessageService.queryListPage(queryInfo).feignData();
 
@@ -59,7 +57,7 @@ public class SysMessageController extends BaseController {
 		if(org.apache.commons.collections.CollectionUtils.isNotEmpty(pageInfo.getRows())){
 			pageInfo.getRows().forEach(sysMessage -> {
 				SysMessage message = new SysMessage();
-				message.setId(sysMessage.getId());
+				message.setId(sysMessage.getId().toString());
 				message.setTitle(sysMessage.getTitle());
 				message.setContent(sysMessage.getContent());
 				if(sysMessage.getSendMode() != null){

mec-application/src/main/java/com/ym/mec/web/controller/TenantInfoController.java

@@ -82,7 +82,7 @@ public class TenantInfoController extends BaseController {
         String pw = WrapperUtil.toStr(openPar, "pw");
         TenantInfo tenantInfo = (TenantInfo) openPar.get("tenantInfo");
         if (StringUtils.isNotBlank(pw) && Objects.nonNull(tenantInfo)) {
-            Object[] msg = {tenantInfo.getName(), tenantInfo.getPhone(), pw, "https://online.dayaedu.com"};
+            Object[] msg = {tenantInfo.getName(), tenantInfo.getPhone(), pw, "https://gym.lexiaoya.cn"};
             tenantInfoSendMsgService.platformSendToAll(OPEN, tenantInfo.getUserId(), tenantInfo.getEmail(), tenantInfo.getPhone(), msg);
         }
         return succeed();

mec-application/src/main/java/com/ym/mec/web/controller/education/EduSendNoticeController.java

@@ -46,7 +46,7 @@ public class EduSendNoticeController extends BaseController {
     @ApiOperation(value = "发送IM")
     @PostMapping(value = "/im")
     public HttpResponseResult im(@RequestBody PushInfoDto pushInfo) {
-        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.EDU_TEACHER_BASE_URL);
+        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.EDU_TEACHER_BASE_URL_MANAGER);
         String workOrderUrl = baseApiUrl + pushInfo.getWorkOrderUrl();
         String msg = pushInfo.getImContent() + " " + workOrderUrl;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/config/AdapayNotifyConstants.java

@@ -2,12 +2,12 @@ package com.ym.mec.biz.dal.config;
 
 public class AdapayNotifyConstants {
 	
-	public static String corp_member_notify_url_test = "https://test.dayaedu.com/api-web/{}/callback";
+	public static String corp_member_notify_url_test = "https://test.gym.lexiaoya.cn/api-web/{}/callback";
 
-	public static String corp_member_notify_url_prod = "https://online.dayaedu.com/api-web/{}/callback";
+	public static String corp_member_notify_url_prod = "https://gym.lexiaoya.cn/api-web/{}/callback";
 	
-	public static String student_payment_notify_url_test = "https://mstutest.dayaedu.com/api-student/studentOrder/callback";
+	public static String student_payment_notify_url_test = "https://test.gym.lexiaoya.cn/api-student/studentOrder/callback";
 	
-	public static String student_payment_notify_url_prod = "https://mstuonline.dayaedu.com/api-student/studentOrder/callback";
+	public static String student_payment_notify_url_prod = "https://gym.lexiaoya.cn/api-student/studentOrder/callback";
 
 }

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

@@ -17,52 +17,32 @@ import java.util.Date;
 @TableName("im_group_member")
 public class ImGroupMemberPlus implements Serializable {
 
-    /**
-     *
-     */
     @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
 
-    /**
-     *
-     */
     @TableField(value = "im_group_id_")
     private String imGroupId;
 
-    /**
-     *
-     */
     @TableField(value = "user_id_")
     private Integer userId;
 
     @TableField(value = "nickname_")
     private String nickname;
 
-    /**
-     * 群昵称
-     */
     @TableField(exist = false)
     private String groupNickname;
 
-    /**
-     * 是否是管理员
-     */
     @ApiModelProperty("是否是管理员")
     @TableField(value = "is_admin_")
     private Boolean isAdmin;
 
-    /**
-     * 群角色
-     */
     @TableField(value = "role_type_")
     private String roleType;
 
     @ApiModelProperty(value = "第三方群角色")
     @TableField(value = "group_role_type_")
     private String groupRoleType;
-    /**
-     * 群角色
-     */
+
     @TableField(value = "type_")
     private String type;
 
@@ -75,21 +55,12 @@ public class ImGroupMemberPlus implements Serializable {
     @TableField(exist = false)
     private String subjectId;
 
-    /**
-     * 头像
-     */
     @TableField(exist = false)
     private String avatar;
 
-    /**
-     *
-     */
     @TableField(value = "create_time_")
     private Date createTime;
 
-    /**
-     *
-     */
     @TableField(value = "update_time_")
     private Date updateTime;
 

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

@@ -14,7 +14,7 @@ import com.ym.mec.common.entity.BaseEntity;
 public class SysMessage extends BaseEntity {
 
 	/** 主键 */
-	private Long id;
+	private String id;
 
     private Integer messageConfigId;
 	
@@ -98,11 +98,11 @@ public class SysMessage extends BaseEntity {
 		this.memo = memo;
 	}
 
-	public void setId(Long id){
+	public void setId(String id){
 		this.id = id;
 	}
 	
-	public Long getId(){
+	public String getId(){
 		return this.id;
 	}
 			

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

@@ -14,7 +14,9 @@ public enum EFriendRoleType implements BaseEnum<Integer, EFriendRoleType> {
     MAINTENANCE_TECHNICIAN(6,"维护技师"),
     ORCHESTRA_TEACHER(7,"指导老师"),
     STUDENT(8,"学生"),
-    UNDEFINE(9,""),
+    BAND_DIRECTOR(9,"乐队指导"),
+    BRIDGING_TEACHER(10,"衔接老师"),
+    UNDEFINE(11,""),
 
 
     ;
@@ -40,12 +42,15 @@ public enum EFriendRoleType implements BaseEnum<Integer, EFriendRoleType> {
                 return SCHOOL_TEACHER;
             case "STUDENT":
                 return STUDENT;
+            case "BRIDGING_TEACHER":
+                return BRIDGING_TEACHER;
+            case "BAND_DIRECTOR":
+                return BAND_DIRECTOR;
             case "乐团主管":
             case "ORCHESTRA_MANAGER":
                 return ORCHESTRA_MANAGER;
             case "指导老师":
                 return ORCHESTRA_TEACHER;
-
             case "校长":
                 return SCHOOLMASTER;
             case "乐团领队":
@@ -56,9 +61,13 @@ public enum EFriendRoleType implements BaseEnum<Integer, EFriendRoleType> {
                 return SCHOOL_TEACHER;
             case "维护技师":
                 return SCHOOL_TEACHER;
+            case "衔接老师":
+                return BRIDGING_TEACHER;
+            case "乐队指导":
+                return BAND_DIRECTOR;
             default:
-//                return STUDENT;
-                return UNDEFINE;
+                return STUDENT;
+//                return UNDEFINE;
         }
     }
 

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

@@ -10,6 +10,7 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     SMS_STUDENT_MEMBER_RENEW_MESSAGE("SMS_STUDENT_MEMBER_RENEW_MESSAGE", "会员续费提醒"),
     PUSH_STUDENT_MEMBER_RENEW_MESSAGE("STUDENT_MEMBER_RENEW_MESSAGE", "会员续费提醒"),
     PUSH_EXPERIENCE_MEMBERSHIP_MESSAGE("PUSH_EXPERIENCE_MEMBERSHIP_MESSAGE", "会员试用提醒"),
+    SMS_EXPERIENCE_MEMBERSHIP_MESSAGE("SMS_EXPERIENCE_MEMBERSHIP_MESSAGE", "会员试用提醒"),
     SMS_AUTO_STUDENT_MEMBER_RENEW_MESSAGE("SMS_AUTO_STUDENT_MEMBER_RENEW_MESSAGE", "会员续费提醒"),
     PUSH_AUTO_STUDENT_MEMBER_RENEW_MESSAGE("PUSH_AUTO_STUDENT_MEMBER_RENEW_MESSAGE", "会员续费提醒"),
 //    STUDENT_MEMBER_RENEW_QUIT_MESSAGE("STUDENT_MEMBER_RENEW_QUIT_MESSAGE", "会员续费提醒"),
@@ -33,7 +34,8 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     PUSH_STUDENT_BUY_ACTIVITY("PUSH_STUDENT_BUY_ACTIVITY", "活动购买成功"),
     PUSH_SYSTEM_ACTIVITY_COURSE("PUSH_SYSTEM_ACTIVITY_COURSE", "待排课通知"),
     PUSH_TEACHER_ACTIVITY_COURSE("PUSH_TEACHER_ACTIVITY_COURSE", "待排课通知"),
-    STUDENT_SMS_PUSH_PAYMENT_SUCCESS("STUDENT_SMS_PUSH_PAYMENT_SUCCESS", "缴费成功结果通知"),
+    STUDENT_SMS_PAYMENT_SUCCESS("STUDENT_SMS_PAYMENT_SUCCESS", "缴费成功结果通知"),
+    STUDENT_PUSH_PAYMENT_SUCCESS("STUDENT_PUSH_PAYMENT_SUCCESS", "缴费成功结果通知"),
     STUDENT_SMS_BALANCE_CONSUME("STUDENT_SMS_BALANCE_CONSUME", "余额消费"),
     STUDENT_PUSH_VIP_BUY("STUDENT_PUSH_VIP_BUY", "VIP课购买"),
     STUDENT_PUSH_LIVE_BUY("STUDENT_PUSH_LIVE_BUY", "直播课购买"),
@@ -50,7 +52,7 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     STUDENT_PUSH_JOB_MESSAGE_EXTRA_V2("STUDENT_PUSH_JOB_MESSAGE_EXTRA_V2", "训练提醒"),
     //    STUDENT_PUSH_CLASS_MESSAGE("STUDENT_PUSH_CLASS_MESSAGE", "班级消息"),
     TEACHER_PUSH_MUSIC_GROUP_COURSE_ADD_PLAN("TEACHER_PUSH_MUSIC_GROUP_COURSE_ADD_PLAN", "乐团课新增安排"),
-    TEACHER_SMS_PUSH_VIP_COURSE_APPLY_RESULT("TEACHER_SMS_PUSH_VIP_COURSE_APPLY_RESULT", "VIP课申请结果"),
+    TEACHER_SMS_VIP_COURSE_APPLY_RESULT("TEACHER_SMS_VIP_COURSE_APPLY_RESULT", "VIP课申请结果"),
     TEACHER_SMS_VIP_COURSE_ADD("TEACHER_SMS_VIP_COURSE_ADD", "VIP课新增"),
     TEACHER_PUSH_VIP_COURSE_STOP("TEACHER_PUSH_VIP_COURSE_STOP", "VIP课停止"),
     TEACHER_PUSH_LIVE_COURSE_STOP("TEACHER_PUSH_LIVE_COURSE_STOP", "直播课停止"),
@@ -78,12 +80,16 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     TEACHER_PUSH_VIP_STOP("TEACHER_PUSH_VIP_STOP", "VIP课取消"),
     STUDENT_SMS_OPEN_PAYMENT("STUDENT_SMS_OPEN_PAYMENT", "开启缴费"),
     //    SMS_MUSIC_GROUP_ADD_STUDENT_FREE("SMS_MUSIC_GROUP_ADD_STUDENT_FREE", "入团通知"),
-    STUDENT_SMS_PUSH_SPORADIC_PAYMENT_SUCCESS("STUDENT_SMS_PUSH_SPORADIC_PAYMENT_SUCCESS", "零星支付成功结果"),
-    STUDENT_SMS_PUSH_SPORADIC_PAYMENT_FAILED("STUDENT_SMS_PUSH_SPORADIC_PAYMENT_FAILED", "零星支付失败结果"),
+    STUDENT_PUSH_SPORADIC_PAYMENT_SUCCESS("STUDENT_PUSH_SPORADIC_PAYMENT_SUCCESS", "零星支付成功结果"),
+    STUDENT_SMS_SPORADIC_PAYMENT_SUCCESS("STUDENT_SMS_SPORADIC_PAYMENT_SUCCESS", "零星支付成功结果"),
+    STUDENT_SMS_SPORADIC_PAYMENT_FAILED("STUDENT_SMS_SPORADIC_PAYMENT_FAILED", "零星支付失败结果"),
+    STUDENT_PUSH_SPORADIC_PAYMENT_FAILED("STUDENT_PUSH_SPORADIC_PAYMENT_FAILED", "零星支付失败结果"),
     TEACHER_PUSH_COURSE_COLLIDE("TEACHER_PUSH_COURSE_COLLIDE", "课程冲突"),
     //    PUSH_STUDY_REPORT("PUSH_STUDY_REPORT", "陪练报告"),
-    STUDENT_SMS_PUSH_PAY_PRACTICE_BUY_SUCCESS("STUDENT_SMS_PUSH_PAY_PRACTICE_BUY_SUCCESS", "网管课购买成功"),
-    STUDENT_SMS_PUSH_PRACTICE_COMPLETED_STUDY_REPORT("STUDENT_SMS_PUSH_PRACTICE_COMPLETED_STUDY_REPORT", "网管课完成学习报告"),
+    STUDENT_SMS_PAY_PRACTICE_BUY_SUCCESS("STUDENT_SMS_PAY_PRACTICE_BUY_SUCCESS", "网管课购买成功"),
+    STUDENT_PUSH_PAY_PRACTICE_BUY_SUCCESS("STUDENT_PUSH_PAY_PRACTICE_BUY_SUCCESS", "网管课购买成功"),
+    STUDENT_PUSH_PRACTICE_COMPLETED_STUDY_REPORT("STUDENT_PUSH_PRACTICE_COMPLETED_STUDY_REPORT", "网管课完成学习报告"),
+    STUDENT_SMS_PRACTICE_COMPLETED_STUDY_REPORT("STUDENT_SMS_PRACTICE_COMPLETED_STUDY_REPORT", "网管课完成学习报告"),
     STUDENT_SMS_PUSH_FREE_PRACTICE_APPLY_PUSH("STUDENT_SMS_PUSH_FREE_PRACTICE_APPLY_PUSH", "免费陪练课预约推送"),
     TEACHER_PUSH_NEED_POST_STUDY_REPORT("TEACHER_PUSH_NEED_POST_STUDY_REPORT", "新增待填写月报"),
     STUDENT_PUSH_HOMEWORK_REMIND("STUDENT_PUSH_HOMEWORK_REMIND", "训练提醒-网管课"),
@@ -125,7 +131,8 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     TEACHER_PUSH_COURSE_SALARY_COMPLAINTS_RESULT("TEACHER_PUSH_COURSE_SALARY_COMPLAINTS_RESULT", "课酬申述结果"),
     TEACHER_PUSH_SALARY_CONFIRM("TEACHER_PUSH_SALARY_CONFIRM", "课酬确认"),
     STUDENT_PUSH_TRIAL_PRACTICE_CREATE("STUDENT_PUSH_TRIAL_PRACTICE_CREATE", "试听课安排"),
-    TEACHER_SMS_PUSH_PRACTICE_CREATE("TEACHER_SMS_PUSH_PRACTICE_CREATE", "新增网管课程"),
+    TEACHER_SMS_PRACTICE_CREATE("TEACHER_SMS_PRACTICE_CREATE", "新增网管课程"),
+    TEACHER_PUSH_PRACTICE_CREATE("TEACHER_PUSH_PRACTICE_CREATE", "新增网管课程"),
     STUDENT_PUSH_REPAIR_UNSEND_COMPLETED("STUDENT_PUSH_REPAIR_UNSEND_COMPLETED", "乐器维修完成自取"),
     STUDENT_PUSH_REPAIR_SEND_COMPLETED("STUDENT_PUSH_REPAIR_SEND_COMPLETED", "乐器维修完成邮寄"),
     STUDENT_PUSH_REPAIR_ONLINE_PAYMENT_SUCCESS("STUDENT_PUSH_REPAIR_ONLINE_PAYMENT_SUCCESS", "乐器线上维修支付成功"),
@@ -148,13 +155,15 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     TEACHER_PUSH_SERVE("TEACHER_PUSH_SERVE", "服务指标未完成提醒"),
     STUDENT_PUSH_MAINTENANCE_NOTICE("STUDENT_PUSH_MAINTENANCE_NOTICE", "乐保到期提醒"),
     TEACHER_IM_STUDENT_LEAVE("TEACHER_IM_STUDENT_LEAVE", "学员请假"),
-    STUDENT_SMS_PUSH_REPLACEMENT_PAY("STUDENT_SMS_PUSH_REPLACEMENT_PAY", "乐器置换支付提醒"),
+    STUDENT_SMS_REPLACEMENT_PAY("STUDENT_SMS_REPLACEMENT_PAY", "乐器置换支付提醒"),
+    STUDENT_PUSH_REPLACEMENT_PAY("STUDENT_PUSH_REPLACEMENT_PAY", "乐器置换支付提醒"),
     TEACHER_PUSH_INCOME_REMIND("TEACHER_PUSH_INCOME_REMIND", "今日收入"),
     STUDENT_PUSH_PAYMENT_RESULT("STUDENT_PUSH_PAYMENT_RESULT", "缴费结果"),
     STUDENT_PUSH_MUSIC_GROUP_CLOSE("STUDENT_PUSH_MUSIC_GROUP_CLOSE", "乐团关闭(确认后)"),
     STUDENT_PUSH_BASICS_SKILL_APPLY_MESSAGE("STUDENT_PUSH_BASICS_SKILL_APPLY_MESSAGE", "基础技能训练报名通知"),
     STUDENT_PUSH_WAIT_RENEW_MESSAGE("STUDENT_PUSH_WAIT_RENEW_MESSAGE", "待续费通知"),
-    STUDENT_SMS_PUSH_MUSIC_GROUP_RENEW_SUCCESS("STUDENT_SMS_PUSH_MUSIC_GROUP_RENEW_SUCCESS", "乐团续费成功结果"),
+    STUDENT_SMS_MUSIC_GROUP_RENEW_SUCCESS("STUDENT_SMS_MUSIC_GROUP_RENEW_SUCCESS", "乐团续费成功结果"),
+    STUDENT_PUSH_MUSIC_GROUP_RENEW_SUCCESS("STUDENT_PUSH_MUSIC_GROUP_RENEW_SUCCESS", "乐团续费成功结果"),
     STUDENT_PUSH_BALANCE_CONSUME("STUDENT_PUSH_BALANCE_CONSUME", "余额消费"),
     STUDENT_PUSH_ATTEND_COURSE_MESSAGE("STUDENT_PUSH_ATTEND_COURSE_MESSAGE", "上课提醒"),
     STUDENT_PUSH_TEACHING_SCHOOL_CHANGE("STUDENT_PUSH_TEACHING_SCHOOL_CHANGE", "教学点变动"),

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/ImGroupMemberWrapper.java

@@ -97,6 +97,9 @@ public class ImGroupMemberWrapper {
         @ApiModelProperty("群角色TEACHER老师、STUDENT学生")
         private String roleType;
 
+        @ApiModelProperty(value = "群角色")
+        private String type;
+
         @ApiModelProperty("修改时间")
         private Date updateTime;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/SysMessageWrapper.java

@@ -0,0 +1,70 @@
+package com.ym.mec.biz.dal.wrapper;
+
+import com.ym.mec.biz.dal.enums.MessageSendMode;
+import com.ym.mec.biz.dal.enums.SendStatusEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+public class SysMessageWrapper {
+
+    @Data
+    public static class Message {
+
+        /** 主键 */
+        private String id;
+
+        private Integer messageConfigId;
+
+        /** 标题 */
+        @ApiModelProperty(value = "标题",required = false)
+        private String title;
+
+        /** 消息内容 */
+        @ApiModelProperty(value = "消息内容",required = false)
+        private String content;
+
+        /** 消息类型；1，表示短信；2，表示邮件; 3,app推送消息 */
+        @ApiModelProperty(value = "消息类型",required = false)
+        private MessageSendMode type;
+
+        /** 状态，-1,发送失败;0,待发送;1,发送中;2,发送完成 */
+        @ApiModelProperty(value = "状态",required = false)
+        private SendStatusEnum status;
+
+        /** 接收人(多个人用逗号分隔) */
+        @ApiModelProperty(value = "接收人(多个人用逗号分隔)",required = false)
+        private String receiver;
+
+        /** 发送时间 */
+        @ApiModelProperty(value = "发送时间",required = false)
+        private java.util.Date sendTime;
+
+        /** 错误信息 */
+        @ApiModelProperty(value = "错误信息",required = false)
+        private String errorMsg;
+
+        /** 创建时间 */
+        private java.util.Date createOn;
+
+        /** 修改时间 */
+        private java.util.Date modifyOn;
+
+        /** 用户编号 */
+        @ApiModelProperty(value = "用户编号",required = false)
+        private Integer userId;
+
+        /** 备注 */
+        @ApiModelProperty(value = "备注",required = false)
+        private String memo;
+
+        /** 是否已读 */
+        @ApiModelProperty(value = "是否已读",required = false)
+        private Integer readStatus;
+
+        @ApiModelProperty(value = "消息组",required = false)
+        private String group;
+
+        @ApiModelProperty(value = "极光推送客户端标识",required = false)
+        private String jpushType;
+    }
+}

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

@@ -9,6 +9,7 @@ import com.ym.mec.biz.dal.page.GroupMemberQueryInfo;
 import com.ym.mec.biz.dal.wrapper.ImGroupMemberWrapper;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -64,16 +65,9 @@ public interface ImGroupMemberService extends BaseService<Long, ImGroupMember> {
 	 */
 	boolean quit(String imGroupId, List<Integer> userIdList);
 
+    boolean quit(String imGroupId, List<Integer> userIdList, Boolean quit);
 
     /**
-     * 用户批量退出群组
-     * @param imGroupId 群组编号
-     * @param userIdList 学生编号
-     * @return
-     */
-    boolean quit(String imGroupId, List<Integer> userIdList,Boolean quit);
-
-	/**
 	 * 修改角色类型
 	 * @param imGroupId 群组编号
 	 * @param userId 用户编号

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

@@ -198,6 +198,7 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
 
 
     public static final String BASE_API_URL = "base_api_url";
+    public static final String BASE_API_URL_MDAYA = "base_api_url_mdaya";
 
     /**
      * 缴费状态提前{}天刷新
@@ -320,6 +321,8 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
      */
     String TEACHER_BASE_URL = "teacher_base_url";
 
+    String TEACHER_BASE_URL_MTEACHER = "teacher_base_url_mteacher";
+
     String PRACTICE_PROMOTION_ACTIVITY_START_DATE = "practice_promotion_activity_start_date";
 
     String NEW_MSG_PUSH = "您收到一条训练回复，请点击查看";
@@ -328,6 +331,7 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
      * @describe 教务端baseUrl
      */
     String EDU_TEACHER_BASE_URL = "edu_teacher_base_url";
+    String EDU_TEACHER_BASE_URL_MANAGER = "edu_teacher_base_url_manager";
 
     String HOLIDAY_SETTING = "holiday_setting";
 

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

@@ -9,6 +9,9 @@ import com.ym.mec.biz.dal.entity.SysMessage;
 import com.ym.mec.biz.dal.enums.MessageSendMode;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.page.SysMessageQueryInfo;
+import com.ym.mec.biz.dal.wrapper.SysMessageWrapper;
+import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext.MessageSender;
 
@@ -147,13 +150,6 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	public String getSendedVerificationCode(MessageTypeEnum type, String mobileNOOrEmailAddr);
 
 	/**
-	 * 删除已有的key
-	 * @param type
-	 * @param mobileNOOrEmailAddr
-	 */
-	public void delSendedVerificationCode(MessageTypeEnum type, String mobileNOOrEmailAddr);
-
-	/**
 	 * 查询消息未读条数
 	 * @param type
 	 * @param userId
@@ -199,4 +195,7 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 
 	//获取短信验证码
 	R<com.microsvc.toolkit.common.response.paging.PageInfo<CbsMessageWrapper.SysMessage>> queryMessageCode(SysMessageVo.SysMessageQuery query);
+
+
+    PageInfo<SysMessageWrapper.Message> queryPage(SysMessageQueryInfo queryInfo);
 }

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

@@ -7,6 +7,7 @@ import com.google.common.collect.Lists;
 import com.microsvc.toolkit.common.tools.ThreadPool;
 import com.microsvc.toolkit.middleware.im.ImPluginContext;
 import com.microsvc.toolkit.middleware.im.message.GroupMemberWrapper;
+import com.microsvc.toolkit.middleware.im.message.TencentWrapper;
 import com.ym.mec.biz.dal.dao.ImGroupNoticeDao;
 import com.ym.mec.biz.dal.entity.ImGroupMemberPlus;
 import com.ym.mec.biz.dal.entity.ImGroupPlus;
@@ -183,8 +184,24 @@ public class ImGroupCoreServiceImpl implements ImGroupCoreService {
 
         if (userInfo != null) {
             // 添加群成员到当前群组
-            imPluginContext.getPluginService().groupJoin(imGroup.getGroupId(), imGroup.getName(),
-                    getImGroupMembers(groupMembers));
+            List<GroupMemberWrapper.ImGroupMember> imGroupMembers = getImGroupMembers(groupMembers);
+            imPluginContext.getPluginService().groupJoin(imGroup.getGroupId(), imGroup.getName(),imGroupMembers);
+            //设置管理员
+            groupMembers.stream().filter(o -> StringUtils.isNotEmpty(o.getGroupRoleType()) && !StringUtils.equals(o.getGroupRoleType(),"Member")).forEach(o -> {
+                try {
+                    imPluginContext.getPluginService().groupAdminCreate(o.getGroupId(), o.getImUserId());
+                } catch (Exception e) {
+                    log.error("groupAdminCreate error", e);
+                }
+            });
+            //转让群主
+            imGroupMembers.stream().filter(GroupMemberWrapper.ImGroupMember::getIsAdmin).forEach(o -> {
+                try {
+                    changeGroupOwner(imGroup.getGroupId(), o.getImUserId(), null);
+                } catch (Exception e) {
+                    log.error("changeGroupOwner error", e);
+                }
+            });
         }
         return group.getId();
     }
@@ -457,18 +474,25 @@ public class ImGroupCoreServiceImpl implements ImGroupCoreService {
             // 过滤出需要添加到群组的成员
             groupMembers = groupMembers.stream().filter(ImGroupMemberWrapper.ImGroupMember::getGroupJoin).collect(Collectors.toList());
             // 添加群成员到当前群组
-            imPluginContext.getPluginService().groupJoin(imGroup.getId(), imGroup.getName(), getImGroupMembers(groupMembers));
-            // 设置管理员
-            for (ImGroupMemberWrapper.ImGroupMember groupMember : groupMembers) {
-                if (groupMember.getGroupRoleType() != null) {
-                    if(groupMember.getGroupRoleType().equals(EImGroupRoleType.Admin.getCode())){
-                        imPluginContext.getPluginService().groupAdminCreate(imGroup.getId(),groupMember.getImUserId());
-                    }
-                    if(groupMember.getGroupRoleType().equals(EImGroupRoleType.Owner.getCode())){
-                        imPluginContext.getPluginService().changeGroupOwner(imGroup.getId(),groupMember.getImUserId(),null);
-                    }
+            List<GroupMemberWrapper.ImGroupMember> imGroupMembers = getImGroupMembers(groupMembers);
+            imPluginContext.getPluginService().groupJoin(imGroup.getId(), imGroup.getName(), imGroupMembers);
+            //设置管理员
+            groupMembers.stream().filter(o -> StringUtils.isNotEmpty(o.getGroupRoleType()) && !StringUtils.equals(o.getGroupRoleType(),"Member")).forEach(o -> {
+                try {
+                    imPluginContext.getPluginService().groupAdminCreate(imGroupId, o.getImUserId());
+                } catch (Exception e) {
+                    log.error("groupAdminCreate error", e);
                 }
-            }
+            });
+            //转让群主
+            imGroupMembers.stream().filter(GroupMemberWrapper.ImGroupMember::getIsAdmin).forEach(o -> {
+                try {
+                    changeGroupOwner(imGroup.getId(), o.getImUserId(), null);
+                } catch (Exception e) {
+                    log.error("changeGroupOwner error", e);
+                }
+            });
+
             // 自动激活用户
             asyncRegisterUser(groupMembers);
         }
@@ -490,26 +514,30 @@ public class ImGroupCoreServiceImpl implements ImGroupCoreService {
         if (Objects.isNull(imGroup)) {
             throw new BizException("群组不存在");
         }
-
         // 添加群组成员信息
         if (CollectionUtils.isEmpty(groupMembers)) {
             // 群成员为空，直接忽略
             return;
         }
-
         // 添加群成员到当前群组
-        imPluginContext.getPluginService().groupJoin(imGroup.getId(), imGroup.getName(), getImGroupMembers(groupMembers));
-        // 设置管理员
-        for (ImGroupMemberWrapper.ImGroupMember groupMember : groupMembers) {
-            if (groupMember.getGroupRoleType() != null) {
-                if(groupMember.getGroupRoleType().equals(EImGroupRoleType.Admin.getCode())){
-                    imPluginContext.getPluginService().groupAdminCreate(imGroup.getId(),groupMember.getImUserId());
-                }
-                if(groupMember.getGroupRoleType().equals(EImGroupRoleType.Owner.getCode())){
-                    imPluginContext.getPluginService().changeGroupOwner(imGroup.getId(),groupMember.getImUserId(),null);
-                }
+        List<GroupMemberWrapper.ImGroupMember> imGroupMembers = getImGroupMembers(groupMembers);
+        imPluginContext.getPluginService().groupJoin(imGroup.getId(), imGroup.getName(),imGroupMembers);
+        //设置管理员
+        groupMembers.stream().filter(o -> StringUtils.isNotEmpty(o.getGroupRoleType()) && !StringUtils.equals(o.getGroupRoleType(),"Member")).forEach(o -> {
+            try {
+                imPluginContext.getPluginService().groupAdminCreate(imGroupId, o.getImUserId());
+            } catch (Exception e) {
+                log.error("groupAdminCreate error", e);
             }
-        }
+        });
+        //转让群主
+        imGroupMembers.stream().filter(GroupMemberWrapper.ImGroupMember::getIsAdmin).forEach(o -> {
+            try {
+                changeGroupOwner(imGroup.getId(), o.getImUserId(), null);
+            } catch (Exception e) {
+                log.error("changeGroupOwner error", e);
+            }
+        });
         // 自动激活用户
         asyncRegisterUser(groupMembers);
 
@@ -541,9 +569,26 @@ public class ImGroupCoreServiceImpl implements ImGroupCoreService {
      */
     @Override
     public void changeGroupOwner(String groupId, String newOwner, String oldOwner) throws Exception {
-
+        if(StringUtils.isEmpty(oldOwner)){
+            //获取群主信息
+            TencentWrapper.GroupInfoResult groupInfo = imPluginContext.getPluginService().getGroupInfo(groupId);
+            List<TencentWrapper.GroupInfo> groupInfoList = groupInfo.getGroupInfo();
+            if(CollectionUtils.isNotEmpty(groupInfoList)){
+                oldOwner = groupInfoList.get(0).getOwnerAccount();
+            }
+        }
         // 转主群主
         imPluginContext.getPluginService().changeGroupOwner(groupId, newOwner, oldOwner);
+        //设置管理员
+        if(StringUtils.isNotEmpty(oldOwner)){
+            ImGroupMemberPlus one = imGroupMemberPlusService.lambdaQuery().eq(ImGroupMemberPlus::getImGroupId, groupId)
+                    .eq(ImGroupMemberPlus::getUserId, Long.parseLong(oldOwner)).last("LIMIT 1").one();
+            if(Objects.nonNull(one)){
+                if(StringUtils.isNotEmpty(one.getGroupRoleType()) && !StringUtils.equals(one.getGroupRoleType(),"Member")){
+                    imPluginContext.getPluginService().groupAdminCreate(groupId, oldOwner);
+                }
+            }
+        }
     }
 
     /**

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

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 @Service
 public class CbsUserServiceImpl implements CbsUserService {
@@ -34,7 +35,7 @@ public class CbsUserServiceImpl implements CbsUserService {
                 CbsUserWrapper.User user = new CbsUserWrapper.User();
                 user.setId(simpleUserDto.getUserId().longValue());
                 user.setUsername(query.getClientType() == null || query.getClientType() == EClientType.STUDENT ?
-                        simpleUserDto.getNickName() : simpleUserDto.getRealName());
+                        simpleUserDto.getNickName() : Optional.ofNullable(simpleUserDto.getUserName()).orElse(simpleUserDto.getNickName()));
                 user.setPhone(simpleUserDto.getPhone());
                 result.add(user);
             }

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

@@ -335,7 +335,7 @@ public class ChildrenDayReserveServiceImpl extends BaseServiceImpl<Integer, Chil
         String orderSubject = "6.1考级活动";
         String receiver = "degree";
 
-        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
 
         Map payMap = payService.getPayMap(
                 orderAmount,
@@ -431,7 +431,7 @@ public class ChildrenDayReserveServiceImpl extends BaseServiceImpl<Integer, Chil
                 sysUserCashAccountService.updateBalance(studentPaymentOrder.getUserId(), studentPaymentOrder.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, "6.1考级支付失败");
             }
 
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_SMS_PUSH_SPORADIC_PAYMENT_FAILED, map, null, 0, null, "STUDENT",
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_SPORADIC_PAYMENT_FAILED, map, null, 0, null, "STUDENT",
                     studentPaymentOrder.getActualAmount(), "6.1考级活动");
             return false;
         }
@@ -469,7 +469,7 @@ public class ChildrenDayReserveServiceImpl extends BaseServiceImpl<Integer, Chil
             return true;
         }
 
-        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL_MDAYA);
         String pushUrl = baseApiUrl + "/#/childrenPayment?dHlwZT0x";
 
         sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.CHILDREN_DAY_NOTICE_PUSH,

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

@@ -1734,7 +1734,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     teacherClassGroupDto.setHasReport(true);
                     String studyReportUrl = sysConfigDao.findConfigValue(SysConfigService.STUDENT_STUDY_REPORT_URL);
                     if (courseScheduleEvaluate.getVersion().equals(2)) {
-                        String teacherBaseUrl = sysConfigDao.findConfigValue(SysConfigService.TEACHER_BASE_URL);
+                        String teacherBaseUrl = sysConfigDao.findConfigValue(SysConfigService.TEACHER_BASE_URL_MTEACHER);
                         teacherClassGroupDto.setStudyReportUrl(teacherBaseUrl + "/#/studyReportNew?id=" + courseScheduleEvaluate.getId() + "&classGroupId=" + courseScheduleEvaluate.getClassGroupId());
                     } else {
                         teacherClassGroupDto.setStudyReportUrl(studyReportUrl + teacherClassGroupDto.getClassGroupId());

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

@@ -275,7 +275,7 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
         //生成订单编号
         String orderNo = idGenerator.generatorId("payment") + "";
         TenantOrderRecordEnum tenantEnum = TenantOrderRecordEnum.CLOUD_TEACHER;
-        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
         Map<String, Object> payMap = new HashMap<>();
         int orderState = 0;
         //消费大于0元则拉起支付

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

@@ -370,7 +370,7 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
         }
         Map<Integer, List<CourseReviewDto>> teacherNeedReview = practiceGroupReviews.getRows().stream().collect(Collectors.groupingBy(CourseReviewDto::getTeacherId));
 
-        String teacherBaseUrl = sysConfigDao.findConfigValue(SysConfigService.TEACHER_BASE_URL);
+        String teacherBaseUrl = sysConfigDao.findConfigValue(SysConfigService.TEACHER_BASE_URL_MTEACHER);
 
         String pushUrl = teacherBaseUrl + "/#/manageEvaluation";
         Map<Integer, String> userMap = new HashMap<>();

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

@@ -218,7 +218,7 @@ public class CourseScheduleEvaluateServiceImpl extends BaseServiceImpl<Long, Cou
             return;
         }
         Map<Integer, List<CourseScheduleEvaluate>> teacherEvaluates = needPostReports.stream().collect(Collectors.groupingBy(CourseScheduleEvaluate::getTeacherId));
-        String teacherBaseUrl = sysConfigDao.findConfigValue(SysConfigService.TEACHER_BASE_URL);
+        String teacherBaseUrl = sysConfigDao.findConfigValue(SysConfigService.TEACHER_BASE_URL_MTEACHER);
 
         String pushUrl = teacherBaseUrl + "/#/tobeReport";
         Map<Integer, String> userMap = new HashMap<>();

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

@@ -1098,7 +1098,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         }
         courseScheduleTeacherSalaryDao.updateTeacherSalaryConfirmStatus(teacherSalaryIds,TeacherSalaryConfirmStatus.UNCONFIRMED);
         teacherCourseRewardDao.updateTeacherRewardConfirmStatusWithMonth(month, null, TeacherSalaryConfirmStatus.UNCONFIRMED, TenantContextHolder.getTenantId());
-        String teacherBaseUrl = sysConfigDao.findByParamName(SysConfigService.TEACHER_BASE_URL).getParanValue();
+        String teacherBaseUrl = sysConfigDao.findByParamName(SysConfigService.TEACHER_BASE_URL_MTEACHER).getParanValue();
         String notifyUrl="8?"+teacherBaseUrl+"/#/remuneration?month=" + month;
         String monthStr = DateUtil.dateToString(DateUtil.stringToDate(month, "yyyy-MM"),"M月");
         String expireDateStr = DateUtil.dateToString(DateUtil.addDays(new Date(), 2), "M月d号");

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

@@ -574,7 +574,7 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
                 }
             }
 
-            String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+            String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
             Map<String, BigDecimal> classFee = new HashMap<>();
             classFee.put("course", amount);
             classFee.put("instrument", BigDecimal.ZERO);

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

@@ -188,7 +188,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
             return BaseController.failed(HttpStatus.CREATED, notifyMap,"恭喜您,支付成功!");
         }
 
-        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
 
         String receiver = "kjRegister";
         Map payMap = payService.getPayMap(

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

@@ -968,13 +968,13 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
         try{
             Map<Integer, String> userMap = new HashMap<>();
             userMap.put(practiceGroup.getStudentId(), practiceGroup.getStudentId().toString());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_SMS_PUSH_PAY_PRACTICE_BUY_SUCCESS,
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_PAY_PRACTICE_BUY_SUCCESS,
                     userMap, null, 0, null, "STUDENT", groupStartTime, groupEndTime, teacherName, drillTimesOnWeek, firstCourseStartTime);
 //            SysUser student = sysUserFeignService.queryUserById(practiceGroup.getStudentId());
             SysUser student = teacherDao.getUser(practiceGroup.getStudentId());
             Map<Integer, String> userPhoneMap = new HashMap<>();
             userPhoneMap.put(practiceGroup.getStudentId(), student.getPhone());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_PUSH_PAY_PRACTICE_BUY_SUCCESS,
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_PAY_PRACTICE_BUY_SUCCESS,
                     userPhoneMap, null, 0, null, "STUDENT", groupStartTime, groupEndTime, teacherName, drillTimesOnWeek, firstCourseStartTime);
 
             String practiceType = "网管课";
@@ -993,12 +993,12 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
 
             Map<Integer, String> teacherMap = new HashMap<>();
             teacherMap.put(practiceGroup.getUserId(), practiceGroup.getUserId().toString());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.TEACHER_SMS_PUSH_PRACTICE_CREATE,
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.TEACHER_PUSH_PRACTICE_CREATE,
                     teacherMap, null, 0, null, "TEACHER", teacher.getRealName(),
                     practiceType, practiceGroup.getName());
             Map<Integer, String> teacherPhoneMap = new HashMap<>();
             teacherPhoneMap.put(practiceGroup.getUserId(), teacher.getPhone());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.TEACHER_SMS_PUSH_PRACTICE_CREATE,
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.TEACHER_SMS_PRACTICE_CREATE,
                     teacherPhoneMap, null, 0, null, "TEACHER", teacher.getRealName(),
                     practiceType, practiceGroup.getName());
         }catch (Exception e){
@@ -1549,12 +1549,12 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
 
             Map<Integer, String> teacherMap = new HashMap<>();
             teacherMap.put(practiceGroupBuyParams.getUserId(), practiceGroupBuyParams.getUserId().toString());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.TEACHER_SMS_PUSH_PRACTICE_CREATE,
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.TEACHER_PUSH_PRACTICE_CREATE,
                     teacherMap, null, 0, null, "TEACHER", teacher.getRealName(),
                     practiceType, practiceGroupBuyParams.getName());
             Map<Integer, String> teacherPhoneMap = new HashMap<>();
             teacherPhoneMap.put(practiceGroupBuyParams.getUserId(), teacher.getPhone());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.TEACHER_SMS_PUSH_PRACTICE_CREATE,
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.TEACHER_SMS_PRACTICE_CREATE,
                     teacherPhoneMap, null, 0, null, "TEACHER", teacher.getRealName(),
                     practiceType, practiceGroupBuyParams.getName());
         }catch (Exception e){

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

@@ -539,41 +539,38 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
                 }
                 imGroupMemberService.batchInsert(imGroupMemberList);
 
-                if (RongCloudImPlugin.PLUGIN_NAME.equals(imPluginContext.defaultService())) {
-                    // 融云IM用户加群
-                    imFeignService.groupBatchJoin(groupModelList);
-                } else {
-                    // 腾讯云IM用户加群
-                    if (org.apache.commons.collections.CollectionUtils.isNotEmpty(groupMembers)) {
-                        Map<String, List<ImGroupMemberWrapper.ImGroupMember>> imGroupMembers = groupMembers.stream()
-                                .collect(Collectors.groupingBy(ImGroupMemberWrapper.ImGroupMember::getGroupId));
-                        List<Integer> userIdList = imGroupMembers.values().stream()
-                                .flatMap(List::stream)
-                                .map(x -> x.getUserId().intValue())
-                                .distinct()
-                                .collect(Collectors.toList());
-                        List<SysUser> userList = teacherDao.getUserList(userIdList);
-                        Map<Integer, SysUser> userMap = userList.stream().collect(Collectors.toMap(SysUser::getId, x -> x));
-                        for (Map.Entry<String, List<ImGroupMemberWrapper.ImGroupMember>> entry : imGroupMembers.entrySet()) {
-                            try {
-                                // 设置用户默认头象
-                                for (ImGroupMemberWrapper.ImGroupMember member : entry.getValue()) {
-                                    SysUser user = userMap.get(member.getUserId().intValue());
-                                    if (Objects.nonNull(user)) {
-                                        // 用户头像
-                                        member.setAvatar(sysUserService.getImAvatar(user));
-                                        member.setNickname(sysUserService.getImName(user));
-                                    }
+            if (RongCloudImPlugin.PLUGIN_NAME.equals(imPluginContext.defaultService())) {
+                // 融云IM用户加群
+                imFeignService.groupBatchJoin(groupModelList);
+            } else {
+                // 腾讯云IM用户加群
+                if (org.apache.commons.collections.CollectionUtils.isNotEmpty(groupMembers)) {
+                    Map<String, List<ImGroupMemberWrapper.ImGroupMember>> imGroupMembers = groupMembers.stream()
+                        .collect(Collectors.groupingBy(ImGroupMemberWrapper.ImGroupMember::getGroupId));
+
+                    for (Map.Entry<String, List<ImGroupMemberWrapper.ImGroupMember>> entry : imGroupMembers.entrySet()) {
+
+                        try {
+                            // 设置用户默认头象
+                            for (ImGroupMemberWrapper.ImGroupMember member : entry.getValue()) {
+//                                member.setAvatar(avatarMap.getOrDefault(member.getUserId().intValue(), ""));
+                                SysUser user = teacherDao.getUser(member.getUserId().intValue());
+                                // 用户头像
+                                member.setAvatar(sysUserService.getImAvatar(user));
+                                if(StringUtils.isNotEmpty(member.getRoleType())){
+                                    member.setNickname(StringUtils.isEmpty(user.getRealName())?user.getUsername():user.getRealName());
+                                }else {
+                                    member.setNickname(StringUtils.isEmpty(user.getUsername())?user.getRealName():user.getUsername());
                                 }
-                                // 腾讯云用户加群
-                                imGroupCoreService.groupMemberJoin(entry.getKey(), entry.getValue());
-                            } catch (Exception e) {
-                                log.error("腾讯云IM用户加群失败，groupId：{}, members={}", entry.getKey(), JSON.toJSONString(entry.getValue()), e);
                             }
+                            // 腾讯云用户加群
+                            imGroupCoreService.groupMemberJoin(entry.getKey(), entry.getValue());
+                        } catch (Exception e) {
+                            log.error("腾讯云IM用户加群失败，groupId：{}, members={}", entry.getKey(), JSON.toJSONString(entry.getValue()), e);
                         }
                     }
                 }
-            });
+            }
         }
         //原有员工退群
         CompletableFuture.runAsync(() ->{

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.dayaedu.cbs.common.enums.EClientType;
 import com.microsvc.toolkit.middleware.oss.OssPluginContext;
 import com.microsvc.toolkit.middleware.oss.impl.TencentOssPlugin;
 import com.ym.mec.biz.dal.dao.GoodsDao;
@@ -964,7 +965,7 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 		if(StringUtils.isNotEmpty(innerRepertoryWarnNum)){
 			String goodsNames = goodsDao.getInnerRepertoryWarnName(innerRepertoryWarnNum);
 			if(StringUtils.isNotEmpty(goodsNames)){
-				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.SYSTEM_SMS_GOODS_REPERTORY_WARN, receivers, null, 0, null,null,
+				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.SYSTEM_SMS_GOODS_REPERTORY_WARN, receivers, null, 0, null, EClientType.BACKEND.getCode(),
 						goodsNames,"内部");
 			}
 		}
@@ -974,7 +975,7 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 		if(StringUtils.isNotEmpty(outerRepertoryWarnNum)){
 			String goodsNames = goodsDao.getOuterRepertoryWarnName(outerRepertoryWarnNum);
 			if(StringUtils.isNotEmpty(goodsNames)){
-				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.SYSTEM_SMS_GOODS_REPERTORY_WARN, receivers, null, 0, null,null,
+				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.SYSTEM_SMS_GOODS_REPERTORY_WARN, receivers, null, 0, null,EClientType.BACKEND.getCode(),
 						goodsNames,"税务");
 			}
 		}

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

@@ -142,11 +142,10 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
 			return true;
 		}
 		//检查用户是否已存在
-		List<ImGroupMember> imGroupMemberList = imGroupMemberDao.queryByImGroupIdAndUserId(imGroupId.toString(), userId.toString());
-		if(imGroupMemberList != null && imGroupMemberList.size() > 0){
+		List<ImGroupMember> imGroupMemberList = imGroupMemberDao.queryByImGroupIdAndUserId(imGroupId, userId.toString());
+		if(CollectionUtils.isNotEmpty(imGroupMemberList)){
 			return true;
 		}
-
 		ImGroupMember imGroupMember = new ImGroupMember();
 		Date date = new Date();
 		imGroupMember.setGroupType(imGroup.getGroupType());
@@ -184,8 +183,9 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
 
 				groupMembers.add(ImGroupMemberWrapper.ImGroupMember.builder()
 						.groupId(groupId)
-						.isAdmin(StringUtils.isNotEmpty(roleType))
-						.roleType(roleType)
+						.isAdmin(imGroupMember.getIsAdmin())
+						.roleType(imGroupMember.getRoleType())
+						.type(imGroupMember.getType())
 						.nickname(imGroupMember.getNickname())
 						.userId(userId.longValue())
 						.imUserId(userId.toString())
@@ -384,9 +384,10 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
 						.userId(imGroupMember.getUserId().longValue())
 						.imUserId(imGroupMember.getUserId().toString())
 						.nickname(imGroupMember.getNickname())
-						.isAdmin(StringUtils.isNotEmpty(imGroupMember.getGroupRoleType()))
+						.isAdmin(imGroupMember.getIsAdmin())
 						.groupRoleType(imGroupMember.getGroupRoleType())
 						.roleType(imGroupMember.getRoleType())
+						.type(imGroupMember.getType())
 						.avatar(sysUserService.getImAvatar(user))
 					.build());
 				// 腾讯云IM用户加群
@@ -448,9 +449,11 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
 					.groupId(groupId)
 					.userId(imGroupMember.getUserId().longValue())
 					.imUserId(imGroupMember.getUserId().toString())
-					.isAdmin(StringUtils.isNotEmpty(imGroupMember.getRoleType()))
+					.isAdmin(imGroupMember.getIsAdmin())
+					.nickname(imGroupMember.getNickname())
 					.groupRoleType(imGroupMember.getGroupRoleType())
 					.roleType(imGroupMember.getRoleType())
+					.type(imGroupMember.getType())
 					.updateTime(imGroupMember.getUpdateTime())
 					.createTime(imGroupMember.getCreateTime())
 				.build());
@@ -491,7 +494,11 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
 						if (user != null) {
 							// 用户头像
 							item.setAvatar(sysUserService.getImAvatar(user));
-							item.setNickname(sysUserService.getImName(user));
+							if(StringUtils.isNotEmpty(item.getRoleType())){
+								item.setNickname(StringUtils.isEmpty(user.getRealName())?user.getUsername():user.getRealName());
+							}else {
+								item.setNickname(StringUtils.isEmpty(user.getUsername())?user.getRealName():user.getUsername());
+							}
 						}
 					}
 					// 腾讯云IM用户加群
@@ -572,7 +579,7 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
 	public boolean updateRoleType(String imGroupId, Integer userId, String roleType) {
 		List<Integer> userIdList = new ArrayList<Integer>();
 		userIdList.add(userId);
-		List<ImGroupMember> imGroupMemberList = imGroupMemberDao.queryByImGroupIdAndUserId(imGroupId.toString(), userIdList.stream().map(Objects::toString)
+		List<ImGroupMember> imGroupMemberList = imGroupMemberDao.queryByImGroupIdAndUserId(imGroupId, userIdList.stream().map(Objects::toString)
 				.collect(Collectors.joining(",")));
 
 		if (CollectionUtils.isEmpty(imGroupMemberList)) {

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

@@ -193,18 +193,22 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
         com.ym.mec.biz.dal.wrapper.ImGroupMemberWrapper.ImGroupMember groupMember = null;
         if (userId != null) {
             SysUser sysUser = teacherDao.getUser(userId);
-            groupMember = ImGroupMemberWrapper.ImGroupMember
-                    .builder()
-                    .userId(userId.longValue())
-                    .clientType("")
-                    .isAdmin(false)
-                    .avatar(sysUserService.getImAvatar(sysUser))
-                    .nickname(sysUserService.getImName(sysUser))
-                    .roleType(roleType)
-                    .tenantId(Optional.ofNullable(imGroup.getTenantId()).orElse(TenantContextHolder.getTenantId()))
-                    .build();
+            groupMember = new ImGroupMemberWrapper.ImGroupMember();
+            groupMember.setUserId(userId.longValue());
+            groupMember.setClientType("");
+            groupMember.setAvatar(sysUserService.getImAvatar(sysUser));
+            groupMember.setRoleType(roleType);
+            groupMember.setTenantId(Optional.ofNullable(imGroup.getTenantId()).orElse(TenantContextHolder.getTenantId()));
+            groupMember.setGroupRoleType(StringUtils.isEmpty(roleType)?EImGroupRoleType.Member.getCode():EImGroupRoleType.Admin.getCode());
+            if(StringUtils.isNotEmpty(roleType)){
+                groupMember.setType(EFriendRoleType.getByName(roleType).name());
+                groupMember.setNickname(StringUtils.isEmpty(sysUser.getRealName())?sysUser.getUsername():sysUser.getRealName());
+            }else {
+                groupMember.setNickname(StringUtils.isEmpty(sysUser.getUsername())?sysUser.getRealName():sysUser.getUsername());
+            }
             if(StringUtils.equals(roleType,"乐团领队")){
                 groupMember.setIsAdmin(true);
+                groupMember.setGroupRoleType(EImGroupRoleType.Owner.getCode());
             }
         }
         return imGroupCoreService.groupCreate(groupMember, group);
@@ -263,6 +267,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                     .tenantId(Optional.ofNullable(imGroup.getTenantId()).orElse(TenantContextHolder.getTenantId()))
                     .imUserId(getImUserId(groupMember.getUserId().toString(), ""))
                     .roleType(groupMember.getRoleType())
+                    .type(groupMember.getType())
                     .build());
         }
         try {
@@ -564,27 +569,32 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
             initSchoolGroup(imGroup.getSchoolId());
         } else {
             SysUser user = teacherDao.getUser(userId);
-            ImGroupMemberWrapper.ImGroupMember groupMember = ImGroupMemberWrapper.ImGroupMember.builder()
-                    .userId(userId.longValue())
-                    .nickname(sysUserService.getImName(user))
-                    .avatar(sysUserService.getImAvatar(user))
-                    .build();
-            imGroupCoreService.groupMemberJoin(imGroup.getId(), Lists.newArrayList(groupMember));
-            // 更新群主流程
-            if (schoolStaffType.equals(ESchoolStaffType.ORCHESTRA_LEADER)) {
-                groupChangeOwner(userId, imGroup.getId());
-            }
-
             ImGroupMember imGroupMember = new ImGroupMember();
             imGroupMember.setImGroupId(imGroup.getId());
             imGroupMember.setUserId(userId);
-            imGroupMember.setIsAdmin(schoolStaffType.equals(ESchoolStaffType.ORCHESTRA_LEADER));
             imGroupMember.setRoleType(schoolStaffType.getDescribe());
             imGroupMember.setNickname(name);
             if (StringUtils.isNotEmpty(schoolStaffType.getDescribe())) {
                 imGroupMember.setType(EFriendRoleType.getByName(schoolStaffType.getDescribe()).name());
             }
             imGroupMember.setTenantId(imGroup.getTenantId());
+            imGroupMemberService.initImGroupMember(imGroupMember,imGroup.getGroupType());
+
+            ImGroupMemberWrapper.ImGroupMember groupMember = new ImGroupMemberWrapper.ImGroupMember();
+            groupMember.setUserId(userId.longValue());
+            groupMember.setImUserId(userId.toString());
+            groupMember.setNickname(name);
+            groupMember.setAvatar(sysUserService.getImAvatar(user));
+            groupMember.setGroupId(imGroupMember.getImGroupId());
+            groupMember.setType(imGroupMember.getType());
+            groupMember.setRoleType(imGroupMember.getRoleType());
+            groupMember.setGroupRoleType(imGroupMember.getGroupRoleType());
+            groupMember.setIsAdmin(imGroupMember.getIsAdmin());
+            imGroupCoreService.groupMemberJoin(imGroup.getId(), Lists.newArrayList(groupMember));
+            // 更新群主流程
+            /*if (schoolStaffType.equals(ESchoolStaffType.ORCHESTRA_LEADER)) {
+                groupChangeOwner(userId, imGroup.getId());
+            }*/
             imGroupMemberDao.insert(imGroupMember);
 
         }
@@ -750,13 +760,9 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
         if (CollectionUtils.isEmpty(imGroupIds)) {
             return;
         }
-
         List<ImGroup> groupList = imGroupDao.getByIds(imGroupIds);
-
         // id 分组
         Map<String, ImGroup> map = groupList.stream().collect(Collectors.toMap(ImGroup::getId, Function.identity()));
-
-
         for (String musicGroupId : imGroupIds) {
             ImGroup imGroup = map.get(musicGroupId);
             if (imGroup == null) {
@@ -765,13 +771,6 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
             try {
 
                 SysUser user = teacherDao.getUser(userId.intValue());
-                ImGroupMemberWrapper.ImGroupMember groupMember = ImGroupMemberWrapper.ImGroupMember.builder()
-                    .userId(userId)
-                    .nickname(sysUserService.getImName(user))
-                    .avatar(sysUserService.getImAvatar(user))
-                    .build();
-                imGroupCoreService.groupMemberJoin(imGroup.getId(), Lists.newArrayList(groupMember));
-
                 ImGroupMember imGroupMember = new ImGroupMember();
                 imGroupMember.setImGroupId(imGroup.getId());
                 imGroupMember.setUserId(userId.intValue());
@@ -785,8 +784,20 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                 }
                 imGroupMember.setType(EFriendRoleType.getByName(roleType).name());
                 imGroupMember.setTenantId(imGroup.getTenantId());
-                imGroupMemberDao.insert(imGroupMember);
+                imGroupMemberService.initImGroupMember(imGroupMember,imGroup.getGroupType());
+
+                ImGroupMemberWrapper.ImGroupMember groupMember = new ImGroupMemberWrapper.ImGroupMember();
+                groupMember.setUserId(userId);
+                groupMember.setNickname(imGroupMember.getNickname());
+                groupMember.setAvatar(sysUserService.getImAvatar(user));
+                groupMember.setRoleType(roleType);
+                groupMember.setType(imGroupMember.getType());
+                groupMember.setGroupId(imGroupMember.getImGroupId());
+                groupMember.setGroupRoleType(imGroupMember.getGroupRoleType());
+                groupMember.setIsAdmin(imGroupMember.getIsAdmin());
+                imGroupCoreService.groupMemberJoin(imGroup.getId(), Lists.newArrayList(groupMember));
 
+                imGroupMemberDao.insert(imGroupMember);
                 updateImGroupUserNumber(imGroup.getId());
             } catch (Exception e) {
                 log.error("加入群聊失败",e);
@@ -858,7 +869,6 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void schoolJoinGroup(Integer cooperationOrganId, String imGroupId) {
-
         CooperationOrgan cooperationOrgan = cooperationOrganService.get(cooperationOrganId);
         if (cooperationOrgan == null) {
             return;
@@ -867,21 +877,13 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
         if (CollectionUtils.isEmpty(schoolStaffs)) {
             return;
         }
-
-
         // 查询群是否存在
         ImGroup imGroup = imGroupDao.get(imGroupId);
         if (imGroup == null) {
             return;
         }
-
-
         SchoolStaff schoolStaff = schoolStaffs.get(0);
-
-
-
         addImGroup(Lists.newArrayList(imGroup.getId()),schoolStaff.getUserId(),ESchoolStaffType.ORCHESTRA_LEADER.getDescribe());
-
     }
 
 

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

@@ -2473,10 +2473,10 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
     private void sendRoomLiveState(SysUser user, ImLiveBroadcastRoom room, MessageTypeEnum en) {
         String baseUrl;
         if (SysUserType.EDUCATION.equals(room.getClientType())) {
-            baseUrl=sysConfigDao.findConfigValue(SysConfigService.EDU_TEACHER_BASE_URL);
+            baseUrl=sysConfigDao.findConfigValue(SysConfigService.EDU_TEACHER_BASE_URL_MANAGER);
             return;
         } else {
-            baseUrl=sysConfigDao.findConfigValue(SysConfigService.TEACHER_BASE_URL);
+            baseUrl=sysConfigDao.findConfigValue(SysConfigService.TEACHER_BASE_URL_MTEACHER);
         }
         if (StringUtils.isBlank(baseUrl)) {
             log.error("sendRoomState error: teacherBaseUrl is null");

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

@@ -189,7 +189,7 @@ public class InspectionItemPlanServiceImpl extends BaseServiceImpl<Long, Inspect
             userMap.put(userId, userId.toString());
         }
 
-        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.EDU_TEACHER_BASE_URL);
+        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.EDU_TEACHER_BASE_URL_MANAGER);
         String pushUrl = baseApiUrl + "/#/musicInspection";
         sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SYSTEM_PUSH_SMS_INSPECTION_NOTICE,
                 userMap, null, 0, "8?" + pushUrl, "SYSTEM");

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

@@ -971,7 +971,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             return notifyMap;
         }
 
-        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
 
         Map<String, BigDecimal> classFee = new HashMap<>();
         classFee.put("course", BigDecimal.ZERO);
@@ -1098,7 +1098,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 }
             }
         }
-        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
 
         if (amount.compareTo(BigDecimal.ZERO) == 0) {
             studentPaymentRouteOrderService.addRouteOrder(orderNo, organId, balance);
@@ -1472,7 +1472,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (musicGroup.getOwnershipType() != null && musicGroup.getOwnershipType().equals(CooperationOrgan.OwnershipType.COOPERATION)) {
             orderSubject = "乐团相关费用";
         }
-        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
 
         Map payMap = payService.getPayMap(
                 amount,
@@ -3314,9 +3314,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 push.put(userId, userId.toString());
                 yimei.put(userId, studentRegistration.getParentsPhone());
                 // 发送续费结果通知
-                sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.STUDENT_SMS_PUSH_MUSIC_GROUP_RENEW_SUCCESS, push, null, 0, "1", "STUDENT",
+                sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_MUSIC_GROUP_RENEW_SUCCESS, push, null, 0, "1", "STUDENT",
                         studentRegistration.getName(), studentPaymentOrder.getActualAmount());
-                sysMessageService.batchSendMessage(MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_PUSH_MUSIC_GROUP_RENEW_SUCCESS, yimei, null, 0, "1", "",
+                sysMessageService.batchSendMessage(MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_MUSIC_GROUP_RENEW_SUCCESS, yimei, null, 0, "1", "",
                         studentRegistration.getName(), studentPaymentOrder.getActualAmount());
             }
             return true;

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

@@ -112,7 +112,7 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
 
             //签名验证
             checkSing(payParam);
-            String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+            String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
             if(studentPaymentOrder.getType() == MALL_BUY){
                 String paymentChannelStr = sysConfigDao.findConfigValue(SysConfigService.PAYMENT_CHANNEL);
                 if(StringUtils.isBlank(paymentChannelStr)) {
@@ -181,7 +181,7 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
 
         //签名验证
         checkSing(payParam);
-        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
         payParam.setNotifyUrl(baseApiUrl + "/api-web/tenantInfo/callback/" + payParam.getOrderNo());
         
         //获取支付数据

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

@@ -1611,12 +1611,12 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
         Map<Integer, String> teacherMap = new HashMap<>();
         teacherMap.put(practiceGroup.getUserId(), practiceGroup.getUserId().toString());
-        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.TEACHER_SMS_PUSH_PRACTICE_CREATE,
+        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.TEACHER_PUSH_PRACTICE_CREATE,
                 teacherMap, null, 0, null, "TEACHER",
                 teacher.getRealName(), practiceType, practiceGroup.getName());
         Map<Integer, String> teacherPhoneMap = new HashMap<>();
         teacherPhoneMap.put(practiceGroup.getUserId(), teacher.getPhone());
-        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.TEACHER_SMS_PUSH_PRACTICE_CREATE,
+        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.TEACHER_SMS_PRACTICE_CREATE,
                 teacherPhoneMap, null, 0, null, "TEACHER",
                 teacher.getRealName(), practiceType, practiceGroup.getName());
 
@@ -2612,7 +2612,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             }
         }
 
-        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
         Map<String, BigDecimal> classFee = new HashMap<>();
         classFee.put("course", amount);
         classFee.put("instrument", BigDecimal.ZERO);
@@ -3078,7 +3078,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             }
         }
 
-        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
         Map<String, BigDecimal> classFee = new HashMap<>();
         classFee.put("course", amount);
         classFee.put("instrument", BigDecimal.ZERO);
@@ -3250,12 +3250,12 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             if (drillTimesOnWeek != null) {
                 Map<Integer, String> userMap = new HashMap<>();
                 userMap.put(practiceGroup.getStudentId(), practiceGroup.getStudentId().toString());
-                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_SMS_PUSH_PAY_PRACTICE_BUY_SUCCESS,
+                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_PAY_PRACTICE_BUY_SUCCESS,
                         userMap, null, 0, null, "STUDENT", groupStartTime, groupEndTime, teacherName, drillTimesOnWeek, firstCourseStartTime);
                 SysUser student = teacherDao.getUser(practiceGroup.getStudentId());
                 Map<Integer, String> userPhoneMap = new HashMap<>();
                 userPhoneMap.put(practiceGroup.getStudentId(), student.getPhone());
-                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_PUSH_PAY_PRACTICE_BUY_SUCCESS,
+                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_PAY_PRACTICE_BUY_SUCCESS,
                         userPhoneMap, null, 0, null, "STUDENT", groupStartTime, groupEndTime, teacherName, drillTimesOnWeek, firstCourseStartTime);
             }
 
@@ -3275,12 +3275,12 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
             Map<Integer, String> teacherMap = new HashMap<>();
             teacherMap.put(practiceGroup.getUserId(), practiceGroup.getUserId().toString());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.TEACHER_SMS_PUSH_PRACTICE_CREATE,
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.TEACHER_PUSH_PRACTICE_CREATE,
                     teacherMap, null, 0, null, "TEACHER",
                     teacher.getRealName(), practiceType, practiceGroup.getName());
             Map<Integer, String> teacherPhoneMap = new HashMap<>();
             teacherPhoneMap.put(practiceGroup.getUserId(), teacher.getPhone());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.TEACHER_SMS_PUSH_PRACTICE_CREATE,
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.TEACHER_SMS_PRACTICE_CREATE,
                     teacherPhoneMap, null, 0, null, "TEACHER",
                     teacher.getRealName(), practiceType, practiceGroup.getName());
         } catch (Exception e) {
@@ -3590,7 +3590,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             }
         }
 
-        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
         Map<String, BigDecimal> classFee = new HashMap<>();
         classFee.put("course", newOrder.getActualAmount());
         classFee.put("instrument", BigDecimal.ZERO);
@@ -3720,7 +3720,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             return;
         }
 
-        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL_MDAYA);
 
         for (CourseScheduleEvaluate report : reports) {
             PracticeGroup userFreePracticeGroup = practiceGroupDao.get(Long.valueOf(report.getMusicGroupId()));
@@ -3740,14 +3740,14 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             if (pushType.equals("ALL") || pushType.equals("JIGUANG")) {
                 Map<Integer, String> userMap = new HashMap<>();
                 userMap.put(userFreePracticeGroup.getStudentId(), userFreePracticeGroup.getStudentId().toString());
-                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_SMS_PUSH_PRACTICE_COMPLETED_STUDY_REPORT,
+                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_PRACTICE_COMPLETED_STUDY_REPORT,
                         userMap, null, 0, pushUrl.insert(0, "5?").toString(), "STUDENT", pushUrl.toString());
             }
 
             if (pushType.equals("ALL") || pushType.equals("SMS")) {
                 Map<Integer, String> userPhoneMap = new HashMap<>();
                 userPhoneMap.put(userFreePracticeGroup.getStudentId(), student.getPhone());
-                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_PUSH_PRACTICE_COMPLETED_STUDY_REPORT,
+                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_PRACTICE_COMPLETED_STUDY_REPORT,
                         userPhoneMap, null, 0, null, "STUDENT", HttpUtil.getSortUrl(smsUrl.toString()));
             }
             report.setIsPushed(1);
@@ -3864,7 +3864,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         List<Map<Integer, String>> userNeedRemindPracticeIdMaps = practiceGroupDao.getUserNeedRemindPracticeIdMap(needRemindStudentIds);
         if (!CollectionUtils.isEmpty(userNeedRemindPracticeIdMaps)) {
             Map<Integer, String> userNeedRemindPracticeIdMap = MapUtil.convertIntegerMap(userNeedRemindPracticeIdMaps);
-            String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+            String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL_MDAYA);
             String pushUrl = baseApiUrl + "/#/auditionActive/1?groupId=";
             for (Map.Entry<Integer, String> integerStringEntry : userNeedRemindPracticeIdMap.entrySet()) {
                 Map<Integer, String> userMap = new HashMap<>();
@@ -4292,7 +4292,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             LOGGER.error("[{}]小课购买协议生成错误：{}", practiceGroup.getId(), e.getCause());
         }
 
-        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
         //分类费用 course，instrument，accessories，other
         Map<String, BigDecimal> classFee = new HashMap<>();
         classFee.put("course", amount);
@@ -4478,7 +4478,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         String orderSubject = "营销活动";
         String receiver = "activity";
 
-        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
 
         Map payMap = payService.getPayMap(
                 activityFee,

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

@@ -171,14 +171,14 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
             Map<Integer, String> userMap = new HashMap<>();
             Map<Integer, String> userPhoneMap = new HashMap<>();
             Integer userId = replacementInstrumentActivity.getUserId();
-            String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+            String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL_MDAYA);
             String pushUrl = baseApiUrl + "/#/questionGoodsSale?id=";
             userMap.put(userId, userId.toString());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_SMS_PUSH_REPLACEMENT_PAY,
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_REPLACEMENT_PAY,
                     userMap, null, 0, "5?" + pushUrl + replacementInstrumentActivity.getId(), "STUDENT", goods.getBrand(), "");
 
             userPhoneMap.put(replacementInstrumentActivity.getUserId(), replacementInstrumentActivity.getMobileNo());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_PUSH_REPLACEMENT_PAY,
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_REPLACEMENT_PAY,
                     userPhoneMap, null, 0, null, null, goods.getBrand(), HttpUtil.getSortUrl(pushUrl + replacementInstrumentActivity.getId()));
         }
         return replacementInstrumentActivity;
@@ -255,14 +255,14 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
             Map<Integer, String> userMap = new HashMap<>();
             Map<Integer, String> userPhoneMap = new HashMap<>();
             Integer userId = replacementInstrumentActivity.getUserId();
-            String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+            String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL_MDAYA);
             String pushUrl = baseApiUrl + "/#/questionGoodsSale?id=";
             userMap.put(userId, userId.toString());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_SMS_PUSH_REPLACEMENT_PAY,
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_REPLACEMENT_PAY,
                     userMap, null, 0, "5?" + pushUrl + replacementInstrumentActivity.getId(), "STUDENT", goods.getBrand(), "");
 
             userPhoneMap.put(replacementInstrumentActivity.getUserId(), replacementInstrumentActivity.getMobileNo());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_PUSH_REPLACEMENT_PAY,
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_REPLACEMENT_PAY,
                     userPhoneMap, null, 0, null, null, goods.getBrand(), HttpUtil.getSortUrl(pushUrl + replacementInstrumentActivity.getId()));
         }
         return replacementInstrumentActivity;
@@ -396,7 +396,7 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
         String orderSubject = "乐器置换";
         String receiver = "replacement";
 
-        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
 
         Map payMap = payService.getPayMap(
                 amount,
@@ -506,7 +506,7 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
             }
             sysCouponCodeService.quit(studentPaymentOrder.getCouponCodeId());
 
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_SMS_PUSH_SPORADIC_PAYMENT_FAILED, map, null, 0, null, "STUDENT",
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_SPORADIC_PAYMENT_FAILED, map, null, 0, null, "STUDENT",
                     studentPaymentOrder.getActualAmount(), "乐器置换");
             return false;
         }

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

@@ -10,6 +10,7 @@ import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.page.ReplacementInstrumentCooperationQueryInfo;
 import com.ym.mec.biz.service.ReplacementInstrumentCooperationService;
+import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.biz.service.SysMessageService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
@@ -64,17 +65,17 @@ public class ReplacementInstrumentCooperationServiceImpl extends BaseServiceImpl
         replacementInstrumentActivityDao.openPay(id);
 
 
-        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL_MDAYA);
         String pushUrl = baseApiUrl + "/#/questionGoodsSale?id=";
         for (ReplacementInstrumentActivityStatDto pushUser : pushUsers) {
             Map<Integer, String> userMap = new HashMap<>();
             Map<Integer, String> userPhoneMap = new HashMap<>();
             userMap.put(pushUser.getUserId(), pushUser.getUserId().toString());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_SMS_PUSH_REPLACEMENT_PAY,
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_REPLACEMENT_PAY,
                     userMap, null, 0, "5?" + pushUrl + pushUser.getId(), "STUDENT", pushUser.getBrand(), "");
 
             userPhoneMap.put(pushUser.getUserId(), pushUser.getMobileNo());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_PUSH_REPLACEMENT_PAY,
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_REPLACEMENT_PAY,
                     userPhoneMap, null, 0, null, null, pushUser.getBrand(), HttpUtil.getSortUrl(pushUrl + pushUser.getId()));
         }
 

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

@@ -42,7 +42,7 @@ public class SmsCodeServiceImpl implements SmsCodeService {
 	@Override
 	public boolean sendValidCode(String mobile,String jpushType) {
 		SysUser sysUser = sysUserFeignService.queryUserByMobile(mobile);
-		Integer userId = null;
+		Integer userId = -1;
 		if (sysUser != null) {
 			if(sysUser.getLockFlag() == 9 || sysUser.getLockFlag() == 1 || sysUser.getDelFlag() == YesOrNoEnum.YES) {
 				throw new BizException("账号已冻结，请联系管理员");

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

@@ -157,9 +157,9 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
                 sysUserCashAccountDetailService.insert(paymentDetail);
             }
 
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_SMS_PUSH_SPORADIC_PAYMENT_SUCCESS, map, null, 0, "1", "STUDENT",
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_SPORADIC_PAYMENT_SUCCESS, map, null, 0, "1", "STUDENT",
                     studentPaymentOrder.getActualAmount(), info.getTitle());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_PUSH_SPORADIC_PAYMENT_SUCCESS, yimei, null, 0, "1", "",
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_SPORADIC_PAYMENT_SUCCESS, yimei, null, 0, "1", "",
                     studentPaymentOrder.getActualAmount(), info.getTitle());
             return true;
         }
@@ -173,9 +173,9 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
                 sysUserCashAccountService.updateBalance(studentPaymentOrder.getUserId(), studentPaymentOrder.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, info.getTitle() + "支付失败");
             }
             sysCouponCodeService.quit(studentPaymentOrder.getCouponCodeId());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_SMS_PUSH_SPORADIC_PAYMENT_FAILED, map, null, 0, "", "STUDENT",
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_SPORADIC_PAYMENT_FAILED, map, null, 0, "", "STUDENT",
                     studentPaymentOrder.getActualAmount(), info.getTitle());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_PUSH_SPORADIC_PAYMENT_FAILED, yimei, null, 0, "", "",
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_SPORADIC_PAYMENT_FAILED, yimei, null, 0, "", "",
                     studentPaymentOrder.getActualAmount(), info.getTitle());
             return false;
         }

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

@@ -187,7 +187,7 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
         String orderSubject = "乐保服务";
         String receiver = "maintenance";
 
-        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
 
         Map payMap = payService.getPayMap(
                 amount,
@@ -295,7 +295,7 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
                 sysUserCashAccountService.updateBalance(studentPaymentOrder.getUserId(), studentPaymentOrder.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, "乐保购买支付失败");
             }
             sysCouponCodeService.quit(studentPaymentOrder.getCouponCodeId());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_SMS_PUSH_SPORADIC_PAYMENT_FAILED, map, null, 0, null, "STUDENT",
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_SPORADIC_PAYMENT_FAILED, map, null, 0, null, "STUDENT",
                     studentPaymentOrder.getActualAmount(), "乐保购买");
             return false;
         }
@@ -339,7 +339,7 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
         if (studentInstruments.size() <= 0) {
             return false;
         }
-        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL_MDAYA);
         String pushUrl = baseApiUrl + "#/leBao";
         for (StudentInstrument studentInstrument : studentInstruments) {
             Map<Integer, String> userMap = new HashMap<>();

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

@@ -196,7 +196,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             studentPaymentOrderDetailService.allocateAndAdd(details, studentPaymentOrder.getCouponRemitFee());
         }
 
-        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
 
         //logger.info("XXX-createOrder ---> cashAmount:{}, balance:{}", cashAmount, cashAmount.compareTo(BigDecimal.ZERO));
         if (cashAmount.compareTo(BigDecimal.ZERO) == 0) {
@@ -1332,7 +1332,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             return notifyMap;
         }
 
-        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
         //获取支付渠道
         /*String paymentChannelStr = sysConfigDao.findConfigValue(SysConfigService.PAYMENT_CHANNEL);
         if(StringUtils.isBlank(paymentChannelStr)) {

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

@@ -1349,13 +1349,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_PUSH_PAYMENT_SUCCESS, map, null, 0, null, "",
+                        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_PUSH_PAYMENT_SUCCESS, map1, null, 0, null, "STUDENT",
+                        MessageTypeEnum.STUDENT_PUSH_PAYMENT_SUCCESS, map1, null, 0, null, "STUDENT",
                         studentRegistration.getName(), studentPaymentOrder.getActualAmount());
             }
             try {

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

@@ -1263,7 +1263,7 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
                 sysUserCashAccountService.updateBalance(studentPaymentOrder.getUserId(), studentPaymentOrder.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, "乐器维修支付失败");
             }
             sysCouponCodeService.quit(studentPaymentOrder.getCouponCodeId());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_SMS_PUSH_SPORADIC_PAYMENT_FAILED, map, null, 0, null, "STUDENT",
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_SPORADIC_PAYMENT_FAILED, map, null, 0, null, "STUDENT",
                     studentPaymentOrder.getActualAmount(), "乐器维修");
             return false;
         }

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

@@ -534,7 +534,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
                 userMap1.put(studentId,studentId.toString());
             }
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS,
-                    MessageTypeEnum.PUSH_EXPERIENCE_MEMBERSHIP_MESSAGE,
+                    MessageTypeEnum.SMS_EXPERIENCE_MEMBERSHIP_MESSAGE,
                     userMap,
                     null,
                     0,

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

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

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.dayaedu.cbs.common.enums.EAppKey;
 import com.dayaedu.cbs.common.enums.EClientType;
 import com.dayaedu.cbs.common.enums.message.EMessageSendMode;
@@ -20,7 +21,9 @@ import com.ym.mec.biz.dal.entity.SysMessageConfig;
 import com.ym.mec.biz.dal.entity.WaitSendMessage;
 import com.ym.mec.biz.dal.enums.MessageSendMode;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
+import com.ym.mec.biz.dal.enums.SendStatusEnum;
 import com.ym.mec.biz.dal.page.SysMessageQueryInfo;
+import com.ym.mec.biz.dal.wrapper.SysMessageWrapper;
 import com.ym.mec.biz.service.SysMessageConfigService;
 import com.ym.mec.biz.service.SysMessageService;
 import com.ym.mec.biz.service.SysUserService;
@@ -30,6 +33,7 @@ import com.ym.mec.common.entity.ImPrivateMessage;
 import com.ym.mec.common.entity.ImSendMessageUserInfo;
 import com.ym.mec.common.entity.ImTxtMessage;
 import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.redis.service.RedisCache;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.common.tenant.TenantContextHolder;
@@ -54,6 +58,8 @@ import java.io.IOException;
 import java.net.URL;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import static com.ym.mec.biz.dal.enums.MessageTypeEnum.STUDENT_PUSH_VIP_BUY;
 
@@ -85,7 +91,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	// 发送验证码的间隔时间
 	public static final int CODE_INTERVAL_TIME = 60;
 
-	private final int DEFAULT_CODE = 888888;
+	private final int DEFAULT_CODE = 666666;
 
 	@Value("${message.debugMode}")
 	private boolean debugMode;
@@ -95,6 +101,105 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		return sysMessageDao;
 	}
 
+
+
+    /**
+     * 分页查询
+     * @param page IPage<SysMessageWrapper.SysMessageList>
+     * @param query SysMessageWrapper.SysMessageQuery
+     * @return IPage<SysMessageWrapper.SysMessage>
+     */
+    @Override
+    public PageInfo<SysMessageWrapper.Message> queryPage(SysMessageQueryInfo query){
+
+        CbsMessageWrapper.SysMessageQuery cbsQuery = getSysMessageQuery(query);
+
+        PageInfo<SysMessageWrapper.Message> pageInfo = new PageInfo<>(query.getPage(), query.getRows());
+
+        cbsQuery.setPage(query.getPage());
+        cbsQuery.setRows(query.getRows());
+        com.microsvc.toolkit.common.response.paging.PageInfo<CbsMessageWrapper.SysMessage> sysMessagePageInfo = messageFeignClientService
+            .sysMessagePage(cbsQuery).feignData();
+        List<CbsMessageWrapper.SysMessage> rows = sysMessagePageInfo.getRows();
+        if (CollectionUtils.isEmpty(rows)) {
+            return pageInfo;
+        }
+        List<SysMessage> sysMessages = rows.stream().map(this::convert).collect(Collectors.toList());
+        pageInfo.setRows(JSON.parseArray(JSON.toJSONString(sysMessages), SysMessageWrapper.Message.class));
+        pageInfo.setTotal(sysMessagePageInfo.getTotal());
+        return pageInfo;
+    }
+
+    private SysMessage convert(CbsMessageWrapper.SysMessage sysMessage) {
+        SysMessage message = new SysMessage();
+        message.setId(sysMessage.getId().toString());
+        if (sysMessage.getUserId() != null) {
+            message.setUserId(sysMessage.getUserId().intValue());
+        }
+        if (sysMessage.getMessageConfigId() != null) {
+            message.setMessageConfigId(sysMessage.getMessageConfigId().intValue());
+        }
+        message.setTitle(sysMessage.getTitle());
+        message.setContent(sysMessage.getContent());
+        message.setType(MessageSendMode.valueOf(sysMessage.getSendMode() !=null?sysMessage.getSendMode().name():"PUSH"));
+        message.setStatus(SendStatusEnum.valueOf(Optional.ofNullable(sysMessage.getStatus()).map(o->o.name()).orElse(SendStatusEnum.FAILED.name())));
+        message.setReceiver(sysMessage.getReceiver());
+        message.setSendTime(sysMessage.getSendTime());
+        message.setErrorMsg(sysMessage.getErrorMsg());
+        message.setMemo(sysMessage.getMemo());
+        message.setReadStatus(sysMessage.getReadStatus()?1:0);
+        message.setGroup(sysMessage.getGroup());
+        message.setCreateOn(sysMessage.getCreateTime());
+        message.setModifyOn(sysMessage.getUpdateTime());
+        message.setJpushType(sysMessage.getSendMode().name());
+        return message;
+    }
+
+    private CbsMessageWrapper.SysMessageQuery getSysMessageQuery(SysMessageQueryInfo query) {
+        CbsMessageWrapper.SysMessageQuery cbsQuery = new CbsMessageWrapper.SysMessageQuery();
+        if (query.getUserId() != null) {
+            cbsQuery.setUserId(query.getUserId().longValue());
+        }
+        cbsQuery.setAppKey(EAppKey.GYM);
+        if (query.getJpushType() !=null) {
+            cbsQuery.setClientType(getClientType(query.getJpushType()));
+        }
+        if (query.getStatus() !=null) {
+            switch (query.getStatus()) {
+                case 0:
+                    cbsQuery.setStatus(ESendStatus.WAIT);
+                    break;
+                case 1:
+                    cbsQuery.setStatus(ESendStatus.SENDING);
+                    break;
+                case 2:
+                    cbsQuery.setStatus(ESendStatus.SUCCESSED);
+                    break;
+            }
+        }
+        cbsQuery.setTitle(query.getTitle());
+        if (query.getType() != null) {
+            switch (query.getType()) {
+                case 1:
+                    cbsQuery.setSendMode(EMessageSendMode.SMS);
+                    break;
+                case 2:
+                    cbsQuery.setSendMode(EMessageSendMode.EMAIL);
+                    break;
+                case 3:
+                    cbsQuery.setSendMode(EMessageSendMode.PUSH);
+                    break;
+            }
+        }
+        if (StringUtils.isNotBlank(query.getGroup())) {
+            cbsQuery.setGroup(query.getGroup());
+        }
+        if (query.getReadStatus() != null) {
+            cbsQuery.setReadStatus(query.getReadStatus() == 1);
+        }
+        return cbsQuery;
+    }
+
 	@Override
 	public R<com.microsvc.toolkit.common.response.paging.PageInfo<CbsMessageWrapper.SysMessage>> queryListPage(SysMessageQueryInfo queryInfo) {
 		CbsMessageWrapper.SysMessageQuery query = new CbsMessageWrapper.SysMessageQuery();
@@ -103,6 +208,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		query.setUserId(queryInfo.getUserId().longValue());
 //		query.setStatus(ESendStatus.SUCCESSED);
 		query.setAppKey(EAppKey.GYM);
+		query.setGroup(queryInfo.getGroup());
 		query.setSendMode(getMessageSendMode(queryInfo.getType()));
 		query.setTitle(queryInfo.getTitle());
 		query.setClientType(getClientType(queryInfo.getJpushType()));
@@ -160,6 +266,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 			params.put(user.getUserId().longValue(), user.getPhone());
 			messageParam.setReceivers(params);
 			messageParam.setRealSend(!debugMode);
+			messageParam.setUrl(memo);
 			if(args != null && args.length > 0){
 				String[] argsStr = new String[args.length];
 				for (int i = 0; i < args.length; i++) {
@@ -446,18 +553,27 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		if(StringUtils.isEmpty(jpushType)){
 			jpushType = "STUDENT";
 		}
-		List<SimpleUserDto> userDtoList = teacherDao.getUsersSimpleInfo(new ArrayList<>(receivers.keySet()));
+		// 处理注册验证码，没有用户ID的情况导致没有发送短息
 		List<CbsMessageWrapper.MessageParam> messageParams = new ArrayList<>();
-		for (SimpleUserDto user : userDtoList) {
+		List<SimpleUserDto> userDtoList = teacherDao.getUsersSimpleInfo(new ArrayList<>(receivers.keySet()));
+		Map<Integer, SimpleUserDto> userMap = userDtoList.stream().collect(Collectors.toMap(SimpleUserDto::getUserId, Function.identity()));
+		for (Map.Entry<Integer, String> receive : receivers.entrySet()) {
+			Long userId = Long.valueOf(Optional.ofNullable(receive.getKey()).orElse(-1));
+			SimpleUserDto user = userMap.getOrDefault(userId.intValue(), new SimpleUserDto());
 			CbsMessageWrapper.MessageParam messageParam = new CbsMessageWrapper.MessageParam();
-			messageParam.setUserId(user.getUserId().longValue());
+			messageParam.setUserId(userId);
 			messageParam.setAppKey(EAppKey.GYM);
 			messageParam.setClientType(getClientType(jpushType));
-			messageParam.setClientId(messageParam.getClientType());
+			messageParam.setClientId(getClientType(jpushType));
 			messageParam.setType(type.getCode());
 			messageParam.setUrl(url);
 			Map<Long, String> params = new HashMap<>();
-			params.put(user.getUserId().longValue(), user.getPhone());
+			if(messageSender == MessageSender.EMAIL){
+				//如果是极光推送，没有用户ID的情况下，使用手机号
+				params.put(userId, Optional.ofNullable(receive.getValue()).orElse(user.getPhone()));
+			}else {
+				params.put(userId, Optional.ofNullable(user.getPhone()).orElse(receive.getValue()));
+			}
 			messageParam.setReceivers(params);
 			messageParam.setRealSend(!debugMode);
 			if(args != null && args.length > 0){
@@ -524,7 +640,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 			CbsMessageWrapper.MessageParam messageParam = new CbsMessageWrapper.MessageParam();
 			messageParam.setUserId(user.getUserId().longValue());
 			messageParam.setAppKey(EAppKey.GYM);
-			messageParam.setClientType(EClientType.STUDENT);
+			messageParam.setClientType(EClientType.valueOf(jpushType));
 			messageParam.setClientId(messageParam.getClientType());
 			messageParam.setType(type.getCode());
 			messageParam.setUrl(url);
@@ -579,13 +695,6 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		return object == null ? null : object.toString();
 	}
 
-	@Override
-	public void delSendedVerificationCode(MessageTypeEnum type, String mobileNOOrEmailAddr) {
-		String key = getVerificationCodeCacheKey(type, mobileNOOrEmailAddr);
-		if (StringUtils.isNotBlank(key)) {
-			redisCache.delete(key);
-		}
-	}
 
 	@Override
 	public Map<String, Integer> queryCountOfUnread(MessageSendMode type, Integer userId, String jpushType, Integer tenantId) {

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

@@ -312,7 +312,7 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 				userMap3.put(studentId, studentId.toString());
 			}
 		}
-		String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+		String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL_MDAYA);
 		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.TRAIN_NO_RANK_STUDENT_PUSH,userMap1,
 				null, 0, "5?"+baseApiUrl+"/#/cloudRanking", "STUDENT");
 		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.TRAIN_RANK_STUDENT_PUSH,userMap2,

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

@@ -132,7 +132,7 @@ public class SysUserCashAccountServiceImpl extends BaseServiceImpl<Integer, SysU
                     phoneMap, null, 0, null, "", decimal, balance);
             Map<Integer, String> idMap = new HashMap<>(1);
             idMap.put(userId, userId.toString());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_SMS_BALANCE_CONSUME,
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_BALANCE_CONSUME,
                     idMap, null, 0, null, "", decimal, balance);
         }
         return true;

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

@@ -67,7 +67,7 @@ public class TeacherSalaryComplaintsServiceImpl extends BaseServiceImpl<Long, Te
 		Map<Integer, String> map = new HashMap<>(1);
 		map.put(salaryComplaints.getTeacherId(), salaryComplaints.getTeacherId().toString());
 		if (map != null && map.size() > 0) {
-			String url = new StringBuffer("8?").append(sysConfigDao.findConfigValue(SysConfigService.TEACHER_BASE_URL)).append("/#/appealResult?id=").append(salaryComplaints.getId()).toString();
+			String url = new StringBuffer("8?").append(sysConfigDao.findConfigValue(SysConfigService.TEACHER_BASE_URL_MTEACHER)).append("/#/appealResult?id=").append(salaryComplaints.getId()).toString();
 			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.TEACHER_PUSH_COURSE_SALARY_COMPLAINTS_RESULT, map, null, 0, url,
 					"TEACHER", DateUtil.format(salaryComplaints.getCreateTime(),DateUtil.DEFAULT_PATTERN),complaints.getStatusEnum().getMsg());
 		}

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

@@ -797,7 +797,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         String orderNo = idGenerator.generatorId("payment") + "";
         int orderState = 0;
 
-        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
         //消费大于0元则拉起支付
         if (productInfo.getPayAmount().compareTo(BigDecimal.ZERO) > 0) {
             result = payService.getPayToPlatformMap(tenantId,
@@ -842,7 +842,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         String orderNo = idGenerator.generatorId("payment") + "";
         int orderState = 0;
 
-        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
         //消费大于0元则拉起支付
         if (amount.compareTo(BigDecimal.ZERO) > 0) {
             result = payService.getPayToPlatformMap(tenantId,
@@ -1136,7 +1136,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         Map<String, Object> result = new HashMap<>();
         int orderState = 0;
 
-        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
         
         //消费大于0元则拉起支付
         if (amount.compareTo(BigDecimal.ZERO) > 0) {

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

@@ -10,6 +10,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.ym.mec.biz.service.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,10 +36,6 @@ import com.ym.mec.biz.dal.entity.TenantPaymentOrder.TenantPaymentType;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.PaymentChannelEnum;
 import com.ym.mec.biz.dal.page.TenantPaymentOrderQueryInfo;
-import com.ym.mec.biz.service.HfMerchantConfigService;
-import com.ym.mec.biz.service.PayService;
-import com.ym.mec.biz.service.SysTenantAccountService;
-import com.ym.mec.biz.service.TenantPaymentOrderService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
@@ -167,7 +164,7 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
         tenantPaymentOrder.setActivitiesId(activitiesId);
         tenantPaymentOrderDao.insert(tenantPaymentOrder);
 
-        String baseApiUrl = sysConfigDao.findConfigValue("teacher_base_url");
+        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.TEACHER_BASE_URL);
 
         // 分类费用 course，instrument，accessories，other
         Map<String, BigDecimal> classFee = new HashMap<>();

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

@@ -664,7 +664,7 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 		}
 
 		BigDecimal amount = studentPaymentOrder.getActualAmount();
-		String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+		String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
 		//分类费用 course，instrument，accessories，other
 		Map<String, BigDecimal> classFee = new HashMap<>();
 		classFee.put("course", amount);
@@ -851,7 +851,7 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 		}
 
 		String orderSubject = "2022双十一活动";
-		String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+		String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
 		Map payMap = payService.getPayMap(
 				studentPaymentOrder.getActualAmount(),
 				studentPaymentOrder.getBalancePaymentAmount(),

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

@@ -1834,11 +1834,11 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         if (teacher != null) {
             Map<Integer, String> map = new HashMap<>(1);
             map.put(vipGroup.getUserId(), vipGroup.getUserId().toString());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.TEACHER_SMS_PUSH_VIP_COURSE_APPLY_RESULT,
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.TEACHER_PUSH_VIP_COURSE_APPLY_RESULT,
                     map, null, 0, "7", "TEACHER", vipGroup.getName(), vipGroup.getAuditStatus().getMsg());
             Map<Integer, String> map1 = new HashMap<>(1);
             map1.put(vipGroup.getUserId(), teacher.getPhone());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.TEACHER_SMS_PUSH_VIP_COURSE_APPLY_RESULT,
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.TEACHER_SMS_VIP_COURSE_APPLY_RESULT,
                     map1, null, 0, "7", "", vipGroup.getName(), vipGroup.getAuditStatus().getMsg());
         }
     }
@@ -2789,7 +2789,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             businessLogger.error("[{}]课程购买协议生成错误：{}", vipGroup.getId(), e.getCause());
         }
 
-        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
         //分类费用 course，instrument，accessories，other
         Map<String, BigDecimal> classFee = new HashMap<>();
         classFee.put("course", amount);

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

@@ -33,15 +33,15 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.ImGroupMember" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO im_group_member (im_group_id_,user_id_,nickname_,is_admin_,role_type_,create_time_,update_time_,tenant_id_,type_,group_role_type_)
-		VALUES(#{imGroupId},#{userId},#{nickname},#{isAdmin},#{roleType},NOW(),NOW(),#{tenantId},#{type},#{groupRoleType})
+		INSERT INTO im_group_member (im_group_id_,user_id_,nickname_,is_admin_,role_type_,create_time_,update_time_,tenant_id_,type_,group_role_type_,mute_flag_)
+		VALUES(#{imGroupId},#{userId},#{nickname},#{isAdmin},#{roleType},NOW(),NOW(),#{tenantId},#{type},#{groupRoleType},#{muteFlag})
         ON DUPLICATE KEY UPDATE nickname_ = VALUES(nickname_), is_admin_ = VALUES(is_admin_), role_type_ = VALUES(role_type_), type_ = VALUES(type_)
 	</insert>
 	
 	<insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.ImGroupMember" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO im_group_member (im_group_id_,user_id_,nickname_,is_admin_,role_type_,create_time_,update_time_,tenant_id_,type_,group_role_type_) VALUES
+		INSERT INTO im_group_member (im_group_id_,user_id_,nickname_,is_admin_,role_type_,create_time_,update_time_,tenant_id_,type_,group_role_type_,mute_flag_) VALUES
 		 <foreach collection="list" item="item" separator=",">
-		(#{item.imGroupId},#{item.userId},#{item.nickname},#{item.isAdmin},#{item.roleType},NOW(),NOW(),#{item.tenantId},#{item.type},#{item.groupRoleType})
+		(#{item.imGroupId},#{item.userId},#{item.nickname},#{item.isAdmin},#{item.roleType},NOW(),NOW(),#{item.tenantId},#{item.type},#{item.groupRoleType},#{item.muteFlag})
 		</foreach>
         ON DUPLICATE KEY UPDATE nickname_ = VALUES(nickname_), is_admin_ = VALUES(is_admin_), role_type_ = VALUES(role_type_), type_ = VALUES(type_)
 	</insert>
@@ -52,13 +52,16 @@
 		<if test="groupRoleType != null and groupRoleType != ''">
 			group_role_type_ = #{groupRoleType},
 		</if>
+		<if test="muteFlag != null">
+			mute_flag_ = #{muteFlag},
+		</if>
 		<if test="roleType != null">
 		role_type_ = #{roleType},
 		</if>
 		<if test="userId != null">
 		user_id_ = #{userId},
 		</if>
-		<if test="nickname != null">
+		<if test="nickname != null and nickname != ''">
 		nickname_ = #{nickname},
 		</if>
 		<if test="isAdmin != null">
@@ -78,23 +81,26 @@
 		<foreach collection="list" item="item" index="index" open="" close="" separator=";">
 			UPDATE im_group_member 
 			<set>
-				<if test="item.groupRoleType != null">
+				<if test="item.groupRoleType != null and item.groupRoleType != ''">
 					group_role_type_ = #{item.groupRoleType},
 				</if>
+				<if test="item.muteFlag != null">
+					mute_flag_ = #{item.muteFlag},
+				</if>
 				<if test="item.roleType != null">
-				role_type_ = #{item.roleType},
+					role_type_ = #{item.roleType},
 				</if>
 				<if test="item.userId != null">
-				user_id_ = #{item.userId},
+					user_id_ = #{item.userId},
 				</if>
-				<if test="item.nickname != null">
-				nickname_ = #{item.nickname},
+				<if test="item.nickname != null and item.nickname != ''">
+					nickname_ = #{item.nickname},
 				</if>
 				<if test="item.isAdmin != null">
-				is_admin_ = #{item.isAdmin},
+					is_admin_ = #{item.isAdmin},
 				</if>
 				<if test="item.imGroupId != null">
-				im_group_id_ = #{item.imGroupId},
+					im_group_id_ = #{item.imGroupId},
 				</if>
                 <if test="item.type != null">
                     type_ = #{item.type},

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

@@ -10,9 +10,11 @@
 
 
     <insert id="insertBatch" parameterType="com.ym.mec.biz.dal.entity.ImGroupMemberPlus" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-        INSERT INTO im_group_member (im_group_id_,user_id_,nickname_,is_admin_,role_type_,create_time_,update_time_,tenant_id_,type_) VALUES
+        INSERT INTO im_group_member (im_group_id_,user_id_,nickname_,is_admin_,role_type_,
+        create_time_,update_time_,tenant_id_,type_,group_role_type_) VALUES
         <foreach collection="list" item="item" separator=",">
-            (#{item.imGroupId},#{item.userId},#{item.nickname},#{item.isAdmin},#{item.roleType},NOW(),NOW(),#{item.tenantId},#{item.type})
+            (#{item.imGroupId},#{item.userId},#{item.nickname},#{item.isAdmin},#{item.roleType},
+            NOW(),NOW(),#{item.tenantId},#{item.type},#{item.groupRoleType})
         </foreach>
         ON DUPLICATE KEY UPDATE nickname_ = VALUES(nickname_), is_admin_ = VALUES(is_admin_), role_type_ = VALUES(role_type_), type_ = VALUES(type_)
     </insert>