Merge remote-tracking branch 'origin/master'

cms/src/main/java/com/ym/mec/cms/controller/NewsController.java

@@ -38,13 +38,13 @@ public class NewsController extends BaseController {
 		if(queryInfo.getTenantId() == null){
 			queryInfo.setTenantId(1);
 		}
-		
 		return succeed(sysNewsInformationService.queryPage(queryInfo));
 	}
 
 	@ApiOperation("资讯列表分页查询")
 	@GetMapping(value = "/homeList")
 	public Object getHomeList(NewsInformationQueryInfo queryInfo) {
+		queryInfo.setRows(10);
 		SysUser user = sysUserFeignService.queryUserInfo();
 		return succeed(sysNewsInformationService.getHomeList(user, queryInfo));
 	}

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

@@ -187,7 +187,9 @@ public class MusicGroup {
 	}
 
 	public void setPaymentValidEndDate(String paymentValidEndDate) {
-		if(StringUtils.isNotEmpty(paymentValidEndDate)){
+		if(StringUtils.isEmpty(paymentValidEndDate)){
+			this.paymentValidEndDate = null;
+		}else {
 			this.paymentValidEndDate = paymentValidEndDate;
 		}
 	}

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

@@ -115,7 +115,9 @@ public class MusicGroupPaymentCalender implements Comparable<MusicGroupPaymentCa
 	}
 
 	public void setPaymentValidEndDate(String paymentValidEndDate) {
-		if(StringUtils.isNotEmpty(paymentValidEndDate)){
+		if(StringUtils.isEmpty(paymentValidEndDate)){
+			this.paymentValidEndDate = null;
+		}else {
 			this.paymentValidEndDate = paymentValidEndDate;
 		}
 	}

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

@@ -156,8 +156,6 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 	public void autoUpdateMusicGroupStudentFeeStatus() {
 		Date date = new Date();
 		String format = DateUtil.format(date, DateUtil.DEFAULT_PATTERN);
-		//将有效期已截止的学员缴费信息修改为未缴费
-//		musicGroupStudentFeeDao.updateFeeStatus();
 		//获取距离缴费开启指定天数后的缴费明细
 		String configValue = sysConfigDao.findConfigValue("push_payment_detail");
 		Map<Long, Long> maps = MapUtil.convertIntegerMap(musicGroupPaymentCalenderDao.queryCalenderByDay(configValue,format));
@@ -172,11 +170,6 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.SMS_PAYMENT_DETAIL,
 						receivers, null, 0, null, null,calenderPushDto.getMusicGroupName(),
 						calenderPushDto.getPaymentValidStartDate(),calenderPushDto.getPaymentValidEndDate(),maps.get(e));
-				Map<Integer, String> receivers1 = new HashMap<>(1);
-				receivers.put(calenderPushDto.getTeacherId(),calenderPushDto.getTeacherPhone());
-				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_PAYMENT_DETAIL,
-						receivers1, null, 0, null, null,calenderPushDto.getMusicGroupName(),
-						calenderPushDto.getPaymentValidStartDate(),calenderPushDto.getPaymentValidEndDate(),maps.get(e));
 			});
 		}
 		//获取离截止还有指定时间的缴费项，并发送推送消息给指定老师
@@ -192,11 +185,6 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.SMS_PAYMENT_CREATE,
 						receivers, null, 0, null, null,calenderPushDto.getMusicGroupName(),
 						calenderPushDto.getPaymentValidStartDate(),calenderPushDto.getPaymentValidEndDate());
-				Map<Integer, String> receivers1 = new HashMap<>(1);
-				receivers.put(calenderPushDto.getTeacherId(),calenderPushDto.getTeacherId().toString());
-				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_PAYMENT_CREATE,
-						receivers1, null, 0, null, null,calenderPushDto.getMusicGroupName(),
-						calenderPushDto.getPaymentValidStartDate(),calenderPushDto.getPaymentValidEndDate());
 			});
 		}
 
@@ -209,11 +197,6 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.SMS_PAYMENT_CREATE,
 						receivers, null, 0, null, null,e.getMusicGroupName(),
 						e.getPaymentValidStartDate(),e.getPaymentValidEndDate());
-				Map<Integer, String> receivers1 = new HashMap<>(1);
-				receivers.put(e.getTeacherId(),e.getTeacherId().toString());
-				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_PAYMENT_CREATE,
-						receivers1, null, 0, null, null,e.getMusicGroupName(),
-						e.getPaymentValidStartDate(),e.getPaymentValidEndDate());
 			});
 		}
 	}
@@ -439,6 +422,8 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		}
 		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())) {

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

@@ -230,9 +230,9 @@
         SELECT COUNT(*) FROM music_group_payment_calender mgpc
         WHERE music_group_id_ = #{musicGroupId}
         AND (payment_valid_end_date_ IS NULL OR payment_valid_start_date_ BETWEEN #{paymentValidStartDate} AND #{paymentValidEndDate}
-        OR payment_valid_end_date_ BETWEEN #{paymentValidStartDate} AND #{paymentValidEndDate})
+        OR payment_valid_end_date_ BETWEEN #{paymentValidStartDate} AND #{paymentValidEndDate}) AND payment_valid_start_date_ IS NOT NULL
         <if test="calenderId != null">
-            AND mgpc.id_ = #{calenderId}
+            AND mgpc.id_ != #{calenderId}
         </if>
     </select>
     <select id="queryCalenderByDay" resultType="java.util.Map">