Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/client/SysUserFeignService.java

@@ -25,9 +25,6 @@ public interface SysUserFeignService {
 	@PostMapping(value = "user/add", consumes = MediaType.APPLICATION_JSON_VALUE)
 	public Object addUser(SysUser user);
 
-	@GetMapping(value = "task/test")
-	public Object test();
-
 	@GetMapping(value = "queryUserInfo")
 	public SysUser queryUserInfo();
 

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/client/fallback/SysUserFeignServiceFallback.java

@@ -16,12 +16,6 @@ public class SysUserFeignServiceFallback implements SysUserFeignService {
 	}
 
 	@Override
-	public Object test() {
-		System.out.println("******进入服务降级方法******");
-		return "服务正在拍";
-	}
-
-	@Override
 	public SysUser queryUserInfo() {
 		return null;
 	}

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

@@ -4,6 +4,7 @@ import com.ym.mec.biz.dal.dto.CourseScheduleTeachersDto;
 import com.ym.mec.biz.dal.dto.TeacherSalaryDto;
 import com.ym.mec.biz.dal.dto.VipGroupSalaryDto;
 import com.ym.mec.biz.dal.entity.CourseScheduleTeacherSalary;
+import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
@@ -13,147 +14,152 @@ import java.util.Map;
 
 public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseScheduleTeacherSalary> {
 
-    /**
-     * @Author: Joburgess
-     * @Date: 2019/10/10
-     * @params [courseScheduleTeacherSalaries]
-     * @return int
-     * @describe 批量插入
-     */
-    int batchInsert(List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries);
-
-    /**
-     * @describe 根据课程编号批量删除教师课酬记录
-     * @author Joburgess
-     * @date 2019/10/31
-     * @param courseScheduleIds: 课程编号列表
-     * @return int
-     */
-    int batchDeleteByCourseScheduleIds(@Param("courseScheduleIds") List<Long> courseScheduleIds);
-
-    /**
-     * @Author: Joburgess
-     * @Date: 2019/10/11
-     * @params [params]
-     * @return java.util.List<com.ym.mec.biz.dal.dto.VipGroupSalaryDto>
-     * @describe 获取vip课财务记录
-     */
-    List<VipGroupSalaryDto> findVipGroupSalarys(Map<String,Object> params);
-    int countVipGroupSalarys(Map<String,Object> params);
-
-    /**
-     * @Author: Joburgess
-     * @Date: 2019/10/15
-     * @params [days:天数]
-     * @return java.util.List<com.ym.mec.biz.dal.entity.TeacherDefaultVipGroupSalary>
-     * @describe 获取多少天之前的未结算教师课酬记录（vip课）
-     */
-    List<CourseScheduleTeacherSalary> findSomeDayAgoTeacherCourseSalaryNoSettlement(Integer days);
-
-    /**
+	/**
+	 * @return int
+	 * @Author: Joburgess
+	 * @Date: 2019/10/10
+	 * @params [courseScheduleTeacherSalaries]
+	 * @describe 批量插入
+	 */
+	int batchInsert(List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries);
+
+	/**
+	 * @param courseScheduleIds: 课程编号列表
+	 * @return int
+	 * @describe 根据课程编号批量删除教师课酬记录
+	 * @author Joburgess
+	 * @date 2019/10/31
+	 */
+	int batchDeleteByCourseScheduleIds(@Param("courseScheduleIds") List<Long> courseScheduleIds);
+
+	/**
+	 * @return java.util.List<com.ym.mec.biz.dal.dto.VipGroupSalaryDto>
+	 * @Author: Joburgess
+	 * @Date: 2019/10/11
+	 * @params [params]
+	 * @describe 获取vip课财务记录
+	 */
+	List<VipGroupSalaryDto> findVipGroupSalarys(Map<String, Object> params);
+
+	int countVipGroupSalarys(Map<String, Object> params);
+
+	/**
+	 * @return java.util.List<com.ym.mec.biz.dal.entity.TeacherDefaultVipGroupSalary>
+	 * @Author: Joburgess
+	 * @Date: 2019/10/15
+	 * @params [days:天数]
+	 * @describe 获取多少天之前的未结算教师课酬记录（vip课）
+	 */
+	List<CourseScheduleTeacherSalary> findSomeDayAgoTeacherCourseSalaryNoSettlement(Integer days);
+
+	/**
 	 * 查询老师指定课程的课酬
+	 *
 	 * @param courseScheduleId
 	 * @param teacherId
 	 * @return
 	 */
 	CourseScheduleTeacherSalary queryByCourseScheduleIdAndUserId(@Param("courseScheduleId") Long courseScheduleId, @Param("teacherId") Integer teacherId);
-	
+
 	/**
 	 * 批量更新指定老师所教学班级的报酬（课酬、补贴）
+	 *
 	 * @param classGroupId 班级编号
-	 * @param userId 老师编号
-	 * @param salary 课酬
-	 * @param subsidy 补贴
+	 * @param userId       老师编号
+	 * @param salary       课酬
+	 * @param subsidy      补贴
 	 * @return
 	 */
 	int batchUpdateWages(@Param("classGroupId") Integer classGroupId, @Param("userId") Integer userId, @Param("salary") BigDecimal salary,
-			@Param("subsidy") BigDecimal subsidy);
+						 @Param("subsidy") BigDecimal subsidy);
 
 	/**
+	 * @param courseScheduleId: 课程编号
+	 * @param userIds:          课程关联教师编号
+	 * @return int
 	 * @describe 批量更新指定班级关联教师预计薪水
 	 * @author Joburgess
 	 * @date 2019/10/23
-	 * @param courseScheduleId: 课程编号
-	 * @param userIds: 课程关联教师编号
-	 * @return int
 	 */
 	int batchUpdateTeacherExpectSalary(@Param("courseScheduleId") Integer courseScheduleId,
 									   @Param("userIds") List<Integer> userIds);
 
 	/**
-	 * @describe 根据班级编号和教师类型获取老师列表
-	 * @author Joburgess
-	 * @date 2019/10/23
 	 * @param courseScheduleIds:
 	 * @param teacherRole:
 	 * @return java.util.List<com.ym.mec.biz.dal.dto.BasicUserDto>
+	 * @describe 根据班级编号和教师类型获取老师列表
+	 * @author Joburgess
+	 * @date 2019/10/23
 	 */
 	List<CourseScheduleTeacherSalary> findByCourseScheduleIdsAndTeacherRole(@Param("courseScheduleIds") List<Integer> courseScheduleIds,
-															 @Param("teacherRole") String teacherRole);
+																			@Param("teacherRole") String teacherRole);
 
 	/**
+	 * @param courseScheduleIds: 课程编号列表
+	 * @return java.util.List<java.util.Map < java.lang.String, java.lang.String>>
 	 * @describe 根据课程获取对应乐团结算方式
 	 * @author Joburgess
 	 * @date 2019/10/24
-	 * @param courseScheduleIds: 课程编号列表
-	 * @return java.util.List<java.util.Map<java.lang.String,java.lang.String>>
 	 */
