Merge remote-tracking branch 'origin/master'

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

@@ -1,10 +1,11 @@
 package com.ym.mec.biz.dal.dao;
 
-import com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup;
-import com.ym.mec.common.dal.BaseDAO;
+import java.util.List;
+
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
+import com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup;
+import com.ym.mec.common.dal.BaseDAO;
 
 public interface MusicGroupSubjectGoodsGroupDao extends BaseDAO<Long, MusicGroupSubjectGoodsGroup> {
 
@@ -37,4 +38,6 @@ public interface MusicGroupSubjectGoodsGroupDao extends BaseDAO<Long, MusicGroup
      * @return
      */
     int delByMusicGroupId(String musicGroupId);
+    
+    MusicGroupSubjectGoodsGroup query(@Param("musicGroupId")String musicGroupId,@Param("subjectId")Integer subjectId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseScheduleDto.java

@@ -47,12 +47,22 @@ public class CourseScheduleDto extends CourseSchedule {
 
     private String subjectName;
 
+    private String groupName;
+
     @ApiModelProperty(value = "是否是第一次进行学生点名")
     private int studentAttendanceIsFirstTime;
 
     @ApiModelProperty(value = "能否进行调整")
     private int enableAdjustInToday;
 
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
     public Integer getExpectStudentNum() {
         return expectStudentNum;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/CourseScheduleQueryInfo.java

@@ -17,6 +17,9 @@ public class CourseScheduleQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "上课日期")
     private Date date;
 
+    @ApiModelProperty(value = "乐团编号")
+    private String musicGroupId;
+
     @ApiModelProperty(value = "班级编号")
     private Long classGroupId;
 
@@ -29,6 +32,14 @@ public class CourseScheduleQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "课程类型")
     private String type;
 
+    public String getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public void setMusicGroupId(String musicGroupId) {
+        this.musicGroupId = musicGroupId;
+    }
+
     public String getType() {
         return type;
     }

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

@@ -1,10 +1,10 @@
 package com.ym.mec.biz.service;
 
+import java.util.List;
+
 import com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup;
 import com.ym.mec.common.service.BaseService;
 
-import java.util.List;
-
 public interface MusicGroupSubjectGoodsGroupService extends BaseService<Long, MusicGroupSubjectGoodsGroup> {
 
     /**
@@ -23,4 +23,6 @@ public interface MusicGroupSubjectGoodsGroupService extends BaseService<Long, Mu
      */
     List<MusicGroupSubjectGoodsGroup> findGoodsGroupByIds(String ids);
 
+    
+    MusicGroupSubjectGoodsGroup query(String musicGroupId,Integer subjectId);
 }

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

@@ -29,6 +29,7 @@ import com.ym.mec.biz.dal.entity.Goods;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
+import com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup;
 import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail;
@@ -44,6 +45,7 @@ import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
 import com.ym.mec.biz.service.ContractService;
 import com.ym.mec.biz.service.GoodsService;
 import com.ym.mec.biz.service.MusicGroupService;
+import com.ym.mec.biz.service.MusicGroupSubjectGoodsGroupService;
 import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
 import com.ym.mec.biz.service.StudentPaymentOrderService;
 import com.ym.mec.biz.service.StudentRegistrationService;
@@ -79,6 +81,9 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 
 	@Autowired
 	private MusicGroupSubjectPlanService musicGroupSubjectPlanService;
+	
+	@Autowired
+	private MusicGroupSubjectGoodsGroupService musicGroupSubjectGoodsGroupService;
 
 	@Autowired
 	private MusicGroupPaymentCalenderDao musicGroupPaymentCalenderDao;
@@ -638,7 +643,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 			StudentPaymentOrder studentPaymentOrder = studentPaymentOrderService.findMusicGroupApplyOrderByStatus(userId, musicGroupId, DealStatusEnum.SUCCESS);
 
 			if (studentPaymentOrder == null) {
-				MusicGroupSubjectPlan musicGroupSubjectPlan = musicGroupSubjectPlanService.findSubjectPlan(musicGroupId, subjectId);
+				MusicGroupSubjectGoodsGroup musicGroupSubjectPlan = musicGroupSubjectGoodsGroupService.query(musicGroupId, subjectId);
 				if (musicGroupSubjectPlan != null) {
 					depositFee = musicGroupSubjectPlan.getDepositFee().doubleValue();
 				}
@@ -743,7 +748,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 					.findMusicGroupApplyOrderByStatus(userId, musicGroupId, DealStatusEnum.WAIT_PAY);
 
 			if (studentPaymentOrder == null) {
-				MusicGroupSubjectPlan musicGroupSubjectPlan = musicGroupSubjectPlanService.findSubjectPlan(musicGroupId, subjectId);
+				MusicGroupSubjectGoodsGroup musicGroupSubjectPlan = musicGroupSubjectGoodsGroupService.query(musicGroupId, subjectId);
 				if (musicGroupSubjectPlan != null) {
 					depositFee = musicGroupSubjectPlan.getDepositFee().doubleValue();
 				}

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

@@ -361,6 +361,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             return pageInfo;
         }
 
+        Map<String, Group> groupMap = groups.stream().collect(Collectors.toMap(Group::getId, group -> group));
+
         List<CourseScheduleDto> dataList = null;
         int count = courseScheduleDao.countCourseSchedulesWithDate(params);
         if (count > 0) {
@@ -374,6 +376,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             for (int i=0;i<dataList.size();i++) {
                 Long studentNum=courseStudentNumMap.get(dataList.get(i).getId());
                 dataList.get(i).setTotalStudentNum(Objects.isNull(studentNum)?0:studentNum.intValue());
+                Group group = groupMap.get(dataList.get(i).getMusicGroupId());
+                if(Objects.nonNull(group)){
+                    dataList.get(i).setGroupName(group.getGroupName());
+                }
             }
         }
         if (count == 0) {
@@ -1659,8 +1665,17 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             throw new BizException("未找到对应课程");
         }
 
-        courseSchedule1.setId(courseScheduleId2);
-        courseSchedule2.setId(courseScheduleId1);
+        CourseSchedule temp=new CourseSchedule();
+        BeanUtils.copyProperties(courseSchedule1, temp);
+
+        courseSchedule1.setClassDate(courseSchedule2.getClassDate());
+        courseSchedule1.setStartClassTime(courseSchedule2.getStartClassTime());
+        courseSchedule1.setEndClassTime(courseSchedule2.getStartClassTime());
+
+        courseSchedule2.setClassDate(temp.getClassDate());
+        courseSchedule2.setStartClassTime(temp.getStartClassTime());
+        courseSchedule2.setEndClassTime(temp.getStartClassTime());
+
         List<CourseSchedule> courseSchedules = new ArrayList<>();
         courseSchedules.add(courseSchedule1);
         courseSchedules.add(courseSchedule2);

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

@@ -2442,6 +2442,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public void updateVipGroupStatusToFinished() {
 		List<VipGroup> vipGroupList = vipGroupDao.queryRequiredOverList();
 		if (vipGroupList != null && vipGroupList.size() > 0) {

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

@@ -437,7 +437,7 @@
     <select id="getCourseSchedulesWithDate" resultMap="courseScheduleDto">
         SELECT
             cs.id_ seal_class_id_,
-            cs.name_,
+            cg.name_,
             cs.type_,
             cs.id_,
             cs.class_date_,
@@ -470,6 +470,9 @@
         <if test="type!=null">
             AND cg.group_type_ = #{type}
         </if>
+        <if test="musicGroupId!=null">
+            AND cs.music_group_id_=#{music_group_id_} AND cs.group_type_='MUSIC'
+        </if>
         AND cs.class_date_ = DATE_FORMAT(#{date},'%Y-%m-%d')
         ORDER BY CONCAT(cs.class_date_,' ',cs.start_class_time_)
         <include refid="global.limit"/>

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

@@ -130,4 +130,8 @@
     <select id="findGoodsGroupByIds" resultMap="MusicGroupSubjectGoodsGroup">
         SELECT * FROM music_group_subject_goods_group WHERE FIND_IN_SET(id_,#{ids})
     </select>
+    
+    <select id="query" resultMap="MusicGroupSubjectGoodsGroup" parameterType="map">
+        SELECT * FROM music_group_subject_goods_group WHERE music_group_id_ = #{musicGroupId} and subject_id_ = #{subjectId}
+    </select>
 </mapper>

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

@@ -891,7 +891,8 @@
     </update>
     
     <select id="queryRequiredOverList" resultMap="VipGroup">
-    	select vg.* from vip_group vg left join class_group cg on vg.id_ = cg.music_group_id_ where vg.status_ = 2 and cg.total_class_times_ = cg.current_class_times_ and cg.total_class_times_ &gt; 0
+    	select vg.* from vip_group vg left join class_group cg on vg.id_ = cg.music_group_id_
+    	where vg.status_ = 2 and cg.total_class_times_ = cg.current_class_times_ and cg.total_class_times_ &gt; 0
     </select>
     <select id="queryNormalStatusList" resultMap="VipGroup">
         SELECT * FROM vip_group WHERE status_!=3 AND status_!=4