Merge branch 'online1' of http://git.dayaedu.com/yonge/mec into music_detail

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

@@ -18,6 +18,9 @@ public class MemberRankOrganizationFeeMapper {
 
 	/**  */
 	private Integer operatorId;
+
+	/**  */
+	private String operatorName;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -32,7 +35,15 @@ public class MemberRankOrganizationFeeMapper {
 	private Integer memberFeeSettingId;
 
 	private MemberFeeSetting memberFeeSetting;
-	
+
+	public String getOperatorName() {
+		return operatorName;
+	}
+
+	public void setOperatorName(String operatorName) {
+		this.operatorName = operatorName;
+	}
+
 	public MemberFeeSetting getMemberFeeSetting() {
 		return memberFeeSetting;
 	}

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

@@ -5864,6 +5864,19 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			return httpResponseResult;
 		}
 
+		//主课类型为基础技能课需要更新课酬
+		if (CourseSchedule.CourseScheduleType.HIGH_ONLINE.equals(courseMergeInfo.getType()) || CourseSchedule.CourseScheduleType.HIGH.equals(courseMergeInfo.getType())) {
+			List<CourseScheduleTeacherSalary> oldCourseSalaries = courseScheduleTeacherSalaryDao.findByCourseSchedule(courseMergeInfo.getId());
+			for (CourseScheduleTeacherSalary oldCourseSalary : oldCourseSalaries) {
+				//课酬调整后不能更新课酬
+				if(!oldCourseSalary.getEnableChangeSalary()){
+					continue;
+				}
+				courseScheduleTeacherSalaryService.createMusicGroupCourseTeacherSalary(null, courseMergeInfo, oldCourseSalary);
+				courseScheduleTeacherSalaryService.update(oldCourseSalary);
+			}
+		}
+
 		if (insertCourseScheduleModifyLogList.size() > 0) {
 			courseScheduleModifyLogDao.batchInsert(insertCourseScheduleModifyLogList);
 		}

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

@@ -53,7 +53,7 @@ public class MemberRankOrganizationFeeMapperServiceImpl extends BaseServiceImpl<
 		if(memberFeeSetting == null){
 			throw new BizException("修改失败: 请设置收费标准");
 		}
-		if(feeMapper.getOrganId() != memberRankOrganizationFeeMapper.getOrganId()){
+		if(!feeMapper.getOrganId().equals(memberRankOrganizationFeeMapper.getOrganId())){
 			MemberRankOrganizationFeeMapper organIdAndRankId = memberRankOrganizationFeeMapperDao.findByOrganIdAndRankId(memberRankOrganizationFeeMapper.getOrganId(), memberRankOrganizationFeeMapper.getMemberRankSettingId());
 			if(organIdAndRankId != null){
 				throw new BizException("修改失败: 该分部会员收费标准已存在");

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

@@ -12,6 +12,7 @@
 		<result column="member_rank_setting_id_" property="memberRankSettingId" />
 		<result column="member_fee_setting_id_" property="memberFeeSettingId" />
 		<result column="operator_id_" property="operatorId" />
+		<result column="operator_name_" property="operatorName" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="rank_name_" property="rankName" />
@@ -68,11 +69,12 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MemberRankOrganizationFeeMapper" parameterType="map">
-		SELECT mrofm.*,o.name_ organ_name_,mrs.name_ rank_name_,mfs.*,mfs.id_ member_fee_setting_id_
+		SELECT mrofm.*,o.name_ organ_name_,mrs.name_ rank_name_,mfs.*,mfs.id_ member_fee_setting_id_,su.real_name_ operator_name_
 		FROM member_rank_organization_fee_mapper mrofm
 		LEFT JOIN member_rank_setting mrs ON  mrofm.member_rank_setting_id_ = mrs.id_
 		LEFT JOIN member_fee_setting mfs ON mfs.id_ = mrofm.member_fee_setting_id_
 		LEFT JOIN organization o ON o.id_ = mrofm.organ_id_
+		LEFT JOIN sys_user su ON su.id_ = mrofm.operator_id_
 		<where>
 			<if test="search != null and search != ''">
 				AND mrs.name_ LIKE CONCAT('%',#{search},'%')

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

@@ -40,6 +40,11 @@ public class MemberRankOrganizationFeeMapperController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('memberRankOrganizationFeeMapper/add')")
     @AuditLogAnnotation(operateName = "新增系统功能类型")
     public Object add(@RequestBody MemberRankOrganizationFeeMapper memberRankOrganizationFeeMapper) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            throw new BizException("用户信息获取失败");
+        }
+        memberRankOrganizationFeeMapper.setOperatorId(sysUser.getId());
         memberRankOrganizationFeeMapperService.add(memberRankOrganizationFeeMapper);
         return succeed();
     }
@@ -48,6 +53,11 @@ public class MemberRankOrganizationFeeMapperController extends BaseController {
     @PostMapping("/update")
     @PreAuthorize("@pcs.hasPermissions('memberRankOrganizationFeeMapper/update')")
     public Object update(@RequestBody MemberRankOrganizationFeeMapper memberRankOrganizationFeeMapper) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            throw new BizException("用户信息获取失败");
+        }
+        memberRankOrganizationFeeMapper.setOperatorId(sysUser.getId());
         memberRankOrganizationFeeMapperService.updateFee(memberRankOrganizationFeeMapper);
         return succeed();
     }