Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -303,4 +303,10 @@ public interface VipGroupDao extends BaseDAO<Long, VipGroup> {
 	 * @return com.ym.mec.biz.dal.dto.VipBuyResultDto
 	 */
 	VipBuyResultDto getVipBuyResultInfo(@Param("vipGroupId") Integer vipGroupId);
+	
+	/**
+	 * 查询需要结束的对象列表
+	 * @return
+	 */
+	List<VipGroup> queryRequiredOverList();
 }

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

@@ -704,6 +704,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         List<CourseSchedule> courseScheduleList = courseScheduleService.findNoStartCoursesByClassGroupId(classGroupId);
         if (courseScheduleList.size() > 0) {
             List<Long> courseScheduleIds = courseScheduleList.stream().map(courseSchedule -> courseSchedule.getId()).collect(Collectors.toList());
+            courseScheduleDao.batchDeleteCourseSchedules(courseScheduleIds);
             courseScheduleTeacherSalaryDao.batchDeleteByCourseScheduleIds(courseScheduleIds);
             teacherAttendanceDao.batchDeleteByCourseSchedules(courseScheduleIds);
             courseScheduleStudentPaymentDao.deleteByCourseSchedule(courseScheduleIds);

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

@@ -252,7 +252,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (studentRegistration.getTemporaryCourseFee() != null) {
             List<StudentPaymentOrderDetail> orderDetails = studentPaymentOrderDetailService.findUserApplyOrder(studentRegistration.getUserId(), DealStatusEnum.WAIT_PAY);
             for (StudentPaymentOrderDetail orderDetail : orderDetails) {
-                if (orderDetail == null || orderDetail.getPrice() == null){
+                if (orderDetail == null || orderDetail.getPrice() == null || orderDetail.getGoodsIdList() != null){
                     continue;
                 }
                 MusicGroupSubjectGoodsGroup musicGroupSubjectGoodsGroup = new MusicGroupSubjectGoodsGroup();
@@ -401,7 +401,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (studentRegistration.getTemporaryCourseFee() != null) {
             List<StudentPaymentOrderDetail> orderDetails = studentPaymentOrderDetailService.findUserApplyOrder(studentRegistration.getUserId(), DealStatusEnum.WAIT_PAY);
             for (StudentPaymentOrderDetail orderDetail : orderDetails) {
-                if (orderDetail == null || orderDetail.getPrice() == null){
+                if (orderDetail == null || orderDetail.getPrice() == null || orderDetail.getGoodsIdList() != null){
                     continue;
                 }
                 MusicGroupSubjectGoodsGroup musicGroupSubjectGoodsGroup = new MusicGroupSubjectGoodsGroup();

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

@@ -21,6 +21,7 @@ import com.ym.mec.common.entity.ImResult;
 import com.ym.mec.common.entity.ImUserModel;
 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.im.ImFeignService;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
@@ -93,6 +94,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     private ClassGroupStudentMapperService classGroupStudentMapperService;
     @Autowired
     private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private RedisCache<String, Object> redisCache;
 
     @Override
     public BaseDAO<Long, StudentRegistration> getDAO() {
@@ -123,7 +126,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     @Transactional(rollbackFor = Exception.class)
     public Integer batchUpdateSubject(Integer userId, Integer subId, String musicGroupId) throws Exception {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null){
+        if (sysUser == null) {
             throw new BizException("获取用户信息失败");
         }
         //获取当前学员的当前声部
@@ -133,7 +136,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         }
         //批量调剂（未缴费学员）
         int i = studentRegistrationDao.batchUpdateSubject(userId, subId, musicGroupId);
-        if(i > 0){
+        if (i > 0) {
             //当前专业报名人数减一
             musicGroupSubjectPlanService.addApplyStudentNum(musicGroupId, studentRegistration.getActualSubjectId(), -1);
             //修改专业已报名人数
@@ -143,8 +146,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             roleIds.add(SysUserRole.SECTION_MANAGER);
             roleIds.add(SysUserRole.OPERATION_EXECUTIVE);
 
-    		String[] organIds = { musicGroup.getOrganId() + "" };
-            sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds,organIds), MessageTypeEnum.BACKSTAGE_STUDENT_SUBJECT_CHANGE, "", musicGroup.getName());
+            String[] organIds = {musicGroup.getOrganId() + ""};
+            sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds, organIds), MessageTypeEnum.BACKSTAGE_STUDENT_SUBJECT_CHANGE, "", musicGroup.getName());
         }
         return i;
     }
@@ -190,6 +193,11 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     @Override
     @Transactional(rollbackFor = Exception.class)
     public StudentRegistration addStudent(StudentRegistration studentRegistration) throws IOException {
+    	String key = "_student_registration";
+    	long threadId = Thread.currentThread().getId();
+    	if(!redisCache.getLocked(key, threadId, 10)){
+    		throw new BizException("系统繁忙，请稍后再试");
+    	}
         Date date = new Date();
         Integer userId = 0;
         SysUser sysUser = studentRegistrationDao.getSysUserByPhone(studentRegistration.getParentsPhone());
@@ -202,7 +210,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             sysUser.setDelFlag(com.ym.mec.auth.api.enums.YesOrNoEnum.NO);
             sysUser.setUserType(SysUserType.STUDENT);
             sysUser.setGender(studentRegistration.getGender());
-            if(studentRegistration.getOrganId() != null){
+            if (studentRegistration.getOrganId() != null) {
                 sysUser.setOrganId(studentRegistration.getOrganId());
             }
             sysUser.setRealName(studentRegistration.getParentsName());
@@ -224,8 +232,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         studentRegistration.setCreateTime(date);
         studentRegistration.setUpdateTime(date);
         studentRegistration.setUserId(sysUser.getId());
-        studentRegistrationDao.updateCurrentClass(studentRegistration);
         studentRegistrationDao.insert(studentRegistration);
+        studentRegistrationDao.updateCurrentClass(studentRegistration);
         //增加报名学生数
         musicGroupSubjectPlanService.addApplyStudentNum(studentRegistration.getMusicGroupId(), studentRegistration.getSubjectId(), 1);
         //报名成功后，发送短信
@@ -240,6 +248,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 MessageTypeEnum.SMS_APPLY_MESSAGE, map, null, 0, "",
                 studentRegistration.getParentsName(), subject.getName(), HttpUtil.getSortUrl(studentApplyUrl),
                 DateUtil.format(musicGroup.getApplyExpireDate(), DateUtil.DATE_FORMAT_MIN), serverPhone);
+        
+        redisCache.releaseLocked(key, threadId);
         return studentRegistration;
     }
 
@@ -248,8 +258,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         return studentRegistrationDao.queryStudentInfo(userId);
     }
 
-    @Transactional(rollbackFor = Exception.class)
     @Override
+    @Transactional
     public StudentPaymentOrder addOrder(StudentRegistration studentRegistration, BigDecimal amount, String orderNo, String paymentChannel, BigDecimal courseFee, List<MusicGroupSubjectGoodsGroup> goodsGroups, List<Goods> goodsList, List<Goods> otherGoodsList) throws Exception {
         Date date = new Date();
         StudentPaymentOrder studentPaymentOrder = new StudentPaymentOrder();
@@ -331,12 +341,15 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         if (studentRegistration.getTemporaryCourseFee() == null && musicOneSubjectClassPlan.getPaidStudentNum() > musicOneSubjectClassPlan.getExpectedStudentNum()) {
             throw new BizException("乐团人数已满");
         }
-        musicGroupSubjectPlanService.update(musicOneSubjectClassPlan);
+        int count = musicGroupSubjectPlanService.update(musicOneSubjectClassPlan);
+        if (count <= 0) {
+            throw new BizException("系统繁忙请重新");
+        }
         return studentPaymentOrder;
     }
 
-    @Transactional(rollbackFor = Exception.class)
     @Override
+    @Transactional
     public StudentPaymentOrder reAddOrder(Integer userId, BigDecimal amount, String orderNo, String paymentChannel, BigDecimal courseFee, List<MusicGroupSubjectGoodsGroup> goodsGroups, List<Goods> goodsList, List<Goods> otherGoodsList, String musicGroupId, StudentPaymentOrder oldOrder) {
         //关闭老订单
         oldOrder.setStatus(DealStatusEnum.CLOSE);
@@ -424,7 +437,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         StudentRegistration registration = studentRegistrationDao.queryByUserIdAndMusicGroupId(userId, musicGroupId);
         SysUserCashAccount account = sysUserCashAccountDao.getLocked(userId);
         registration.setBalance(account.getBalance());
-        registration.setTransferStudent(registration.getTemporaryCourseFee() == null?0:1);
+        registration.setTransferStudent(registration.getTemporaryCourseFee() == null ? 0 : 1);
         return registration;
     }
 
@@ -484,8 +497,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             Set<Integer> roleIds = new HashSet<>(1);
             roleIds.add(SysUserRole.OPERATION_EXECUTIVE);
 
-    		String[] organIds = { musicGroup.getOrganId() + "" };
-            sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds,organIds), MessageTypeEnum.BACKSTAGE_MUSIC_GROUP_ADD_STUDENT, "", musicGroup.getName(), studentRegistration.getName());
+            String[] organIds = {musicGroup.getOrganId() + ""};
+            sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds, organIds), MessageTypeEnum.BACKSTAGE_MUSIC_GROUP_ADD_STUDENT, "", musicGroup.getName(), studentRegistration.getName());
             //增加报名学生数
             musicGroupSubjectPlanService.addApplyStudentNum(musicGroupId, studentRegistration.getSubjectId(), 1);
             Integer classGroupId = studentRegistration.getClassGroupId();
