bug

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysMenuMapper.xml

@@ -177,6 +177,9 @@
             <if test="hid != null">
                 AND hidden_ = #{hid}
             </if>
+            <if test="tenantId != null">
+                AND hidden_ = #{tenantId}
+            </if>
         </where>
         ORDER BY sort_ DESC,id_ DESC
     </select>

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysRoleMapper.xml

@@ -58,7 +58,7 @@
                 organ_id_ = #{organId},
             </if>
         </set>
-        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
+        WHERE id_ = #{id} AND tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -88,6 +88,6 @@
         SELECT * FROM sys_role WHERE role_name_ = #{roleName} AND del_flag_ = 0 and tenant_id_ = #{tenantId} LIMIT 1
     </select>
     <select id="getMinRoleId" resultType="java.lang.Integer">
-        SELECT sr.id_ FROM sys_role WHERE del_flag_ = 0 AND tenant_id_ = #{tenantId} LIMIT 1
+        SELECT id_ FROM sys_role WHERE del_flag_ = 0 AND tenant_id_ = #{tenantId} LIMIT 1
     </select>
 </mapper>

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

@@ -84,7 +84,7 @@ public class MusicGroup extends BaseEntity {
 	private String courseForm;
 
 	@ApiModelProperty(value = "老师课酬结算方式",required = false)
-	private SalarySettlementTypeEnum settlementType = SalarySettlementTypeEnum.TEACHER_DEFAULT;
+	private SalarySettlementTypeEnum settlementType = SalarySettlementTypeEnum.GRADIENT_SALARY;
 
 	@ApiModelProperty(value = "课程展现形式",required = false)
 	private CourseViewTypeEnum courseViewType;

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/ClassGroupTypeEnum.java

@@ -6,8 +6,10 @@ import com.ym.mec.common.enums.BaseEnum;
  * 班级类型
  */
 public enum ClassGroupTypeEnum implements BaseEnum<String, ClassGroupTypeEnum> {
-	NORMAL("NORMAL", "普通班级"), MIX("MIX", "合奏班级"), HIGH("HIGH", "提高班"), VIP("VIP", "vip课"), DEMO("DEMO", "试听课"), PRACTICE("PRACTICE", "网管课"), SNAP("SNAP",
-			"临时班级"), COMM("COMM", "对外课程"), HIGH_ONLINE("HIGH_ONLINE", "网络基础训练课"),MUSIC_NETWORK("MUSIC_NETWORK","乐团网管课");
+	NORMAL("NORMAL", "普通班级"), MIX("MIX", "合奏班级"), HIGH("HIGH", "提高班"),
+	VIP("VIP", "vip课"), DEMO("DEMO", "试听课"), PRACTICE("PRACTICE", "网管课"), SNAP("SNAP",
+			"临时班级"), COMM("COMM", "对外课程"), HIGH_ONLINE("HIGH_ONLINE", "网络基础训练课"),
+	MUSIC_NETWORK("MUSIC_NETWORK","乐团网管课");
 
 	private String code;
 

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

@@ -750,7 +750,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 							//课堂课课酬
 							if (type == CourseScheduleType.CLASSROOM) {
-								BigDecimal salary = courseScheduleTeacherSalary.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? tdms.getMainTeacher30MinSalary() : tdms.getAssistantTeacher30MinSalary();
+								BigDecimal salary = courseScheduleTeacherSalary.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? tdms.getMainTeacher90MinSalary() : tdms.getAssistantTeacher90MinSalary();
 								courseScheduleTeacherSalary.setExpectSalary(salary);
 							}
 							//基础技能提高课

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

@@ -1310,7 +1310,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
 
             //课堂课课酬改为按分钟数计算，并且时长占比向下取整
             if (courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.CLASSROOM)){
-                baseSalary = TeachTypeEnum.BISHOP.equals(courseScheduleTeacherSalary.getTeacherRole()) ? teacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary();
+                baseSalary = TeachTypeEnum.BISHOP.equals(courseScheduleTeacherSalary.getTeacherRole()) ? teacherDefaultMusicGroupSalary.getMainTeacher90MinSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacher90MinSalary();
                 classTimeDuty = new BigDecimal(classCourseDuration).divide(new BigDecimal(40), BigDecimal.ZERO.intValue(), BigDecimal.ROUND_DOWN);
             }
             

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

@@ -179,7 +179,7 @@ public class MusicGroupPaymentCalenderCourseSettingsServiceImpl extends BaseServ
 	public BigDecimal getCurrentAmount(MusicGroupPaymentBaseCalender baseCalender) {
 		BigDecimal totalAmount = BigDecimal.ZERO;
 		List<MusicGroupPaymentCalenderCourseSettings> musicGroupPaymentCalenderCourseSettingsList = baseCalender.getMusicGroupPaymentCalenderCourseSettingsList();
-		if(baseCalender.getMusicGroupOrganizationCourseSettingId() != null){
+		if(baseCalender.getMusicGroupOrganizationCourseSettingId() == null){
 			List<MusicGroupOrganizationCourseSettingsDetail> musicGroupOrganizationCourseSettingsDetails = musicGroupOrganizationCourseSettingsDetailDao
 					.queryByMusicGroupOrganizationCourseSettingsId(baseCalender.getMusicGroupOrganizationCourseSettingId());
 			return musicGroupOrganizationCourseSettingsDetails.stream().map(e -> e.getCourseCurrentPrice()).reduce(BigDecimal.ZERO, BigDecimal::add);

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

@@ -3,7 +3,6 @@ package com.ym.mec.biz.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.auth.api.entity.SysUserRole;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
@@ -98,8 +97,6 @@ public class StudentManageServiceImpl implements StudentManageService {
     @Autowired
     private CloudTeacherOrderService cloudTeacherOrderService;
     @Autowired
-    private EmployeeDao employeeDao;
-    @Autowired
     private OrganizationDegreeCourseFeeDao organizationDegreeCourseFeeDao;
     @Autowired
     private ActivityUserMapperDao activityUserMapperDao;

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

@@ -18,6 +18,7 @@ import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.IdGeneratorService;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.thirdparty.adapay.ConfigInit;
 import com.ym.mec.thirdparty.adapay.Payment;
 import com.ym.mec.thirdparty.yqpay.Msg;
@@ -357,8 +358,10 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         if (StringUtils.isBlank(order.getTransNo())) {
             order.setTransNo(rpMap.get("orderNo"));
         }
+
         order.setPaymentBusinessChannel(rpMap.get("channelType"));
         order.setTenantId(this.get(order.getId()).getTenantId());
+        TenantContextHolder.setTenantId(order.getTenantId());
         callOrderCallBack(order);
 
         if (status.equals(DealStatusEnum.SUCCESS)
@@ -367,6 +370,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
                 && !rpMap.containsKey("simulation")) {
             confirmOrder(order);
         }
+        TenantContextHolder.clearTenantId();
     }
 
     private Boolean confirmOrder(StudentPaymentOrder order) {

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

@@ -172,7 +172,7 @@ public class TeacherDefaultMusicGroupSalaryServiceImpl extends BaseServiceImpl<L
 									}
 									//课堂课课酬改为按分钟数计算，并且时长占比向下取整
 									if (CourseSchedule.CourseScheduleType.CLASSROOM.equals(tdms.getCourseScheduleType())){
-										ts.setExpectSalary(TeachTypeEnum.BISHOP.equals(ts.getTeacherRole()) ? tdms.getMainTeacher30MinSalary() : tdms.getAssistantTeacher30MinSalary());
+										ts.setExpectSalary(TeachTypeEnum.BISHOP.equals(ts.getTeacherRole()) ? tdms.getMainTeacher90MinSalary() : tdms.getAssistantTeacher90MinSalary());
 										ts.setExpectSalary(duration.divide(new BigDecimal(40), BigDecimal.ZERO.intValue(), BigDecimal.ROUND_DOWN).multiply(ts.getExpectSalary()).setScale(2, BigDecimal.ROUND_HALF_UP));
 									}
 									list.add(ts);
@@ -199,7 +199,7 @@ public class TeacherDefaultMusicGroupSalaryServiceImpl extends BaseServiceImpl<L
 									}
 									//课堂课课酬改为按分钟数计算，并且时长占比向下取整
 									if (CourseSchedule.CourseScheduleType.CLASSROOM.equals(tdms.getCourseScheduleType())){
-										ts.setExpectSalary(TeachTypeEnum.BISHOP.equals(ts.getTeacherRole()) ? tdms.getMainTeacher30MinSalary() : tdms.getAssistantTeacher30MinSalary());
+										ts.setExpectSalary(TeachTypeEnum.BISHOP.equals(ts.getTeacherRole()) ? tdms.getMainTeacher90MinSalary() : tdms.getAssistantTeacher90MinSalary());
 										ts.setExpectSalary(duration.divide(new BigDecimal(40), BigDecimal.ZERO.intValue(), BigDecimal.ROUND_DOWN).multiply(ts.getExpectSalary()).setScale(2, BigDecimal.ROUND_HALF_UP));
 									}
 									list.add(ts);

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

@@ -2755,6 +2755,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
     public void orderCallback(StudentPaymentOrder studentPaymentOrder) {
         Integer userId = studentPaymentOrder.getUserId();
+        Integer tenantId = studentPaymentOrder.getTenantId();
         StudentPaymentOrder order = studentPaymentOrderDao.lockOrder(studentPaymentOrder.getId());
         if (!order.getStatus().equals(DealStatusEnum.ING)) {
             return;
@@ -2822,6 +2823,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                         courseScheduleTeacherSalary.setClassGroupId(courseSchedule.getClassGroupId());
                         courseScheduleTeacherSalary.setExpectSalary(stringBigDecimalMap.get("offlineTeacherSalary"));
                         courseScheduleTeacherSalary.setActualSalary(null);
+                        courseScheduleTeacherSalary.setTenantId(tenantId);
                         courseScheduleTeacherSalaries.add(courseScheduleTeacherSalary);
 
                         TeacherAttendance teacherAttendance = new TeacherAttendance();
@@ -2830,6 +2832,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                         teacherAttendance.setMusicGroupId(courseSchedule.getMusicGroupId());
                         teacherAttendance.setTeacherId(courseSchedule.getActualTeacherId());
                         teacherAttendance.setCourseScheduleId(courseSchedule.getId());
+                        teacherAttendance.setTenantId(tenantId);
                         teacherAttendances.add(teacherAttendance);
                     }
                     courseScheduleTeacherSalaryDao.batchInsert(courseScheduleTeacherSalaries);
@@ -2874,7 +2877,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                     studentDao.updateStudentServiceTag(null, studentIdList, YesOrNoEnum.YES.getCode());
 
                     courseScheduleStudentPaymentDao.batchInsert(courseScheduleStudentPayments);
-//				courseScheduleService.checkNewCourseSchedules(courseSchedules, false,false);
 
                     imGroupService.create(classGroup.getId().longValue(), null, classGroup.getName(), classGroup.getName(), vipGroup.getName(), null, null, GroupType.VIP.getCode());
                     imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);