Merge remote-tracking branch 'origin/master'

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

@@ -55,12 +55,6 @@ public interface MusicGroupPaymentCalenderService extends BaseService<Long, Musi
 	void batchInsert(List<MusicGroupPaymentCalender> musicGroupPaymentCalenders);
 
 	/**
-	 * 修改缴费日期
-	 * @param paymentCalender
-	 */
-    void updateStartTime(MusicGroupPaymentCalender paymentCalender);
-
-	/**
 	 * 删除
 	 * @param id
 	 */

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

@@ -4,9 +4,7 @@ import static com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PayUserType.SC
 import static com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PayUserType.STUDENT;
 import static com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentCalenderStatusEnum.AUDITING;
 import static com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentCalenderStatusEnum.REJECT;
-import static com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentType.ADD_STUDENT;
-import static com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentType.MUSIC_APPLY;
-import static com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentType.MUSIC_RENEW;
+import static com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentType.*;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -366,7 +364,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			if (musicGroupPaymentCalender.getDeadlinePaymentDate() == null && payUserType == PayUserType.STUDENT) {
 				musicGroupPaymentCalender.setDeadlinePaymentDate(DateUtil.addDays(musicGroupPaymentCalender.getStartPaymentDate(), 3));
 			}
-			if (paymentType != ADD_STUDENT) {
+			if (paymentType != ADD_STUDENT && paymentType != ADD_COURSE) {
 				int count = musicGroupPaymentCalenderDao.queryIntersectionByValidDate(musicGroupId, musicGroupPaymentCalender.getPayUserType(),
 						musicGroupPaymentCalender.getPaymentValidStartDate(), musicGroupPaymentCalender.getPaymentValidEndDate(), null);
 				if (count > 0) {
@@ -498,7 +496,6 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		if(status != PaymentCalenderStatusEnum.REJECT){
 			throw new BizException("只有[拒绝]状态的缴费才能修改");
 		}
-
 		String musicGroupId = musicGroupPaymentCalenderDto.getMusicGroupId();
 
 		PaymentType paymentType = musicGroupPaymentCalenderDto.getPaymentType();
@@ -674,7 +671,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			if (musicGroupPaymentCalender.getDeadlinePaymentDate() == null && payUserType == PayUserType.STUDENT) {
 				musicGroupPaymentCalender.setDeadlinePaymentDate(DateUtil.addDays(musicGroupPaymentCalender.getStartPaymentDate(), 3));
 			}
-			if (paymentType != ADD_STUDENT) {
+			if (paymentType != ADD_STUDENT && paymentType != ADD_COURSE) {
 				int count = musicGroupPaymentCalenderDao.queryIntersectionByValidDate(musicGroupId, musicGroupPaymentCalender.getPayUserType(),
 						musicGroupPaymentCalender.getPaymentValidStartDate(), musicGroupPaymentCalender.getPaymentValidEndDate(), null);
 				if (count > 0) {
@@ -1183,62 +1180,6 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void updateStartTime(MusicGroupPaymentCalender paymentCalender) {
-		MusicGroupPaymentCalender calender = musicGroupPaymentCalenderDao.get(paymentCalender.getId());
-		if (calender == null) {
-			throw new BizException("缴费信息不存在");
-		}
-		if (calender.getStatus() == null || calender.getStatus() != PaymentCalenderStatusEnum.NO) {
-			throw new BizException("修改失败,缴费状态不匹配");
-		}
-		Date date = new Date();
-		if(paymentCalender.getPaymentType() != ADD_STUDENT){
-			int count = musicGroupPaymentCalenderDao.queryIntersectionByValidDate(paymentCalender.getMusicGroupId(), paymentCalender.getPayUserType(), paymentCalender.getPaymentValidStartDate(),
-					paymentCalender.getPaymentValidEndDate(), paymentCalender.getId());
-			if (count > 0) {
-				throw new BizException("缴费有效期存在冲突，请修改缴费有效期");
-			}
-		}
-		calender.setStartPaymentDate(paymentCalender.getStartPaymentDate());
-		calender.setDeadlinePaymentDate(paymentCalender.getDeadlinePaymentDate());
-		calender.setPaymentValidStartDate(paymentCalender.getPaymentValidStartDate());
-		calender.setPaymentValidEndDate(paymentCalender.getPaymentValidEndDate());
-		calender.setPaymentPattern(paymentCalender.getPaymentPattern());
-		calender.setUpdateTime(date);
-		if (paymentCalender.getDeadlinePaymentDate().before(date) && !DateUtil.isSameDay(date, paymentCalender.getDeadlinePaymentDate())) {
-			calender.setStatus(PaymentCalenderStatusEnum.OVER);
-		} else if (date.after(paymentCalender.getStartPaymentDate()) || DateUtil.isSameDay(date, paymentCalender.getStartPaymentDate())) {
-			calender.setStatus(PaymentCalenderStatusEnum.OPEN);
-			// 修改Fee缴费状态为未缴费
-			musicGroupStudentFeeDao.updatePaymentStatus(calender.getId(), "NON_PAYMENT");
-			List<MusicGroupPaymentCalenderDetail> details = musicGroupPaymentCalenderDetailDao.queryByCalenderId(calender.getId(),null);
-			Set<Integer> studentIds = details.stream().map(e -> e.getUserId()).collect(Collectors.toSet());
-			if (paymentCalender.getPayUserType() == STUDENT && studentIds.size() > 0) {
-				Map<Integer, String> push = new HashMap<>();
-				for (Integer userId : studentIds) {
-					push.put(userId, userId + "");
-				}
-				MusicGroup musicGroup = musicGroupDao.get(calender.getMusicGroupId());
-				String configValue = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
-				String memo = "4?" + configValue + "/#/musicGroupRenew?calenderId="+calender.getId()+"&id=" + calender.getMusicGroupId();
-				// 发送续费通知
-				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_WAIT_RENEW_MESSAGE, push,
-						null, 0, memo, "STUDENT", musicGroup.getName());
-				//获取未缴费且不是0元的学员列表
-				Map<Integer,String> studentMaps = MapUtil.convertMybatisMap(musicGroupPaymentCalenderDetailDao.queryNoPaymentAndNotZeroStudent(calender.getId(),studentIds));
-				if(studentMaps.size() > 0){
-					sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_PUSH_WAIT_RENEW_MESSAGE, studentMaps,
-							null, 0, memo, null, musicGroup.getName());
-				}
-			}
-		} else {
-			calender.setStatus(PaymentCalenderStatusEnum.NO);
-		}
-		musicGroupPaymentCalenderDao.update(calender);
-	}
-
-	@Override
-	@Transactional(rollbackFor = Exception.class)
 	public void del(Long id) {
 		if (id == null) {
 			throw new BizException("参数校验失败");