@@ -511,7 +524,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 //                ClassGroupRelation classGroupRelation = classGroupRelationDao.findClassGroupRelation(classGroupId);
 //                classGroupStudentMapper.setClassGroupId(classGroupRelation.getClassGroupId());
 //                classGroupStudentMapperDao.insert(classGroupStudentMapper);
-                addStudents(classGroup,userId);
+                addStudents(classGroup, userId);
                 Date date = new Date();
                 //获取当前月
                 Integer month = Integer.parseInt(DateUtil.getMonth(date));
@@ -554,7 +567,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 studentPaymentOrderDetails.add(studentPaymentOrderDetail);
                 //汇总金额
                 BigDecimal reduce = studentPaymentOrderDetails.stream().map(e -> e.getPrice()).reduce(BigDecimal.ZERO, BigDecimal::add);
-                if(reduce == BigDecimal.ZERO){
+                if (reduce == BigDecimal.ZERO) {
                     studentPaymentOrder.setStatus(DealStatusEnum.SUCCESS);
                     studentRegistration.setPaymentStatus(PaymentStatusEnum.YES);
                     studentPaymentOrder.setActualAmount(reduce);
@@ -569,15 +582,15 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 studentPaymentOrderDetailService.batchAdd(studentPaymentOrderDetails);
             }
             studentRegistrationDao.updateCurrentClass(studentRegistration);
-            Map<Integer,String> receivers = new HashMap<>(1);
-            receivers.put(studentRegistration.getUserId(),studentRegistration.getParentsPhone());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI,MessageTypeEnum.SMS_MUSIC_GROUP_ADD_STUDENT,
-                    receivers,null,0,null,studentRegistration.getParentsName(),studentRegistration.getName(),musicGroup.getName());
+            Map<Integer, String> receivers = new HashMap<>(1);
+            receivers.put(studentRegistration.getUserId(), studentRegistration.getParentsPhone());
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.SMS_MUSIC_GROUP_ADD_STUDENT,
+                    receivers, null, 0, null, studentRegistration.getParentsName(), studentRegistration.getName(), musicGroup.getName());
             return userId;
         }
     }
 
