Merge remote-tracking branch 'origin/master'

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

@@ -200,7 +200,7 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      * @author Joburgess
      * @date 2019/10/18
      */
-    int deleteCourseSchedulesByMusicGroupID(@Param("musicGroupID") String musicGroupID);
+    int deleteCourseSchedulesByMusicGroupID(@Param("musicGroupId")String musicGroupId, @Param("groupType")GroupType groupType);
 
     /**
      * 逻辑删除乐团课程

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

@@ -3,7 +3,9 @@ package com.ym.mec.biz.dal.dao;
 import com.ym.mec.biz.dal.dto.StudentAttendanceStatisticsResponse;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.dal.entity.CourseScheduleStudentPayment;
+import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.common.dal.BaseDAO;
+
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
@@ -111,4 +113,11 @@ public interface CourseScheduleStudentPaymentDao extends BaseDAO<Long, CourseSch
                                        @Param("teachMode") String teachMode);
 
     int deleteStudentCourseScheduleByUserId(@Param("courseScheduleId") Long courseScheduleId, @Param("userIdList") List<Integer> userIdList);
+    
+    /**
+     * 根据乐团编号删除记录
+     * @param musicGroupId
+     * @return
+     */
+    int deleteByMusicGroupId(@Param("musicGroupId")String musicGroupId, @Param("groupType")GroupType groupType);
 }

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

@@ -214,4 +214,12 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
 	 * @return java.util.List<java.util.Map<java.lang.Integer,java.lang.Integer>>
 	 */
 	List<Map<Long,Integer>> checkCoursesIsSettlement(@Param("courseScheduleIds") List<Long> courseScheduleIds);
+	
+	/**
+	 * 批量删除
+	 * @param musicGroupId
+	 * @param groupType
+	 * @return
+	 */
+	int deleteByMusicGroupId(@Param("musicGroupId")String musicGroupId, @Param("groupType")GroupType groupType);
 }

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

@@ -27,7 +27,6 @@ import com.ym.mec.jiari.JiaRiFeignService;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateConvertor;
 import com.ym.mec.util.date.DateUtil;
-
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -51,16 +50,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     @Autowired
     private VipGroupDao vipGroupDao;
     @Autowired
-    private VipGroupActivityDao vipGroupActivityDao;
-    @Autowired
     private TeacherAttendanceDao teacherAttendanceDao;
     @Autowired
     private MusicGroupDao musicGroupDao;
     @Autowired
     private MusicGroupBuildLogDao musicGroupBuildLogDao;
     @Autowired
-    private MusicGroupService musicGroupService;
-    @Autowired
     private ClassGroupRelationService classGroupRelationService;
     @Autowired
     private ClassGroupStudentMapperDao classGroupStudentMapperDao;
@@ -95,8 +90,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     @Autowired
     private JiaRiFeignService jiaRiFeignService;
     @Autowired
-    private SysConfigService sysConfigService;
-    @Autowired
     private CourseScheduleService courseScheduleService;
     @Autowired
     private CourseScheduleStudentPaymentService courseScheduleStudentPaymentService;

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

@@ -85,9 +85,6 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 	private MusicGroupStudentFeeDao musicGroupStudentFeeDao;
 
 	@Autowired
-	private MusicGroupSubjectGoodsGroupService musicGroupSubjectGoodsGroupService;
-
-	@Autowired
 	private StudentPaymentOrderDetailDao studentPaymentOrderDetailDao;
 
 	@Autowired

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

@@ -1,15 +1,12 @@
 package com.ym.mec.biz.service.impl;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.biz.dal.dao.CourseHomeworkDao;
-import com.ym.mec.biz.dal.dao.TeacherAttendanceDao;
 import com.ym.mec.biz.dal.dto.Mapper;
 import com.ym.mec.biz.dal.dto.TeacherHomeworkListDto;
 import com.ym.mec.biz.dal.entity.CourseHomework;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.page.CourseHomeworkQueryInfo;
 import com.ym.mec.biz.service.CourseHomeworkService;
-import com.ym.mec.biz.service.CourseScheduleService;
 import com.ym.mec.biz.service.SysMessageService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
@@ -30,13 +27,7 @@ public class CourseHomeworkServiceImpl extends BaseServiceImpl<Long, CourseHomew
 	@Autowired
 	private CourseHomeworkDao courseHomeworkDao;
 	@Autowired
-	private CourseScheduleService courseScheduleService;
-	@Autowired
-	private SysUserFeignService sysUserFeignService;
-	@Autowired
 	private SysMessageService sysMessageService;
-	@Autowired
-	private TeacherAttendanceDao teacherAttendanceDao;
 
 	@Override
 	public BaseDAO<Long, CourseHomework> getDAO() {

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

@@ -21,6 +21,7 @@ import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext.MessageSender;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
+
 import org.apache.commons.collections.ListUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -201,7 +202,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			throw new BizException("请指定乐团!");
 		}
 		checkNewCourseSchedules(courseSchedules,false);
-        courseScheduleDao.deleteCourseSchedulesByMusicGroupID(musicGroupID);
+        courseScheduleDao.deleteCourseSchedulesByMusicGroupID(musicGroupID, GroupType.MUSIC);
         courseScheduleDao.batchAddCourseSchedules(courseSchedules);
 	}
 

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

@@ -167,9 +167,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
     @Autowired
     private CourseScheduleDao courseScheduleDao;
-    
-    @Autowired
-    private CourseScheduleService courseScheduleService;
 
     @Autowired
     private ClassGroupDao classGroupDao;
@@ -885,9 +882,13 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         
         //删除续费记录
         musicGroupStudentFeeDao.deleteByMusicGroupId(musicGroupId);
