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

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

@@ -264,4 +264,12 @@ public interface MusicGroupPaymentCalenderDetailDao extends BaseDAO<Long, MusicG
 	 * @return java.util.List<com.ym.mec.biz.dal.entity.MusicGroup>
 	 */
 	List<MusicGroup> getNoPaymentStudentMusicGroups(@Param("organIds") Set<Integer> organIds);
+
+	/**
+	 * 获取可以缴费，并且未缴费，不是0元的学员
+	 * @param calenderId
+	 * @param studentIds
+	 * @return
+	 */
+	List<MusicGroupPaymentCalenderDetail> queryNoPaymentCanPushByCalenderId(@Param("calenderId") Long calenderId, @Param("studentIds") String studentIds);
 }

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

@@ -14,5 +14,5 @@ public interface SysExamSongAccompanimentService extends BaseService<Integer, Sy
 
     List<SysExamSongAccompaniment> queryAll(SysExamSongQueryInfo queryInfo);
 
-    PageInfo<SysExamSongAccompaniment> queryAccPage(SysExamSongQueryInfo queryInfo);
+    List<SysExamSongAccompaniment> queryAccPage(SysExamSongQueryInfo queryInfo);
 }

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

@@ -593,34 +593,26 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 	}
 
 	@Override
-	public void pushWaitRenewMessage(Long calenderDetailId, String studentIds) {
-		MusicGroupPaymentCalenderDetail calenderDetail = musicGroupPaymentCalenderDetailDao.get(calenderDetailId);
-		if(calenderDetail == null){
-			throw new BizException("缴费详情不存在");
+	public void pushWaitRenewMessage(Long calenderId, String studentIds) {
+		List<MusicGroupPaymentCalenderDetail> calenderDetails = musicGroupPaymentCalenderDetailDao.queryNoPaymentCanPushByCalenderId(calenderId,studentIds);
+		if(calenderDetails == null || calenderDetails.size() == 0){
+			throw new BizException("发送失败：没有可以发送缴费提醒的学员");
 		}
-		Long calenderId = calenderDetail.getMusicGroupPaymentCalenderId();
 		MusicGroupPaymentCalender paymentCalender = musicGroupPaymentCalenderDao.get(calenderId);
-		if(paymentCalender.getStatus() != OPEN && calenderDetail.getOpenFlag() != YesOrNoEnum.YES){
-			throw new BizException("操作失败：请开启缴费");
-		}
 		//未缴费
 		HashSet<String> strings = new HashSet<>(Arrays.asList(studentIds.split(",")));
 		Map<Integer,String> studentMaps = MapUtil.convertMybatisMap(musicGroupPaymentCalenderDetailDao.queryNoPaymentAndNotZeroStudent(calenderId,strings));
-		if(studentMaps.size() > 0){
-			MusicGroup musicGroup = musicGroupDao.get(paymentCalender.getMusicGroupId());
-			String baseUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
-			String memo = "4?" + baseUrl + "/#/musicGroupRenew?calenderId="+calenderId+"&id=" + musicGroup.getId();
-			Map<Integer, String> push = new HashMap<>();
-			for (String userId : strings) {
-				push.put(Integer.parseInt(userId), userId);
-			}
-			// 发送续费通知
-			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_WAIT_RENEW_MESSAGE, push,
-					null, 0, memo, "STUDENT", musicGroup.getName());
-			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_WAIT_RENEW_MESSAGE, studentMaps,
-					null, 0, memo, null, musicGroup.getName());
-		}else {
-			throw new BizException("操作失败：没有待续费学员");
-		}
+		MusicGroup musicGroup = musicGroupDao.get(paymentCalender.getMusicGroupId());
+		String baseUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
+		String memo = "4?" + baseUrl + "/#/musicGroupRenew?calenderId="+calenderId+"&id=" + musicGroup.getId();
+		Map<Integer, String> push = new HashMap<>();
+		for (String userId : strings) {
+			push.put(Integer.parseInt(userId), userId);
+		}
+		// 发送续费通知
+		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_WAIT_RENEW_MESSAGE, push,
+				null, 0, memo, "STUDENT", musicGroup.getName());
+		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_WAIT_RENEW_MESSAGE, studentMaps,
+				null, 0, memo, null, musicGroup.getName());
 	}
 }

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

@@ -1218,11 +1218,15 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 				// “未开始”更新至“进行中”
 				mgpc.setUpdateTime(date);
 				mgpc.setStatus(PaymentCalenderStatusEnum.OPEN);
+
+				//将0元未缴费学员缴费状态更新为已缴费
+				int i = musicGroupPaymentCalenderDetailDao.updateNoPaymentAndZeroPaymentStatus(mgpc.getId());
+				mgpc.setActualNum((mgpc.getActualNum()==null?0:mgpc.getActualNum()) + i);
 				updateMusicGroupPaymentCalenderList.add(mgpc);
