Merge branch 'zx_2022-11-21' of http://git.dayaedu.com/yonge/mec into master_saas

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysMessageDao.java

@@ -13,9 +13,9 @@ import com.ym.mec.common.dal.BaseDAO;
 
 public interface SysMessageDao extends BaseDAO<Long, SysMessage> {
 	
-	public List<SysMessageDto> queryListPage(Map<String, Object> params);
+	List<SysMessageDto> queryListPage(Map<String, Object> params);
 
-	public List<SysMessage> queryUserInRecentMinList(@Param("mobile") String mobile, @Param("recentMin") int recentMin, @Param("type") MessageSendMode type);
+	List<SysMessage> queryUserInRecentMinList(@Param("mobile") String mobile, @Param("recentMin") int recentMin, @Param("type") MessageSendMode type);
 
 	/**
 	 * 根据状态查询最近N分钟的记录
@@ -24,7 +24,7 @@ public interface SysMessageDao extends BaseDAO<Long, SysMessage> {
 	 * @param recentMin 最近分钟数
 	 * @return
 	 */
-	public List<SysMessage> queryByStatusAndTime(@Param("status") int status, @Param("recentMin") int recentMin);
+	List<SysMessage> queryByStatusAndTime(@Param("status") int status, @Param("recentMin") int recentMin);
 
 	/**
 	 * 批量插入
@@ -32,7 +32,7 @@ public interface SysMessageDao extends BaseDAO<Long, SysMessage> {
 	 * @param messages
 	 * @return
 	 */
-	public int batchInsert(List<SysMessage> messages);
+	int batchInsert(List<SysMessage> messages);
 
 	/**
 	 * 查询消息未读条数
@@ -41,15 +41,15 @@ public interface SysMessageDao extends BaseDAO<Long, SysMessage> {
 	 * @param userId
 	 * @return
 	 */
-	public List<Mapper> queryCountOfUnread(@Param("type") MessageSendMode type, @Param("userId") Integer userId, @Param("jpushType") String jpushType, @Param("tenantId") Integer tenantId);
+	List<Mapper> queryCountOfUnread(@Param("type") MessageSendMode type, @Param("userId") Integer userId, @Param("jpushType") String jpushType, @Param("tenantId") Integer tenantId);
 
 	/**
 	 * 修改用户所有消息阅读状态
 	 */
-	public int updateStatus(@Param("userId") Integer userId, @Param("status") int status, @Param("jpushType") String jpushType);
+	int updateStatus(@Param("userId") Integer userId, @Param("status") int status, @Param("jpushType") String jpushType);
 
 	/**
 	 * 修改单个消息状态
 	 */
-	public int updateOneStatus(@Param("id") Long id, @Param("status") int status);
+	int updateOneStatus(@Param("id") Long id, @Param("status") int status);
 }

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