-	List<Map<String,String>> findMusicGroupSettlementTypeByCourse(@Param("courseScheduleIds") List<Long> courseScheduleIds);
+	List<Map<String, String>> findMusicGroupSettlementTypeByCourse(@Param("courseScheduleIds") List<Long> courseScheduleIds);
 
 	/**
+	 * @param courseScheduleIds: 课程编号列表
+	 * @return java.util.List<java.util.Map < java.lang.String, java.lang.Integer>>
 	 * @describe 根据课程获取对应乐团的收费类型
 	 * @author Joburgess
 	 * @date 2019/11/3
-	 * @param courseScheduleIds: 课程编号列表
-	 * @return java.util.List<java.util.Map<java.lang.String,java.lang.Integer>>
 	 */
-	List<Map<String,Integer>> findMusicGroupChargeTypeByCourse(@Param("courseScheduleIds") List<Long> courseScheduleIds);
+	List<Map<String, Integer>> findMusicGroupChargeTypeByCourse(@Param("courseScheduleIds") List<Long> courseScheduleIds);
 
 	/**
+	 * @param courseScheduleIds: 课程编号列表
+	 * @return java.util.List<java.util.Map < java.lang.Integer, java.math.BigDecimal>>
 	 * @describe 根据课程获取对应的教学点补贴
 	 * @author Joburgess
 	 * @date 2019/10/24
-	 * @param courseScheduleIds: 课程编号列表
-	 * @return java.util.List<java.util.Map<java.lang.Integer,java.math.BigDecimal>>
 	 */
-	List<Map<Integer,BigDecimal>> findCourseSubsidyByCourses(@Param("courseScheduleIds") List<Long> courseScheduleIds);
+	List<Map<Integer, BigDecimal>> findCourseSubsidyByCourses(@Param("courseScheduleIds") List<Long> courseScheduleIds);
 
 	/**
 	 * 乐团详情--课酬调整--课程教师列表
+	 *
 	 * @param courseScheduleId
 	 * @return
 	 */