-				if(mgpc.getPayUserType() == STUDENT){
-					//推送待续费通知
-					pushWaitRenewMessage(mgpc.getId(),musicGroup,null);
-				}
+//				if(mgpc.getPayUserType() == STUDENT){
+//					推送待续费通知
+//					pushWaitRenewMessage(mgpc.getId(),musicGroup,null);
+//				}
 			}
 		}
 		if (updateMusicGroupPaymentCalenderList.size() > 0) {

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

@@ -55,22 +55,9 @@ public class SysExamSongAccompanimentServiceImpl extends BaseServiceImpl<Integer
 	}
 
 	@Override
-	public PageInfo<SysExamSongAccompaniment> queryAccPage(SysExamSongQueryInfo queryInfo) {
-		PageInfo<SysExamSongAccompaniment> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+	public List<SysExamSongAccompaniment> queryAccPage(SysExamSongQueryInfo queryInfo) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		MapUtil.populateMap(params, queryInfo);
-
-		List<SysExamSongAccompaniment> dataList = null;
-		int count = sysExamSongAccompanimentDao.findAccCount(params);
-		if (count > 0) {
-			pageInfo.setTotal(count);
-			params.put("offset", pageInfo.getOffset());
-			dataList = sysExamSongAccompanimentDao.queryAccPage(params);
-		}
-		if (count == 0) {
-			dataList = new ArrayList<>();
-		}
-		pageInfo.setRows(dataList);
-		return pageInfo;
+		return sysExamSongAccompanimentDao.queryAccPage(params);
 	}
 }

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

@@ -510,8 +510,15 @@
 				</foreach>
 			</if>
 	</select>
+	<select id="queryNoPaymentCanPushByCalenderId"
+			resultMap="MusicGroupPaymentCalenderDetail">
+		SELECT mgpcd.* FROM music_group_payment_calender_detail mgpcd
+		LEFT JOIN music_group_payment_calender mgpc ON mgpc.id_ = mgpcd.music_group_payment_calender_id_
+		WHERE (mgpc.status_ = 'OPEN' OR mgpcd.open_ = 1) AND mgpcd.payment_status_ = 'NON_PAYMENT' AND mgpcd.expect_amount_ != 0
+		AND mgpcd.music_group_payment_calender_id_ = #{calenderId} AND FIND_IN_SET(mgpcd.user_id_,#{studentIds})
+	</select>
 
-    <update id="updateNoPaymentAndZeroPaymentStatus">
+	<update id="updateNoPaymentAndZeroPaymentStatus">
 		UPDATE music_group_payment_calender_detail SET payment_status_ = 'PAID_COMPLETED',actual_amount_ = 0,update_time_ = NOW()
 		WHERE music_group_payment_calender_id_ = #{calenderId} AND expect_amount_ = 0 AND payment_status_ = 'NON_PAYMENT'
 	</update>

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

@@ -149,11 +149,11 @@
 		</where>
 	</select>
 	<select id="queryAccPage" resultMap="SysExamSongAccompaniment">
-		SELECT sesa.*,ses.name_,ses.type_,ses.url_
+		SELECT sesa.*,ses.name_,ses.type_,ses.url_,s.name_ subject_name_
 		FROM sys_exam_song_accompaniment sesa
 		LEFT JOIN sys_exam_song ses ON ses.id_ = sesa.exam_song_id_
+		LEFT JOIN subject s ON s.id_ = sesa.subject_id_
 		<include refid="queryPageSql"/>
-		<include refid="global.limit"/>
 	</select>
 	<select id="findAccCount" resultType="java.lang.Integer">
 		SELECT COUNT(DISTINCT sesa.id_) FROM sys_exam_song_accompaniment sesa
@@ -166,6 +166,9 @@
 			<if test="search != null and search != ''">
 				AND (sesa.id_ = #{search} OR ses.name_ LIKE CONCAT('%',#{search},'%'))
 			</if>
+			<if test="sysExamSongId != null">
+				AND sesa.exam_song_id_ = #{sysExamSongId}
+			</if>
 			<if test="subjectId != null">
 				AND sesa.subject_id_ = #{subjectId}
 			</if>

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

@@ -21,7 +21,7 @@ public class SysExamSongAccompanimentController extends BaseController {
     @GetMapping("/queryPage")
     public Object queryPage(SysExamSongQueryInfo queryInfo) {
         queryInfo.setType("COMMON");
-        return succeed(sysExamSongAccompanimentService.queryPage(queryInfo));
+        return succeed(sysExamSongAccompanimentService.queryAccPage(queryInfo));
     }
 
     @ApiOperation(value = "详情")

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

@@ -51,7 +51,7 @@ public class SysExamSongAccompanimentController extends BaseController {
             throw new BizException("请登录");
         }
         queryInfo.setCreateUserId(sysUser.getId());
-        return succeed(sysExamSongAccompanimentService.queryPage(queryInfo));
+        return succeed(sysExamSongAccompanimentService.queryAccPage(queryInfo));
     }
 
     @ApiOperation(value = "详情")