@@ -18,7 +18,7 @@ import com.ym.mec.thirdparty.message.MessageSenderPluginContext.MessageSender;
 
 public interface SysMessageService extends BaseService<Long, SysMessage> {
 	
-	public PageInfo<SysMessageDto> queryListPage(QueryInfo queryInfo);
+	PageInfo<SysMessageDto> queryListPage(QueryInfo queryInfo);
 
 	/**
 	 * 修改消息对象

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

@@ -2664,11 +2664,10 @@ public class ExportServiceImpl implements ExportService {
             for (CourseScheduleEndDto row : rows) {
                 row.setIsComplaints(StringUtils.equals(row.getIsComplaints(), "1") ? "有" : "无");
             }
-            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部名称", "乐团主管", "课程编号", "课程组编号", "开始时间", "结束时间",
-                    "班级名称", "班级声部", "课程名称", "课程类型", "教学模式",
-                    "教学点", "课程状态", "指导老师", "学员编号", "是否点名", "是否有考勤申诉", "预计上课人数", "合作单位"}, new String[]{
-                    "organName", "educationTeacherName", "id", "musicGroupId", "startClassTime", "endClassTime", "classGroupName", "subjectName", "name",
-                    "groupType.desc", "teachMode.msg", "schoolName", "status.msg", "teacherName", "studentId", "isCallNames.msg", "isComplaints", "studentNum", "cooperationOrgan"}, rows);
+            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部名称", "乐团主管", "课程编号", "课程组编号", "开始时间", "结束时间","班级声部", "课程名称", "课程类型", "教学模式",
+                    "教学点", "课程状态", "指导老师", "是否点名", "是否有考勤申诉", "预计上课人数", "合作单位"}, new String[]{
+                    "organName", "educationTeacherName", "id", "musicGroupId", "startClassTime", "endClassTime", "subjectName", "name",
+                    "groupType.desc", "teachMode.msg", "schoolName", "status.msg", "teacherName", "isCallNames.msg", "isComplaints", "studentNum", "cooperationOrgan"}, rows);
             exportManagerDownload(workbook, managerDownload);
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -110,6 +110,9 @@ public class MusicGroupDeliveryRecordServiceImpl extends BaseServiceImpl<Long, M
 		}
 		
 		List<Goods> goodsList = goodsService.findGoodsByIds(goodsIdsStr.toString());
+		goodsList.forEach(t -> {
+			t.setSellCount(0);
+		});
 		Map<Integer, Goods> goodsMap = goodsList.stream().collect(Collectors.toMap(Goods::getId, t -> t));
 
 		Goods g = null;

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

@@ -179,19 +179,21 @@ public class StudentManageServiceImpl implements StudentManageService {
                 }
                 dto.setSubjectName(subjectMap.get(dto.getSubjectIdList()));
                 dto.setCooperationOrganName(cooMap.get(dto.getCooperationOrganId()));
-                List<StudentTeacherMapperDto> mapperList = mappersMap.get(dto.getUserId());
-                if(!CollectionUtils.isEmpty(mapperList)){
-                    Map<String, List<StudentTeacherMapperDto>> collect = mapperList.stream().collect(Collectors.groupingBy(StudentTeacherMapperDto::getTeacherType));
-                    for (String s : collect.keySet()) {
-                        String teacherName = collect.get(s).stream().map(e -> e.getTeacherName()).collect(Collectors.joining(","));
-                        if("VIP".equals(s)){
-                            dto.setVipTeacherName(teacherName);
-                        }else if("PRACTICE".equals(s)){
-                            dto.setPracticeTeacherName(teacherName);
-                        }else if("NORMAL".equals(s)){
-                            dto.setNormalTeacherName(teacherName);
-                        }else {
-                            dto.setMixTeacherName(teacherName);
+                if(!CollectionUtils.isEmpty(mappersMap)){
+                    List<StudentTeacherMapperDto> mapperList = mappersMap.get(dto.getUserId());
+                    if(!CollectionUtils.isEmpty(mapperList)){
+                        Map<String, List<StudentTeacherMapperDto>> collect = mapperList.stream().collect(Collectors.groupingBy(StudentTeacherMapperDto::getTeacherType));
+                        for (String s : collect.keySet()) {
+                            String teacherName = collect.get(s).stream().map(e -> e.getTeacherName()).collect(Collectors.joining(","));
+                            if("VIP".equals(s)){
+                                dto.setVipTeacherName(teacherName);
+                            }else if("PRACTICE".equals(s)){
+                                dto.setPracticeTeacherName(teacherName);
+                            }else if("NORMAL".equals(s)){
+                                dto.setNormalTeacherName(teacherName);
+                            }else {
+                                dto.setMixTeacherName(teacherName);
+                            }
                         }
                     }
                 }

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

@@ -180,7 +180,8 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
                 .ge(Objects.nonNull(param.get("applyStartDate")), TempLittleArtistTrainingCamp::getApplyStartDate, param.get("applyStartDate"))
                 .le(Objects.nonNull(param.get("applyEndDate")), TempLittleArtistTrainingCamp::getApplyEndDate, param.get("applyEndDate"))
                 .ge(Objects.nonNull(param.get("trainStartDate")), TempLittleArtistTrainingCamp::getTrainStartDate, param.get("trainStartDate"))
-                .le(Objects.nonNull(param.get("trainEndDate")), TempLittleArtistTrainingCamp::getTrainEndDate, param.get("trainEndDate")));
+                .le(Objects.nonNull(param.get("trainEndDate")), TempLittleArtistTrainingCamp::getTrainEndDate, param.get("trainEndDate"))
+                .orderByDesc(TempLittleArtistTrainingCamp::getId));
         return PageUtil.pageInfo(pageList);
     }
 

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

@@ -67,7 +67,7 @@ public class TempLittleArtistTrainingCampUserRelationServiceImpl extends Service
         TempLittleArtistTrainingCampUserRelation one = this.getOne(Wrappers.<TempLittleArtistTrainingCampUserRelation>lambdaQuery()
                 .eq(TempLittleArtistTrainingCampUserRelation::getUserId, user.getId())
                 .isNotNull(TempLittleArtistTrainingCampUserRelation::getActivityId));
-        if (Objects.nonNull(one)) {
+        if (Objects.nonNull(one) && one.getActivityId() != null) {
             throw new BizException("您已登记训练营!");
         }
         int count = this.count(Wrappers.<TempLittleArtistTrainingCampUserRelation>lambdaUpdate()
@@ -81,11 +81,22 @@ public class TempLittleArtistTrainingCampUserRelationServiceImpl extends Service
         if (updateFlag == 0) {
             throw new BizException("人数已报满！");
         }
-        this.update(Wrappers.<TempLittleArtistTrainingCampUserRelation>lambdaUpdate()
-                .set(TempLittleArtistTrainingCampUserRelation::getActivityId, campId)
-                .set(TempLittleArtistTrainingCampUserRelation::getState, TempLittleArtistTrainingCampUserRelation.APPLY)
-                .set(TempLittleArtistTrainingCampUserRelation::getApplyTime, new Date())
-                .eq(TempLittleArtistTrainingCampUserRelation::getUserId, user.getId()));
+        Date now = new Date();
+        if(Objects.isNull(one)){
+            one = new TempLittleArtistTrainingCampUserRelation();
+            one.setCreateTime(new Date());
+            one.setUserId(user.getId());
+            one.setActivityId(campId);
+            one.setApplyTime(now);
+            one.setState(TempLittleArtistTrainingCampUserRelation.APPLY);
+            this.save(one);
+        }else {
+            this.update(Wrappers.<TempLittleArtistTrainingCampUserRelation>lambdaUpdate()
+                    .set(TempLittleArtistTrainingCampUserRelation::getActivityId, campId)
+                    .set(TempLittleArtistTrainingCampUserRelation::getState, TempLittleArtistTrainingCampUserRelation.APPLY)
+                    .set(TempLittleArtistTrainingCampUserRelation::getApplyTime,now)
+                    .eq(TempLittleArtistTrainingCampUserRelation::getUserId, user.getId()));
+        }
         addCamp.delete();
     }
 

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

@@ -12,8 +12,7 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id_
-        , activity_id_, user_id_, im_group_id_, state_, create_time_,apply_time_
+        id_, activity_id_, user_id_, im_group_id_, state_, create_time_,apply_time_
     </sql>
 
     <insert id="insertBatch" keyColumn="id_" keyProperty="id" useGeneratedKeys="true"

mec-teacher/src/main/java/com/ym/mec/teacher/controller/SysMessageController.java

@@ -1,35 +1,26 @@
 package com.ym.mec.teacher.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.enums.MessageSendMode;
+import com.ym.mec.biz.dal.page.SysMessageQueryInfo;
+import com.ym.mec.biz.service.SysMessageService;
+import com.ym.mec.biz.service.SysUserService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.exception.BizException;
+import com.ym.mec.thirdparty.message.MessageSenderPluginContext.MessageSender;
+import com.ym.mec.util.validator.CommonValidator;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
 import org.apache.commons.lang3.StringUtils;
-import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.entity.SysMessage;
-import com.ym.mec.biz.dal.enums.MessageSendMode;
-import com.ym.mec.biz.dal.page.SysMessageQueryInfo;
-import com.ym.mec.biz.service.SysMessageService;
-import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.exception.BizException;
-import com.ym.mec.common.page.PageInfo;
-import com.ym.mec.thirdparty.message.MessageSenderPluginContext.MessageSender;
-import com.ym.mec.util.validator.CommonValidator;
+import java.io.IOException;
+import java.util.Map;
 
 @RestController
 @Api(tags = "消息服务")
@@ -40,16 +31,12 @@ public class SysMessageController extends BaseController {
 	private SysMessageService sysMessageService;
 
 	@Autowired
-	private SysUserFeignService sysUserFeignService;
+	private SysUserService sysUserService;
 
 	@ApiOperation("获取所有消息列表")
 	@GetMapping(value = "list")
 	public Object list(SysMessageQueryInfo queryInfo) throws IOException {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (sysUser == null) {
-			return failed(HttpStatus.FORBIDDEN, "请登录");
-		}
-		queryInfo.setUserId(sysUser.getId());
+		queryInfo.setUserId(sysUserService.getUserId());
 		queryInfo.setType(3);
 		queryInfo.setJpushType("TEACHER");
 		return succeed(sysMessageService.queryPage(queryInfo));
@@ -68,34 +55,21 @@ public class SysMessageController extends BaseController {
 	@ApiOperation("一键已读")
 	@PostMapping("batchSetRead")
 	public Object batchSetRead() {
-		int status = 1;
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (sysUser == null) {
-			return failed(HttpStatus.FORBIDDEN, "请登录");
-		}
-		return sysMessageService.updateStatus(sysUser.getId(), status,"TEACHER") > 0 ? succeed() : failed();
+		return sysMessageService.updateStatus(sysUserService.getUserId(), 1,"TEACHER") > 0 ? succeed() : failed();
 	}
 
 	@ApiOperation("设置已读")
 	@PostMapping("setRead")
 	public Object setRead(Long id) {
-		int status = 1;
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (sysUser == null) {
-			return failed(HttpStatus.FORBIDDEN, "请登录");
-		}
-		return sysMessageService.updateOneStatus(id, status) > 0 ? succeed() : failed();
+		return sysMessageService.updateOneStatus(id, 1) > 0 ? succeed() : failed();
 	}
 
 	@ApiOperation(value = "查询用户未读消息条数")
 	@GetMapping("/queryCountOfUnread")
 	public Object queryCountOfUnread() {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (sysUser == null) {
-			return failed("请重新登录");
-		}
-		Map<String, Integer> map = sysMessageService.queryCountOfUnread(MessageSendMode.PUSH, sysUser.getId(),"TEACHER", sysUser.getTenantId());
-
+		SysUser sysUser = sysUserService.getUser();
+		Map<String, Integer> map = sysMessageService.
+				queryCountOfUnread(MessageSendMode.PUSH, sysUser.getId(),"TEACHER", sysUser.getTenantId());
 		if (map == null || map.size() == 0) {
 			return succeed();
 		}
@@ -105,17 +79,12 @@ public class SysMessageController extends BaseController {
 	@ApiOperation(value = "发送消息")
 	@PostMapping("/sendMessage")
 	public Object sendMessage(MessageSender messageSender, String content, String receiver, int readStatus, String url, String group) {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (sysUser == null) {
-			return failed(HttpStatus.FORBIDDEN, "请登录");
-		}
-		Integer userId = sysUser.getId();
-
+		SysUser sysUser = sysUserService.getUser();
 		String mobileNo = sysUser.getPhone();
 		if (StringUtils.isBlank(mobileNo) || !CommonValidator.isMobileNo(mobileNo)) {
 			throw new BizException("请输入正确的手机号");
 		}
-		sysMessageService.sendMessage(messageSender, userId, "", content, receiver, null, readStatus, url, group,"TEACHER");
+		sysMessageService.sendMessage(messageSender, sysUser.getId(), "", content, receiver, null, readStatus, url, group,"TEACHER");
 		return succeed();
 	}
 }

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

@@ -925,9 +925,9 @@ public class ExportController extends BaseController {
         OutputStream outputStream = response.getOutputStream();
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "学员编号", "学员姓名", "性别", "家长姓名",
-                    "家长联系电话", "是否激活", "是否有课", "是否有网管课", "网管课剩余课时", "VIP课剩余课时", "课程余额(元)", "账户余额(元)",
+                    "家长联系电话", "VIP老师", "网管老师", "声部老师", "合奏老师", "是否激活", "是否有课", "是否有网管课", "网管课剩余课时", "VIP课剩余课时", "课程余额(元)", "账户余额(元)",
                     "所在乐团", "乐团所属声部", "所在乐团状态", "所在vip课", "所在VIP状态", "服务标签", "运营标签", "指导老师", "是否签订协议", "是否使用云教练", "会员截止日期", "会员剩余天数", "会员试用结束日期", "会员试用剩余天数"}, new String[]{
-                    "organName", "userId", "username", "gender.description", "parentsName", "parentsPhone",
+                    "organName", "userId", "username", "gender.description", "parentsName", "parentsPhone","vipTeacherName", "practiceTeacherName", "normalTeacherName", "mixTeacherName",
                     "isActive.msg", "hasCourse.msg", "hasPracticeCourse.msg", "noStartPracticeCourseNum", "noStartVipCourseNum", "courseBalance", "balance", "musicGroupName",
                     "subjectName", "musicGroupStatus", "vipGroupName", "vipGroupStatus", "serviceTag.msg", "operatingTag.msg", "teacherName", "isSignedContract ? '是' : '否'", "recordUserId == null ? '否' : '是'",
                     "membershipEndTime", "membershipEndTime == null ? hasNoStartCloudTeacher ? \"未生效\" : \"未购买\" : membershipDay >= 0 ? membershipDay : hasNoStartCloudTeacher ? \"未生效\" : \"会员已过期\"",