+
+		// 删除课表
+		courseScheduleDao.deleteCourseSchedulesByMusicGroupID(musicGroupId, GroupType.MUSIC);
+		// 删除每节课的课酬
+		courseScheduleStudentPaymentDao.deleteByMusicGroupId(musicGroupId, GroupType.MUSIC);
+		courseScheduleTeacherSalaryDao.deleteByMusicGroupId(musicGroupId, GroupType.MUSIC);
         
-        //删除课表
-        //删除每节课的课酬
         //删除考勤
 
         // 查询已缴费信息

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

@@ -54,8 +54,6 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 	@Autowired
 	private SysConfigDao sysConfigDao;
 	@Autowired
-	private TeacherAttendanceService teacherAttendanceService;
-	@Autowired
 	private SchoolDao schoolDao;
 	@Autowired
 	private SysConfigService sysConfigService;

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

@@ -34,9 +34,6 @@ public class StudentRechargeServiceImpl extends BaseServiceImpl<String, StudentR
 	@Resource
 	private StudentRechargeDao studentRechargeDao;
 	@Autowired
-	private StudentRegistrationDao studentRegistrationDao;
-
-	@Autowired
 	private SysUserCashAccountService sysUserCashAccountService;
 
 	@Resource

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

@@ -51,8 +51,6 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     @Autowired
     private CourseScheduleStudentPaymentService courseScheduleStudentPaymentService;
     @Autowired
-    private ClassGroupRelationService classGroupRelationService;
-    @Autowired
     private CourseScheduleService courseScheduleService;
     @Autowired
     private TeacherDao teacherDao;
@@ -89,8 +87,6 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     @Autowired
     private SysUserCashAccountService sysUserCashAccountService;
     @Autowired
-    private ClassGroupStudentMapperService classGroupStudentMapperService;
-    @Autowired
     private SysUserFeignService sysUserFeignService;
     @Autowired
     private RedisCache<String, Object> redisCache;

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

@@ -1,12 +1,5 @@
 package com.ym.mec.biz.service.impl;
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.SysUserBankCardDao;
@@ -15,6 +8,11 @@ import com.ym.mec.biz.service.SysUserBankCardService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 @Service
 public class SysUserBankCardServiceImpl extends BaseServiceImpl<Long, SysUserBankCard> implements SysUserBankCardService {
@@ -24,10 +22,6 @@ public class SysUserBankCardServiceImpl extends BaseServiceImpl<Long, SysUserBan
 	
 	@Autowired
 	private SysUserFeignService sysUserFeignService;
-	
-	@Autowired
-	private RedisTemplate<String,String> redisTemplate;
-	private final String loginVerifyCodeKey = "loginVerifyCode:";
 
 	@Override
 	public BaseDAO<Long, SysUserBankCard> getDAO() {

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

@@ -566,6 +566,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 					if(data.getStudentStatus()==0&&studentApplyRefund.getStatus().equals(StudentApplyRefundsStatus.ING)){
 						data.setStudentStatus(2);
 					}
+				}else if(data.getStudentStatus()==0){
+					data.setRefundDate(null);
 				}
 			});
 		}
@@ -1810,7 +1812,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 			for (StudentPaymentOrder studentPaymentOrder:studentPaymentOrders){
 				//生成账户资金明细
-				sysUserCashAccountService.updateCourseBalance(studentPaymentOrder.getUserId(),studentPaymentOrder.getActualAmount());
+				sysUserCashAccountService.updateBalance(studentPaymentOrder.getUserId(),studentPaymentOrder.getActualAmount());
 				SysUserCashAccount sysUserCashAccount = sysUserCashAccountService.get(studentPaymentOrder.getUserId());
 				SysUserCashAccountDetail sysUserIncomeCashAccountDetail = new SysUserCashAccountDetail();
 				sysUserIncomeCashAccountDetail.setUserId(studentPaymentOrder.getUserId());
@@ -1822,7 +1824,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				userCashAccountDetails.add(sysUserIncomeCashAccountDetail);
 			}
 		}
-		sysUserCashAccountDetailDao.batchInsert(userCashAccountDetails);
+		if(!CollectionUtils.isEmpty(userCashAccountDetails)){
+			sysUserCashAccountDetailDao.batchInsert(userCashAccountDetails);
+		}
 		vipGroupDao.batchUpdate(noCreateSuccessVipGroups);
 	}
 

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

@@ -190,8 +190,8 @@
         DELETE FROM course_schedule WHERE id_ = #{id}
     </delete>
 
-    <delete id="deleteCourseSchedulesByMusicGroupID">
-        DELETE FROM course_schedule WHERE music_group_id_=#{musicGroupID} AND group_type_='MUSIC' and status_ = 'NOT_START'
+    <delete id="deleteCourseSchedulesByMusicGroupID" parameterType="map">
+        DELETE FROM course_schedule WHERE music_group_id_=#{musicGroupId} AND group_type_=#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler} and status_ = 'NOT_START'
     </delete>
     
     <update id="logicDeleteCourseSchedulesByMusicGroupID">

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

@@ -204,4 +204,8 @@
 			#{userId}
 		</foreach>
 	</delete>
+	
+	<delete id="deleteByMusicGroupId" parameterType="map">
+		DELETE FROM course_schedule_student_payment WHERE music_group_id_=#{musicGroupId} AND group_type_=#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+	</delete>
 </mapper>

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

@@ -379,4 +379,8 @@
 			</foreach>
 		GROUP BY course_schedule_id_
 	</select>
+	
+	<delete id="deleteByMusicGroupId" parameterType="map" >
+		DELETE FROM course_schedule_teacher_salary WHERE music_group_id_=#{musicGroupId} AND group_type_=#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+	</delete>
 </mapper>