-    List<CourseScheduleTeachersDto> queryTeacherSalary(Integer courseScheduleId);
-
-    /**
-     * @describe 根据课程获取课程相关的老师课酬记录
-     * @author Joburgess
-     * @date 2019/11/3
-     * @param courseScheduleIds: 课程编号列表
-     * @return java.util.List<com.ym.mec.biz.dal.entity.CourseScheduleTeacherSalary>
-     */
-    List<CourseScheduleTeacherSalary> findByCourseSchedules(@Param("courseScheduleIds") List<Long> courseScheduleIds);
+	List<CourseScheduleTeachersDto> queryTeacherSalary(Integer courseScheduleId);
 
 	/**
-	 * @describe 根据课程获取课程相关的老师未结算课酬记录
+	 * @param courseScheduleIds: 课程编号列表
+	 * @return java.util.List<com.ym.mec.biz.dal.entity.CourseScheduleTeacherSalary>
+	 * @describe 根据课程获取课程相关的老师课酬记录
 	 * @author Joburgess
 	 * @date 2019/11/3
+	 */
+	List<CourseScheduleTeacherSalary> findByCourseSchedules(@Param("courseScheduleIds") List<Long> courseScheduleIds);
+
+	/**
 	 * @param courseScheduleIds: 课程编号列表
 	 * @return java.util.List<com.ym.mec.biz.dal.entity.CourseScheduleTeacherSalary>
+	 * @describe 根据课程获取课程相关的老师未结算课酬记录
+	 * @author Joburgess
+	 * @date 2019/11/3
 	 */
 	List<CourseScheduleTeacherSalary> findByCourseSchedulesWithNoSettlement(@Param("courseScheduleIds") List<Long> courseScheduleIds);
 
 	/**
+	 * @param classGroupId: 班级编号
+	 * @return java.util.List<java.util.Map < java.lang.String, java.math.BigDecimal>>
 	 * @describe 统计班级上老师的先上课，线下课课酬
 	 * @author Joburgess
 	 * @date 2019/11/5
-	 * @param classGroupId: 班级编号
-	 * @return java.util.List<java.util.Map<java.lang.String,java.math.BigDecimal>>
 	 */
 	List<Map<String, BigDecimal>> countTeacherOnlineOfflineSalaryByClass(@Param("classGroupId") Integer classGroupId);
 
 	/**
 	 * count教师薪酬
+	 *
 	 * @param params
 	 * @return
 	 */
@@ -161,8 +167,11 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
 
 	/**
 	 * query教师薪酬
+	 *
 	 * @param params
 	 * @return
 	 */
 	List<TeacherSalaryDto> querySalaries(Map<String, Object> params);
+
+	List<CourseScheduleTeacherSalary> findCourseScheduleTeacherSalaryByMusicGroupId(@Param("musicGroupId") String musicGroupId, @Param("groupType") GroupType groupType);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SubjectGoodsMapper.java

@@ -17,10 +17,18 @@ public class SubjectGoodsMapper {
 	/**  */
 	@ApiModelProperty(value = "科目编号", required = false)
 	private String subjectId;
+	
+	/** 类型(乐器、辅件、教材) */
+	@ApiModelProperty(value = "商品类型",required = false)
+	private GoodsType type;
 
 	/**  */
 	@ApiModelProperty(value = "商品分类编号", required = false)
 	private Integer goodsCategoryId;
+	
+	/** 商品列表(用逗号,分开) */
+	@ApiModelProperty(value = "商品列表(用逗号,分开)",required = false)
+	private String goodsIdList;
 
 	@ApiModelProperty(value = "删除标记，删除时传true，其他传null", required = false)
 	private boolean delFlag = false;
@@ -79,6 +87,22 @@ public class SubjectGoodsMapper {
 		return this.updateTime;
 	}
 
+	public GoodsType getType() {
+		return type;
+	}
+
+	public void setType(GoodsType type) {
+		this.type = type;
+	}
+
+	public String getGoodsIdList() {
+		return goodsIdList;
+	}
+
+	public void setGoodsIdList(String goodsIdList) {
+		this.goodsIdList = goodsIdList;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -333,4 +333,11 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @return
      */
     Boolean addImGroup(ClassGroup classGroup,List<Integer> userIds);
+
+    /**
+     * 检测是否设置课酬
+     * @param musicGroupId
+     * @return
+     */
+    Boolean checkSetSalary(String musicGroupId);
 }

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

@@ -1745,4 +1745,13 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         imFeignService.groupCreate(new ImGroupModel(classGroup.getId().toString(), imGroupMembers, classGroup.getName()));
         return true;
     }
+
+    @Override
+    public Boolean checkSetSalary(String musicGroupId) {
+        List<CourseScheduleTeacherSalary> courseScheduleTeacherSalary = courseScheduleTeacherSalaryDao.findCourseScheduleTeacherSalaryByMusicGroupId(musicGroupId, GroupType.MUSIC);
+        if(courseScheduleTeacherSalary != null && courseScheduleTeacherSalary.size() > 0){
+            return true;
+        }
+        return false;
+    }
 }

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

@@ -329,10 +329,8 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 			Set<Integer> teachers = rows.stream().map(e -> e.getId()).collect(Collectors.toSet());
 			String teacherIds = StringUtils.join(teachers, ",");
 			//获取小课数量
