Merge remote-tracking branch 'origin/master'

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

@@ -155,4 +155,17 @@ public interface MusicGroupStudentFeeDao extends BaseDAO<Long, MusicGroupStudent
 	 * @param musicGroupId
 	 */
 	void batchUpdateCalender(@Param("month") String month, @Param("musicGroupId") String musicGroupId);
+
+	/**
+	 * 批量修改学员缴费周期
+	 * @param musicGroupId
+	 */
+    void batchUpdateCalenders(String musicGroupId);
+
+	/**
+	 * 修改个人缴费周期
+	 * @param userId
+	 * @param musicGroupId
+	 */
+	void updateCalender(@Param("userId") Integer userId, @Param("musicGroupId") String musicGroupId);
 }

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

@@ -866,6 +866,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if(musicGroupStudentFees != null && musicGroupStudentFees.size() > 0){
             musicGroupStudentFeeDao.batchInsert(musicGroupStudentFees,musicGroupPaymentCalenderService.getNextPaymentDate(musicGroupId, null,null),"PAID_COMPLETED");
         }
+        musicGroupStudentFeeDao.batchUpdateCalenders(musicGroupId);
         //记录操作日志
         musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId,"确认开团(筹备中 -> 进行中)",sysUser.getId(),""));
         musicGroup.setStatus(MusicGroupStatusEnum.PROGRESS);
@@ -1629,7 +1630,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                     studentRegistration.getParentsName(),studentPaymentOrder.getActualAmount());
             return true;
 		} else {
-			if (studentPaymentOrder.getBalancePaymentAmount().doubleValue() > 0) {
+			if (studentPaymentOrder.getBalancePaymentAmount() != null && studentPaymentOrder.getBalancePaymentAmount().doubleValue() > 0) {
 				sysUserCashAccountService.updateBalance(userId, studentPaymentOrder.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS,
 						"乐团续费失败");
 			}

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

@@ -655,6 +655,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             musicGroupStudentFeeDao.insert(new MusicGroupStudentFee(musicGroupId,
                     userId, studentRegistration.getSubjectId(), studentAddDto.getCourseFee(),
                     nextPaymentDate, studentAddDto.getTemporaryCourseFee(),paymentStatus));
+            musicGroupStudentFeeDao.updateCalender(userId,musicGroupId);
             studentPaymentOrder.setExpectAmount(reduce);
             //当前学员是否以前存在过当前乐团
             if(phoneAndMusicGroupId != null){

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

@@ -225,4 +225,14 @@
         SET payment_period_list_ = #{month},update_time_ = NOW()
         WHERE music_group_id_ = #{musicGroupId} AND is_lock_ = 0
     </update>
+    <update id="batchUpdateCalenders">
+        UPDATE music_group_student_fee_ mgsf SET mgsf.payment_period_list_ = (
+        SELECT GROUP_CONCAT(mgpc.payment_month_) FROM music_group_payment_calender mgpc WHERE mgpc.music_group_id_ = mgsf.music_group_id_)
+        WHERE mgsf.music_group_id_ = #{musicGroupId}
+    </update>
+    <update id="updateCalender">
+        UPDATE music_group_student_fee_ mgsf SET mgsf.payment_period_list_ = (
+        SELECT GROUP_CONCAT(mgpc.payment_month_) FROM music_group_payment_calender mgpc WHERE mgpc.music_group_id_ = mgsf.music_group_id_)
+        WHERE mgsf.music_group_id_ = #{musicGroupId} AND mgsf.user_id_ = #{userId}
+    </update>
 </mapper>

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

@@ -141,8 +141,8 @@
         AND ((FIND_IN_SET(organ_id_,#{organId}) and user_id_ is NULL) or user_id_ = #{userId})
         </if>
     </select>
-    <select id="findVipSchoolByUserId" resultMap="School">
+    <select id="findVipSchoolByUserId2" resultMap="School">
         SELECT * FROM school WHERE del_flag_ != 1
-            AND FIND_IN_SET(organ_id_,#{organId}) AND user_id_ = #{userId})
+            AND FIND_IN_SET(organ_id_,#{organId}) AND user_id_ = #{userId}
     </select>
 </mapper>

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

@@ -83,10 +83,30 @@ public class TeacherSchoolController extends BaseController {
         if(teacher == null){
         	return failed("非法访问");
 		}
+
 		String organIdList = teacher.getOrganId();
 		if (StringUtils.isNoneBlank(teacher.getFlowOrganRange())) {
 			organIdList = organIdList + "," + teacher.getFlowOrganRange();
 		}
         return succeed(schoolService.findVipSchoolByTeacher(sysUser.getId(),organIdList));
     }
+
+    @ApiOperation(value = "获取教师vip课教学点")
+    @GetMapping("/findVipSchoolByTeacher2")
+    public Object findVipSchoolByTeacher2(Integer isDefault){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            return failed(HttpStatus.FORBIDDEN,"请登录");
+        }
+        Teacher teacher = teacherDao.get(sysUser.getId());
+        if(teacher == null){
+            return failed("非法访问");
+        }
+
+        String organIdList = teacher.getOrganId();
+        if (StringUtils.isNoneBlank(teacher.getFlowOrganRange())) {
+            organIdList = organIdList + "," + teacher.getFlowOrganRange();
+        }
+        return succeed(schoolService.findVipSchoolByTeacher(sysUser.getId(),organIdList,isDefault));
+    }
 }