Merge remote-tracking branch 'origin/saas' into saas

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysUserDeviceServiceImpl.java

@@ -102,6 +102,7 @@ public class SysUserDeviceServiceImpl extends BaseServiceImpl<Integer, SysUserDe
 			sysUserDevice.setDeviceNum(deviceNum);
 			sysUserDevice.setBindTime(new Date());
 			sysUserDevice.setClientId(clientId);
+			sysUserDevice.setTenantId(tenantId);
 			sysUserDeviceDao.insert(sysUserDevice);
 		}
 		

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

@@ -124,7 +124,7 @@ public class Teacher extends SysUser {
 	private BigDecimal serviceIndex;
 
 	@ApiModelProperty(value = "是否结算课酬")
-	private Boolean isSettlementSalary;
+	private Boolean isSettlementSalary = true;
 
 	public Boolean getIsSettlementSalary() {
 		return isSettlementSalary;

mec-biz/src/main/java/com/ym/mec/biz/dal/page/TenantApplyQueryInfo.java

@@ -0,0 +1,38 @@
+package com.ym.mec.biz.dal.page;
+
+import java.util.Date;
+
+import com.ym.mec.common.page.QueryInfo;
+
+public class TenantApplyQueryInfo extends QueryInfo {
+
+	private Date startDateTime;
+	
+	private Date endDateTime;
+	
+	private String name;
+
+	public Date getStartDateTime() {
+		return startDateTime;
+	}
+
+	public void setStartDateTime(Date startDateTime) {
+		this.startDateTime = startDateTime;
+	}
+
+	public Date getEndDateTime() {
+		return endDateTime;
+	}
+
+	public void setEndDateTime(Date endDateTime) {
+		this.endDateTime = endDateTime;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+}

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/MusicGroupNewsMapper.xml

@@ -77,10 +77,10 @@
 		<where>
             mgn.tenant_id_ = #{tenantId}
 			<if test="search != null and search != ''">
-				mgn.music_group_id_ = #{search}
+				and mgn.music_group_id_ = #{search}
 			</if>
 			<if test="musicGroupId != null and musicGroupId != ''">
-				mgn.music_group_id_ = #{musicGroupId}
+				and mgn.music_group_id_ = #{musicGroupId}
 			</if>
 		</where>
 		ORDER BY mgn.id_ DESC
@@ -93,10 +93,10 @@
 		<where>
             mgn.tenant_id_ = #{tenantId}
 			<if test="search != null and search != ''">
-				mgn.music_group_id_ = #{search}
+				and mgn.music_group_id_ = #{search}
 			</if>
 			<if test="musicGroupId != null and musicGroupId != ''">
-				mgn.music_group_id_ = #{musicGroupId}
+				and mgn.music_group_id_ = #{musicGroupId}
 			</if>
 		</where>
 	</select>

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-biz/src/main/resources/config/mybatis/TenantApplyMapper.xml

@@ -81,15 +81,31 @@
 		DELETE FROM tenant_apply WHERE id_ = #{id}
 	</delete>
 
+	<sql id="queryPageCondition">
+		<where>
+			<if test="name != null and name != ''">
+				AND name_ LIKE CONCAT('%', #{name}, '%')
+			</if>
+			<if test="startDateTime != null">
+				AND create_time_ &gt;= #{startDateTime}
+			</if>
+			<if test="endDateTime != null">
+				AND create_time_ &lt;= #{endDateTime}
+			</if>
+		</where>
+	</sql>
+
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="TenantApply" parameterType="map">
-		SELECT * FROM tenant_apply ORDER BY id_
+		SELECT * FROM tenant_apply 
+		<include refid="queryPageCondition"/>
+		ORDER BY id_
 		<include refid="global.limit" />
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM
-		tenant_apply
+		SELECT COUNT(*) FROM tenant_apply
+		<include refid="queryPageCondition"/>
 	</select>
 </mapper>

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() {

mec-teacher/src/main/java/com/ym/mec/teacher/controller/SysMusicScoreCategoriesController.java

@@ -1,23 +1,25 @@
 package com.ym.mec.teacher.controller;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.dto.MusicScoreQueryInfo;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.entity.Teacher;
-import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
-import com.ym.mec.biz.service.SysMusicScoreCategoriesService;
-import com.ym.mec.biz.service.TeacherService;
-import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.dto.MusicScoreQueryInfo;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.entity.TenantConfig;
+import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
+import com.ym.mec.biz.service.SysMusicScoreCategoriesService;
+import com.ym.mec.biz.service.TeacherService;
+import com.ym.mec.biz.service.TenantConfigService;
+import com.ym.mec.common.controller.BaseController;
+
 @RequestMapping("sysMusicScoreCategories")
 @Api(tags = "曲库分类服务")
 @RestController
@@ -29,6 +31,9 @@ public class SysMusicScoreCategoriesController extends BaseController {
     private SysUserFeignService sysUserFeignService;
     @Autowired
     private TeacherService teacherService;
+    
+    @Autowired
+    private TenantConfigService tenantConfigService;
 
 
     @ApiOperation(value = "分页查询")
@@ -44,15 +49,10 @@ public class SysMusicScoreCategoriesController extends BaseController {
         if (sysUser == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        Teacher teacher = teacherService.get(sysUser.getId());
-        if (StringUtils.isEmpty(queryInfo.getOrganId())) {
-            queryInfo.setOrganId(teacher.getTeacherOrganId() + "");
-        }
-        if(StringUtils.isNotBlank(teacher.getFlowOrganRange())){
-            queryInfo.setOrganId(queryInfo.getOrganId() + "," + teacher.getFlowOrganRange());
-        }
-        queryInfo.setEnable(true);
-        return succeed(sysMusicScoreCategoriesService.queryTree(queryInfo));
+        
+        TenantConfig tenantConfig = tenantConfigService.getOne(new QueryWrapper<TenantConfig>().eq("tenant_id_", sysUser.getTenantId()));
+        
+        return succeed(sysMusicScoreCategoriesService.queryCategoriesTreeList(tenantConfig.getTeachingMaterialId()));
     }
 
     @ApiOperation(value = "获取分类详情")

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

@@ -15,9 +15,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.ym.mec.biz.dal.entity.TenantApply;
+import com.ym.mec.biz.dal.page.TenantApplyQueryInfo;
 import com.ym.mec.biz.service.TenantApplyService;
 import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.IdGeneratorService;
 
 @RequestMapping("tenantApply")
@@ -34,7 +34,7 @@ public class TenantApplyController extends BaseController {
 	@ApiOperation("分页查询")
 	@GetMapping(value = "/list")
 	@PreAuthorize("@pcs.hasPermissions('tenantApply/list')")	
-	public Object getList(QueryInfo queryInfo) {
+	public Object getList(TenantApplyQueryInfo queryInfo) {
 		return succeed(tenantApplyService.queryPage(queryInfo));
 	}