-//			List<Map<Integer,Long>> numList =  classGroupDao.countTeacherVipNum(teacherIds);
 			Map<Integer,Integer> vipNumMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(classGroupDao.countTeacherVipNum(teacherIds))),HashMap.class);
 			//获取试听课数量
-//			List<Map<Integer,Long>> demoNumList =  demoGroupDao.countTeacherDemoGroupNum(teacherIds);
 			Map<Integer,Integer> demoNumMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(demoGroupDao.countTeacherDemoGroupNum(teacherIds))),HashMap.class);
 
 //			Set<Integer> organIds = rows.stream().map(e -> e.getOrganId()).collect(Collectors.toSet());

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

@@ -442,7 +442,7 @@
         WHERE
           cs.class_date_ = DATE_FORMAT(#{classDate},'%Y%m%d')
         AND cssp.user_id_ = #{studentId}
-        <if test="quitClassGroupIds.size()>0">
+        <if test="quitClassGroupIds != null and quitClassGroupIds.size()>0">
             AND cssp.class_group_id_ NOT IN
             <foreach collection="quitClassGroupIds" item="quitClassGroupId" open="(" close=")" separator=",">
                 #{quitClassGroupId}

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

@@ -330,4 +330,8 @@
 				#{userId}
 			</foreach>
 	</update>
+
+	<select id="findCourseScheduleTeacherSalaryByMusicGroupId" resultMap="CourseScheduleTeacherSalary">
+		SELECT * FROM course_schedule_teacher_salary WHERE music_group_id_=#{musicGroupId} AND group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+	</select>
 </mapper>

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

@@ -9,7 +9,9 @@
     <resultMap type="com.ym.mec.biz.dal.entity.SubjectGoodsMapper" id="SubjectGoodsMapper">
         <result column="id_" property="id"/>
         <result column="subject_id_" property="subjectId"/>
+        <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="goods_category_id_" property="goodsCategoryId"/>
+        <result column="goods_id_list_" property="goodsIdList"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
     </resultMap>
@@ -27,9 +29,10 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SubjectGoodsMapper" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
-        INSERT INTO subject_goods_mapper (subject_id_,goods_category_id_,create_time_,update_time_)
-        VALUES(#{subjectId},#{goodsCategoryId},now(),now())
+        INSERT INTO subject_goods_mapper (subject_id_,goods_category_id_,create_time_,update_time_,type_,goods_id_list_)
+        VALUES(#{subjectId},#{goodsCategoryId},now(),now(),#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{goodsIdList})
     </insert>
+    
     <insert id="batchAdd">
         INSERT INTO subject_goods_mapper (subject_id_,goods_category_id_,create_time_,update_time_)
         VALUES
@@ -51,6 +54,12 @@
             <if test="goodsCategoryId != null">
                 goods_category_id_ = #{goodsCategoryId},
             </if>
+            <if test="type != null">
+                type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
+            <if test="goodsIdList != null">
+                goods_id_list_ = #{goodsIdList},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>

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

@@ -179,7 +179,7 @@ public class ClassGroupController extends BaseController {
     @PostMapping("/setClassGroupTeacherSalary")
     @PreAuthorize("@pcs.hasPermissions('classGroup/setClassGroupTeacherSalary')")
     @ApiParam(value = "乐团班级老师<包含相应课酬>json", required = true)
-    public Object setClassGroupTeacherSalary(@RequestBody List<ClassGroupTeacherMapper> classGroupTeacherMapperList) throws Exception {
+    public HttpResponseResult setClassGroupTeacherSalary(@RequestBody List<ClassGroupTeacherMapper> classGroupTeacherMapperList) throws Exception {
         if (classGroupTeacherMapperList.size() <= 0) {
             return failed("参数不合法");
         }
@@ -235,4 +235,13 @@ public class ClassGroupController extends BaseController {
         return succeed(classGroupService.getClassGroupAndTeacherByType(musicGroupId,type));
     }
 
+    @ApiOperation(value = "查询是否设置课酬")
+    @GetMapping("/checkSetSalary")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/checkSetSalary')")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "musicGroupId", value = "乐团id", required = true, dataType = "string")
+    })
+    public HttpResponseResult checkSetSalary(String musicGroupId){
+        return succeed(classGroupService.checkSetSalary(musicGroupId));
+    }
 }

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

@@ -139,7 +139,7 @@ public class StudentManageController extends BaseController {
      */
     @GetMapping(value = "/queryUserByPhone")
     @PreAuthorize("@pcs.hasPermissions('studentManage/queryUserByPhone')")
-    public StudentRegistration queryUserByPhone(String mobile) {
-        return studentRegistrationService.queryUserByPhone(mobile);
+    public Object queryUserByPhone(String mobile) {
+        return succeed(studentRegistrationService.queryUserByPhone(mobile));
     }
 }