Merge branch 'master' of http://git.dayaedu.com/yonge/mec

cms/src/main/java/com/ym/mec/cms/service/impl/SysNewsInformationServiceImpl.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import com.ym.mec.cms.controller.queryinfo.NewsInformationQueryInfo;
 import com.ym.mec.cms.dal.entity.NewsStatusEnum;
 import com.ym.mec.common.page.PageInfo;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -15,6 +16,7 @@ import com.ym.mec.cms.dal.entity.SysNewsInformation;
 import com.ym.mec.cms.service.SysNewsInformationService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.util.collection.MapUtil;
 
 @Service
 public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNewsInformation> implements SysNewsInformationService {
@@ -43,16 +45,34 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
 		//1精彩活动，2热门资讯,3banner类型
 		Map<String,PageInfo<SysNewsInformation>> homeList = new HashMap<>();
 		queryInfo.setStatus(NewsStatusEnum.SHOW);
+		
+		String memo = queryInfo.getMemo();
+		
+		Map<String, Object> params = new HashMap<String, Object>();
+		MapUtil.populateMap(params, queryInfo);
+
+		queryInfo.setType(3);
+		int count = sysNewsInformationDao.queryCount(params);
+		if(count == 0){
+			queryInfo.setMemo(null);
+		}
+		homeList.put("banner",queryPage(queryInfo));
+		
+		queryInfo.setMemo(memo);
+		queryInfo.setType(6);
+		count = sysNewsInformationDao.queryCount(params);
+		if(count == 0){
+			queryInfo.setMemo(null);
+		}
+		homeList.put("app",queryPage(queryInfo));
+		
+		queryInfo.setMemo(null);
 		queryInfo.setType(1);
 		homeList.put("active",queryPage(queryInfo));
 		queryInfo.setType(2);
 		homeList.put("hot",queryPage(queryInfo));
-		queryInfo.setType(3);
-		homeList.put("banner",queryPage(queryInfo));
 		queryInfo.setType(5);
 		homeList.put("flash",queryPage(queryInfo));
-		queryInfo.setType(6);
-		homeList.put("app",queryPage(queryInfo));
 		return homeList;
 	}
 

cms/src/main/resources/config/mybatis/SysNewsInformationMapper.xml

@@ -37,9 +37,14 @@
 			<if test="search != null">
 				and title_ like '%' #{search} '%'
 			</if>
-			<if test="memo != null">
-				and memo_ = #{memo}
-			</if>
+			<choose>
+		        <when test="memo != null and memo != ''">
+		            and memo_ = #{memo}
+		        </when>
+		        <otherwise>
+		            and memo_ is null
+		        </otherwise>
+		    </choose>
 		</where>
 	</sql>
 	

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

@@ -104,6 +104,8 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
 	 */
 	int batchUpdateTeacherExpectSalarys(@Param("courseScheduleTeacherSalaries") List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries);
 
+	int batchUpdate(@Param("courseScheduleTeacherSalaries") List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries);
+
 	/**
 	 * @describe 根据课程编号与老师编号删除对应教师课酬记录
 	 * @author Joburgess
@@ -170,6 +172,8 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
 	 */
 	List<CourseScheduleTeacherSalary> findByCourseSchedules(@Param("courseScheduleIds") List<Long> courseScheduleIds);
 