-    public void addStudents(ClassGroup classGroup, Integer userId){
+    public void addStudents(ClassGroup classGroup, Integer userId) {
         Date nowDate = new Date();
         //1、班级关系添加
         List<ClassGroupStudentMapper> classGroupStudentMappers = new ArrayList<>();
@@ -587,9 +600,9 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 
         //校验是否存在历史记录
         ClassGroupStudentMapper classGroupStudentMapper = classGroupStudentMapperDao.findClassStudentMapperByUserIdAndClassGroupId(userId, classGroupId);
-        if(classGroupStudentMapper != null){
+        if (classGroupStudentMapper != null) {
             classGroupStudentMapper.setStatus(ClassGroupStudentStatusEnum.NORMAL);
-        }else {
+        } else {
             classGroupStudentMapper = new ClassGroupStudentMapper();
             classGroupStudentMapper.setMusicGroupId(classGroup.getMusicGroupId());
             classGroupStudentMapper.setClassGroupId(classGroupId);
@@ -774,7 +787,10 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         //减去缴费人数
         if (studentPaymentOrder.getStatus().equals(DealStatusEnum.FAILED)) {
             musicOneSubjectClassPlan.setPaidStudentNum(musicOneSubjectClassPlan.getPaidStudentNum() - 1);
-            musicGroupSubjectPlanService.update(musicOneSubjectClassPlan);
+            int updateCount = musicGroupSubjectPlanService.update(musicOneSubjectClassPlan);
+            if(updateCount <= 0){
+                throw new BizException("减去缴费人数失败");
+            }
             //发送缴费成功通知（短信 + push）
             String studentApplyUrl = sysConfigDao.findConfigValue(SysConfigService.STUDENT_APPLY_URL + studentRegistration.getMusicGroupId());
 
@@ -883,7 +899,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         List<ClassGroupStudentMapper> classGroupStudentMappers = classGroupStudentMapperDao.findMusicGroupClassGroupByType(musicGroupId, type);
         for (StudentRegistration student : students) {
             for (ClassGroupStudentMapper classGroupStudentMapper : classGroupStudentMappers) {
-                if(classGroupStudentMapper.getUserId().equals(student.getUserId())){
+                if (classGroupStudentMapper.getUserId().equals(student.getUserId())) {
                     students.remove(student);
                 }
             }

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

@@ -1665,7 +1665,15 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 	@Override
 	public void updateVipGroupStatusToFinished() {
-		
+		List<VipGroup> vipGroupList = vipGroupDao.queryRequiredOverList();
+		if (vipGroupList != null && vipGroupList.size() > 0) {
+			Date date = new Date();
+			for (VipGroup vipGroup : vipGroupList) {
+				vipGroup.setStatus(VipGroupStatusEnum.FINISHED);
+				vipGroup.setUpdateTime(date);
+			}
+			vipGroupDao.batchUpdate(vipGroupList);
+		}
 	}
 
 	@Override

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

@@ -864,4 +864,8 @@
 	        WHERE id_ = #{item.id}
         </foreach>
     </update>
+    
+    <select id="queryRequiredOverList" resultMap="VipGroup">
+    	select vg.* from vip_group vg left join class_group cg on vg.id_ = cg.music_group_id_ where vg.status_ = 2 and cg.total_class_times_ = cg.current_class_times_ and cg.total_class_times_ &gt; 0
+    </select>
 </mapper>

mec-client-api/src/main/java/com/ym/mec/task/TaskRemoteService.java

@@ -56,4 +56,8 @@ public interface TaskRemoteService {
 	@GetMapping("task/queryOrderStatus")
 	// 订单状态查询
 	public void queryOrderStatus();
+
+	@GetMapping("task/updateVipGroupToFinishedStatus")
+	// 更新VIP课程状态至已结束
+	public void updateVipGroupToFinishedStatus();
 }

mec-client-api/src/main/java/com/ym/mec/task/fallback/TaskRemoteServiceFallback.java

@@ -70,4 +70,9 @@ public class TaskRemoteServiceFallback implements TaskRemoteService {
 	public void queryOrderStatus() {
 		logger.info("查询订单状态的服务调用失败");
 	}
+
+	@Override
+	public void updateVipGroupToFinishedStatus() {
+		logger.info("更新VIP课程状态至已结束的服务调用失败");
+	}
 }

mec-common/common-core/src/main/java/com/ym/mec/common/cache/Cache.java

@@ -70,4 +70,20 @@ public interface Cache<K, V> {
 	 */
 	void expire(K key, int expireTimes);
 
+	/**
+	 * 获取分布式锁
+	 * @param key 业务唯一标识
+	 * @param threadId 线程编号
+	 * @param seconds 锁的有效期
+	 * @return
+	 */
+	boolean getLocked(K key, V threadId, int seconds);
+
+	/**
+	 * 释放分布式锁
+	 * @param key
+	 * @param threadId
+	 * @return
+	 */
+	boolean releaseLocked(K key, V threadId);
 }

mec-common/common-core/src/main/java/com/ym/mec/common/redis/service/RedisCache.java

@@ -72,4 +72,27 @@ public class RedisCache<K, V> implements Cache<K, V> {
 	public RedisTemplate<K, V> getRedisTemplate() {
 		return redisTemplate;
 	}
+
+	@Override
+	public boolean getLocked(K key, V threadId, int seconds) {
+		if (exists(key)) {
+			return false;
+		}
+
+		put(key, threadId, seconds);
+
+		return true;
+	}
+
+	@Override
+	public boolean releaseLocked(K key, V threadId) {
+		if (exists(key)) {
+			V v = get(key);
+			if (v.toString().equals(threadId.toString())) {
+				delete(key);
+				return true;
+			}
+		}
+		return false;
+	}
 }

mec-task/src/main/java/com/ym/mec/task/jobs/UpdateVipGroupToFinishedStatusTask.java

@@ -0,0 +1,25 @@
+package com.ym.mec.task.jobs;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.ym.mec.task.TaskRemoteService;
+import com.ym.mec.task.core.BaseTask;
+import com.ym.mec.task.core.TaskException;
+
+
+/**
+ * 更新VIP课程状态至已结束
+ */
+@Service
+public class UpdateVipGroupToFinishedStatusTask extends BaseTask {
+
+	@Autowired
+	private TaskRemoteService taskRemoteService;
+
+	@Override
+	public void execute() throws TaskException {
+		taskRemoteService.updateVipGroupToFinishedStatus();
+	}
+
+}

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

@@ -60,6 +60,12 @@ public class TaskController extends BaseController {
 		courseScheduleService.updateCourseScheduleToOverStatus();
 	}
 
+	@GetMapping("/updateVipGroupToFinishedStatus")
+	// 更新VIP课程状态至已结束
+	public void updateVipGroupToFinishedStatus() {
+		vipGroupService.updateVipGroupStatusToFinished();
+	}
+
 	@GetMapping("/pushNoSignOutMessage")
 	// 推送未签退消息提醒
 	public void pushNoSignOutMessage() {