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

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

@@ -969,7 +969,7 @@
         <if test="subjectId != null">
             AND FIND_IN_SET(#{subjectId},subject_id_list_)
         </if>
-        AND type_='HIGH' AND del_flag_='0';
+        AND type_ IN ('HIGH','HIGH_ONLINE') AND del_flag_='0';
     </select>
     <select id="findByMusicGroupAndType" resultMap="ClassGroup">
         SELECT
@@ -1230,7 +1230,7 @@
         WHERE su.real_name_ LIKE CONCAT('%',#{search},'%') OR su.id_=#{search}
     </select>
     <select id="countClassNumByType" resultType="java.lang.Integer">
-        SELECT COUNT(id_) FROM class_group WHERE type_ = 'HIGH' AND del_flag_ = '0'
+        SELECT COUNT(id_) FROM class_group WHERE type_ IN ('HIGH','HIGH_ONLINE') AND del_flag_ = '0'
     </select>
 
     <select id="findClassGroupSubjectNameMaps" resultType="java.util.Map">

mec-im/src/main/java/com/ym/controller/PrivateController.java

@@ -8,6 +8,7 @@ import io.rong.models.message.GroupMessage;
 import io.rong.models.message.PrivateMessage;
 import io.rong.models.message.RecallMessage;
 import io.rong.models.message.TemplateMessage;
+import org.apache.commons.lang.StringEscapeUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -41,7 +42,7 @@ public class PrivateController {
     public Object sendCustom(@RequestBody ImGroupMessage imGroupMessage) throws Exception {
         GroupMessage groupMessage = new GroupMessage();
         ImTxtMessage content = (ImTxtMessage)imGroupMessage.getContent();
-        CustomMessage customMessage = new CustomMessage(content.getContent(),content.getExtra());
+        CustomMessage customMessage = new CustomMessage(StringEscapeUtils.unescapeJavaScript(content.getContent()),content.getExtra());
         customMessage.setTYPE(imGroupMessage.getType());
         groupMessage.setContent(customMessage);
         groupMessage.setTargetId(imGroupMessage.getTargetId());

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

@@ -49,7 +49,7 @@ public class ClassGroupController extends BaseController {
     public HttpResponseResult highReg(Integer classGroupId) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         ClassGroup classGroup = classGroupService.get(classGroupId);
-        if (classGroup == null || !classGroup.getType().equals(ClassGroupTypeEnum.HIGH) || classGroup.getDelFlag().equals(1)) {
+        if (classGroup == null || (!classGroup.getType().equals(ClassGroupTypeEnum.HIGH)&&!classGroup.getType().equals(ClassGroupTypeEnum.HIGH_ONLINE)) || classGroup.getDelFlag().equals(1)) {
             return failed("报名的班级不存在");
         }
         if (classGroup.getStudentNum().compareTo(classGroup.getExpectStudentNum()) >= 0) {
@@ -76,11 +76,16 @@ public class ClassGroupController extends BaseController {
         Map<String, Object> classGroupAndStatusMap = new HashMap<>();
         List<HighClassGroupDto> highClassGroups = classGroupService.findClassGroupByMusicGroupIdAndSubjectId(musicGroupId, studentRegistration.getActualSubjectId());
         List<ClassGroupStudentMapper> ClassGroupStudentMapper = classGroupStudentMapperDao.findHighClassGroupHasUser(musicGroupId, userId,ClassGroupTypeEnum.HIGH);
+        List<ClassGroupStudentMapper> highOnlineClassGroupStudentMapper = classGroupStudentMapperDao.findHighClassGroupHasUser(musicGroupId, userId,ClassGroupTypeEnum.HIGH_ONLINE);
         classGroupAndStatusMap.put("highClassGroups", highClassGroups);
         classGroupAndStatusMap.put("hasReg", false);
+        classGroupAndStatusMap.put("onlineHasReg", false);
         if (ClassGroupStudentMapper.size() > 0) {
             classGroupAndStatusMap.put("hasReg", true);
         }
+        if (highOnlineClassGroupStudentMapper.size() > 0) {
+            classGroupAndStatusMap.put("onlineHasReg", true);
+        }
         return succeed(classGroupAndStatusMap);
     }
 }

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

@@ -57,16 +57,16 @@ public class SysUserCashAccountController extends BaseController {
 	@ApiOperation(value = "更新指定用户的账户课程余额")
 	@PostMapping("/updateCourseBalance")
 	@PreAuthorize("@pcs.hasPermissions('userCashAccount/updateCourseBalance')")
-	public Object updateCourseBalance(Integer userId, BigDecimal decimal) {
-		sysUserCashAccountService.updateCourseBalance(userId,decimal,decimal,"后台更新课程余额");
+	public Object updateCourseBalance(Integer userId, BigDecimal decimal, String memo) {
+		sysUserCashAccountService.updateCourseBalance(userId,decimal,decimal, memo);
 		return succeed();
 	}
 
 	@ApiOperation(value = "更新指定用户的账户可用余额")
 	@PostMapping("/updateBalance")
 	@PreAuthorize("@pcs.hasPermissions('userCashAccount/updateBalance')")
-	public Object updateBalance(Integer userId, BigDecimal decimal) {
-		sysUserCashAccountService.updateBalance(userId,decimal,FILL_ACCOUNT,"后台更新可用余额");
+	public Object updateBalance(Integer userId, BigDecimal decimal, String memo) {
+		sysUserCashAccountService.updateBalance(userId,decimal,FILL_ACCOUNT, memo);
 		return succeed();
 	}
 }

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

@@ -2,7 +2,6 @@ package com.ym.mec.web.controller.education;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.service.ClassGroupService;
 import com.ym.mec.biz.service.SysMessageService;
 import com.ym.mec.biz.service.TeacherService;
@@ -16,8 +15,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 @Api(tags = "即时通讯相关服务")
 @RequestMapping("im")
 @RestController
@@ -102,5 +99,4 @@ public class ImController extends BaseController {
         sysMessageService.sendPrivateMessage(targetId,content);
         return succeed();
     }
-
 }