bug

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

@@ -212,4 +212,6 @@ public interface StudentPaymentOrderService extends BaseService<Long, StudentPay
     StudentPaymentOrderVo queryOrderDetail(String orderNo);
 
     List<StudentPaymentOrder> queryByDealStatus(String musicGroupId, OrderTypeEnum orderType, DealStatusEnum status);
+
+    StudentPaymentOrder lockOrder(Long paymentOrderId);
 }

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

@@ -1056,21 +1056,6 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		int lowTeacherSalary = indexBaseMonthDataDao.queryLowTeacherSalary(organIds,monthStr, tenantId);
 		result.add(new IndexErrInfoDto(IndexErrorType.TEACHER_EXPECT_SALARY_BE_LOW, IndexErrorType.TEACHER_EXPECT_SALARY_BE_LOW.getMsg(),lowTeacherSalary, null));
 
-		//乐团学员会员即将到期首页提醒
-//		String configValue = sysTenantConfigService.getTenantConfigValue(SysConfigService.PUSH_MEMBER_RENEW_QUIT,tenantId);
-//		if (StringUtils.isEmpty(configValue)) {
-//			configValue = "15";
-//		}
-//		List<StudentRegistration> studentRegistrations = studentRegistrationDao.queryMemberEndAutoQuitMusic(configValue,educationUserId,organIds);
-//		Set<String> musicGroupIdList = studentRegistrations.stream().map(e -> e.getMusicGroupId()).collect(Collectors.toSet());
-//		Set<Integer> userIds = studentRegistrations.stream().map(e -> e.getUserId()).collect(Collectors.toSet());
-//		IndexErrInfoDto infoDto = new IndexErrInfoDto();
-//		infoDto.setErrorType(IndexErrorType.MEMBER_STUDENT_INFO);
-//		infoDto.setNum(musicGroupIdList.size());
-//		infoDto.setNum2(userIds.size());
-//		infoDto.setDesc(IndexErrorType.MEMBER_STUDENT_INFO.getMsg());
-//		result.add(infoDto);
-
 		//乐团展演计划提醒
 		List<MusicGroupPerformance> musicGroupPerformances = musicGroupPerformanceDao.findNoStart(educationUserId,organIds);
 		IndexErrInfoDto infoDto1 = new IndexErrInfoDto();

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

@@ -206,24 +206,21 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
 	}
 
 	@Override
-	@Transactional(rollbackFor = Exception.class)
+	@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
 	public boolean orderCallback(StudentPaymentOrder studentPaymentOrder) {
-
-		Integer userId = studentPaymentOrder.getUserId();
-
-		Student student = studentService.getLocked(userId);
-		if (student == null) {
-			throw new BizException("学员信息不存在");
-		}
-		
 		//查询原定的是否已处理
-		StudentPaymentOrder orignStudentPaymentOrder = studentPaymentOrderService.get(studentPaymentOrder.getId());
+		StudentPaymentOrder orignStudentPaymentOrder = studentPaymentOrderService.lockOrder(studentPaymentOrder.getId());
 		if(orignStudentPaymentOrder == null){
 			return false;
 		}
 		if(orignStudentPaymentOrder.getStatus() != DealStatusEnum.ING){
 			return false;
 		}
+		Integer userId = studentPaymentOrder.getUserId();
+		Student student = studentService.get(userId);
+		if (student == null) {
+			throw new BizException("学员信息不存在");
+		}
 		
 		Date nowDate = new Date();
 		// 更新订单信息

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

@@ -889,5 +889,10 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         return studentPaymentOrderDao.queryByDealStatus(musicGroupId,orderType,status);
     }
 
+    @Override
+    public StudentPaymentOrder lockOrder(Long paymentOrderId) {
+        return studentPaymentOrderDao.lockOrder(paymentOrderId);
+    }
+
 
 }

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

@@ -128,8 +128,6 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     @Autowired
     private ImGroupDao imGroupDao;
     @Autowired
-    private EmployeeDao employeeDao;
-    @Autowired
     private StudentInstrumentDao studentInstrumentDao;
     @Autowired
     private MusicGroupPaymentCalenderStudentDetailDao musicGroupPaymentCalenderStudentDetailDao;

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

@@ -31,8 +31,6 @@ public class TeacherCourseStatisticsServiceImpl extends BaseServiceImpl<Long, Te
     @Autowired
     private TeacherCourseStatisticsDao teacherCourseStatisticsDao;
     @Autowired
-    private SysConfigService sysConfigService;
-    @Autowired
     private SysTenantConfigService sysTenantConfigService;
 
     @Override

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

@@ -1113,7 +1113,7 @@
 		LEFT JOIN teacher t ON t.id_ = tcs.user_id_
 		LEFT JOIN sys_user su ON su.id_ = tcs.user_id_
 		WHERE su.lock_flag_ = 0 AND su.del_flag_ = 0 AND t.job_nature_ = 'FULL_TIME' AND t.demission_date_ IS NULL
-		  AND t.is_settlement_salary_ = 1 and t.tenant_id_ = #{tenantId}
+		AND t.is_settlement_salary_ = 1 and t.tenant_id_ = #{tenantId}
 		AND DATE_FORMAT(tcs.month_,'%Y-%m') = #{monthStr} AND tcs.low_salary = 1
 		<if test="organIdsStr != null and organIdsStr != ''">
 			AND FIND_IN_SET(tcs.organ_id_,#{organIdsStr})

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

@@ -140,7 +140,8 @@
 
     <sql id="queryParams">
         <where>
-            u.lock_flag_ = 0 AND u.del_flag_ = 0 AND t.job_nature_ = 'FULL_TIME' AND t.demission_date_ IS NULL and tcs.tenant_id_ = #{tenantId}
+            u.lock_flag_ = 0 AND u.del_flag_ = 0 AND t.job_nature_ = 'FULL_TIME'
+            AND t.demission_date_ IS NULL and tcs.tenant_id_ = #{tenantId} AND t.is_settlement_salary_ = 1
             <if test="organId != null">
                 AND FIND_IN_SET(tcs.organ_id_,#{organId})
             </if>

mec-student/src/main/java/com/ym/mec/student/controller/MemberRankController.java

@@ -42,9 +42,6 @@ public class MemberRankController extends BaseController {
 	@Autowired
 	private SysUserFeignService sysUserFeignService;
 
-	@Autowired
-	private SysConfigDao sysConfigDao;
-
 	@ApiOperation(value = "获取所有的收费标准")
 	@GetMapping("/queryList")
 	public Object getMemberDefaultFee() {