+	List<CourseScheduleTeacherSalary> findByCourseSchedule(@Param("courseScheduleId") Long courseScheduleId);
+
 	/**
 	 * @param courseScheduleIds: 课程编号列表
 	 * @return java.util.List<com.ym.mec.biz.dal.entity.CourseScheduleTeacherSalary>

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

@@ -58,6 +58,15 @@ public interface PracticeGroupService extends BaseService<Long, PracticeGroup> {
     Map getPracticeApplyParams(Integer userId);
 
     /**
+     * @describe 获取陪练课可预约声部
+     * @author Joburgess
+     * @date 2020/3/5
+     * @param :
+     * @return com.ym.mec.common.entity.HttpResponseResult
+     */
+	Object getPracticeApplySubjects();
+
+    /**
      * @describe 获取可以预约的教师
      * @author Joburgess
      * @date 2020/2/9

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

@@ -499,6 +499,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 						teacherAttendance.setCreateTime(now);
 						teacherAttendances.add(teacherAttendance);
 					}
+	                calendar.add(Calendar.DATE, 1);
 					break;
 				}
                 calendar.add(Calendar.DATE, 1);
@@ -3617,17 +3618,15 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             }
             courseScheduleTeacherSalaryDao.batchUpdateTeacher(courseScheduleIds,teacherId);
         }else{
-            List<CourseSchedule> groupNotStartCourses = courseScheduleDao.findGroupNotStartCourses(practiceGroup.getId().toString(), GroupType.PRACTICE);
-            if(!CollectionUtils.isEmpty(groupNotStartCourses)){
+			List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries = courseScheduleTeacherSalaryDao.findByCourseSchedule(courseScheduleId);
+			if(!CollectionUtils.isEmpty(courseScheduleTeacherSalaries)){
                 SysConfig practiceCourseSalaryConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_COURSE_SALARY);
-                BigDecimal teacherSalary = new BigDecimal(practiceCourseSalaryConfig.getParanValue());
-                List<Long> courseIds = groupNotStartCourses.stream().map(CourseSchedule::getId).collect(Collectors.toList());
-                List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries = courseScheduleTeacherSalaryDao.findByCourseSchedules(courseIds);
+                BigDecimal teacherSalary = new BigDecimal(practiceCourseSalaryConfig.getParanValue());;
                 for (CourseScheduleTeacherSalary courseScheduleTeacherSalary : courseScheduleTeacherSalaries) {
                     courseScheduleTeacherSalary.setUserId(teacherId);
                     courseScheduleTeacherSalary.setExpectSalary(teacherSalary);
                 }
-                courseScheduleTeacherSalaryDao.batchUpdateTeacherExpectSalarys(courseScheduleTeacherSalaries);
+                courseScheduleTeacherSalaryDao.batchUpdate(courseScheduleTeacherSalaries);
             }
         }
 
@@ -3707,7 +3706,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                     courseScheduleTeacherSalary.setUserId(teacherId);
                     courseScheduleTeacherSalary.setExpectSalary(teacherSalary);
                 }
-                courseScheduleTeacherSalaryDao.batchUpdateTeacherExpectSalarys(courseScheduleTeacherSalaries);
+                courseScheduleTeacherSalaryDao.batchUpdate(courseScheduleTeacherSalaries);
             }
         }
         teacherAttendanceDao.batchUpdateTeacher(courseScheduleIds,teacherId);

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

@@ -120,10 +120,9 @@ public class GroupClassServiceImpl implements GroupClassService {
             if(!practiceGroup.getGroupStatus().equals(GroupStatusEnum.NORMAL)||practiceGroup.getCoursesExpireDate().before(now)){
                 throw new BizException("当前课程组不可关闭");
             }
-            if(Objects.isNull(refundAmount)){
-                throw new BizException("请指定退款金额");
+            if(Objects.nonNull(refundAmount)&&refundAmount.compareTo(BigDecimal.ZERO)>0){
+                sysUserCashAccountService.updateBalance(practiceGroup.getStudentId(), refundAmount, PlatformCashAccountDetailTypeEnum.REFUNDS, "后团关闭网管课");
             }
-            sysUserCashAccountService.updateBalance(practiceGroup.getStudentId(), refundAmount, PlatformCashAccountDetailTypeEnum.REFUNDS, "后团关闭网管课");
             cleanGroupInfo(groupId.toString(), GroupType.PRACTICE);
             practiceGroup.setMemo("后台关闭网管课");
             practiceGroup.setGroupStatus(GroupStatusEnum.CANCEL);

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

@@ -768,6 +768,13 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
     }
 
     @Override
+    public Object getPracticeApplySubjects() {
+        SysConfig practiceSubjectIdListConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_SUBJECT_ID_LIST);
+        List<Subject> subjects = subjectDao.findBySubjectByIdList(practiceSubjectIdListConfig.getParanValue());
+        return subjects;
+    }
+
+    @Override
     public List<SimpleUserDto> getEnableApplyTeachers(Integer userId, Integer subjectId) {
         if (Objects.isNull(subjectId)) {
             throw new BizException("请选择声部");
@@ -2790,8 +2797,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         classGroupTeacherSalary.setClassGroupId(classGroup.getId());
         classGroupTeacherSalary.setTeacherRole(TeachTypeEnum.BISHOP);
         classGroupTeacherSalary.setUserId(practiceGroupBuyParams.getUserId());
-        classGroupTeacherSalary.setSalary(new BigDecimal(practiceCourseSalaryConfig.getParanValue(Integer.class)));
-        classGroupTeacherSalary.setOnlineClassesSalary(new BigDecimal(practiceCourseSalaryConfig.getParanValue(Integer.class)));
+        classGroupTeacherSalary.setSalary(new BigDecimal(practiceCourseSalaryConfig.getParanValue()));
+        classGroupTeacherSalary.setOnlineClassesSalary(new BigDecimal(practiceCourseSalaryConfig.getParanValue()));
         classGroupTeacherSalary.setGroupType(GroupType.PRACTICE);
         classGroupTeacherSalary.setCreateTime(now);
         classGroupTeacherSalary.setUpdateTime(now);

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

@@ -101,6 +101,23 @@
 				id_ = #{courseScheduleTeacherSalary.id}
 		</foreach>
 	</update>
+
+    <update id="batchUpdate">
+        <foreach collection="courseScheduleTeacherSalaries" item="courseScheduleTeacherSalary" separator=";">
+            UPDATE course_schedule_teacher_salary
+            <set>
+                <if test="courseScheduleTeacherSalary.expectSalary">
+                    expect_salary_ = #{courseScheduleTeacherSalary.expectSalary},
+                </if>
+                <if test="courseScheduleTeacherSalary.userId">
+                    user_id_ = #{courseScheduleTeacherSalary.userId},
+                </if>
+                update_time_ = NOW()
+            </set>
+            WHERE
+            id_ = #{courseScheduleTeacherSalary.id}
+        </foreach>
+    </update>
 	
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" >
@@ -310,6 +327,10 @@
 			#{courseScheduleId}
 		</foreach>
 	</select>
+
+	<select id="findByCourseSchedule" resultMap="CourseScheduleTeacherSalary">
+		SELECT * FROM  course_schedule_teacher_salary WHERE course_schedule_id_=#{courseScheduleId}
+	</select>
 	<select id="findByCourseSchedulesWithNoSettlement" resultMap="CourseScheduleTeacherSalary">
 		SELECT * FROM  course_schedule_teacher_salary WHERE course_schedule_id_ IN
 		<foreach collection="courseScheduleIds" item="courseScheduleId" open="(" close=")" separator=",">

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

@@ -102,7 +102,7 @@
 	</select>
 
 	<select id="queryByUserIdList" resultMap="TeacherDefaultPracticeGroupSalary">
-		SELECT * FROM teacher_default_practice_group_salary where ser_id_ IN
+		SELECT * FROM teacher_default_practice_group_salary where user_id_ IN
 		<foreach collection="userIdList" item="userId" open="(" close=")" separator=",">
 			#{userId}
 		</foreach>

mec-web/src/main/java/com/ym/mec/web/controller/PracticeGroupManageController.java

@@ -73,6 +73,13 @@ public class PracticeGroupManageController extends BaseController {
         return succeed(practiceGroupService.findPracticeGroupCourseSchedules(queryInfo));
     }
 
+    @ApiOperation(value = "获取陪练课可预约声部")
+    @GetMapping(value = "/getPracticeApplySubjects")
+    @PreAuthorize("@pcs.hasPermissions('practiceGroupManage/getPracticeApplySubjects')")
+    public HttpResponseResult getPracticeApplySubjects(){
+        return succeed(practiceGroupService.getPracticeApplySubjects());
+    }
+
     @ApiOperation(value = "关闭课程组")
     @PostMapping(value = "/cancelGroup")
     @PreAuthorize("@pcs.hasPermissions('practiceGroupManage/cancelGroup')")