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

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

@@ -30,6 +30,7 @@ import com.ym.mec.im.entity.GroupModel;
 import com.ym.mec.util.collection.MapUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.LockedException;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -78,12 +79,20 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		return employeeDao;
 	}
 
+	private void checkTenantId(Integer tenantId,Integer targetTenantId){
+		//如果机构不一致，不允许跨机构注册
+		if(tenantId != null && tenantId != 0 && !tenantId.equals(targetTenantId)){
+			throw new LockedException("用户已注册");
+		}
+	}
+
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void add(Employee employee){
-		SysUser user = sysUserFeignService.queryUserByMobile(employee.getPhone());
+		SysUser user = teacherDao.getUserWithPhone(employee.getPhone());
 		Integer tenantId = TenantContextHolder.getTenantId();
 		if(user != null && user.getId() != null){
+			checkTenantId(tenantId,user.getTenantId());
 			Employee employee1 = employeeDao.get(user.getId());
 			if(employee1 == null){
 				if(StringUtils.isEmpty(user.getPassword())){
@@ -134,7 +143,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 			throw new BizException("员工信息不存在");
 		}
 		employee.setUserId(employee.getId());
-		SysUser sysUser = sysUserFeignService.queryUserByMobile(employee.getPhone());
+		SysUser sysUser = teacherDao.getUserWithPhone(employee.getPhone());
 		if(StringUtils.isNotEmpty(employee.getPhone())){
 			if(sysUser != null && !sysUser.getId().equals(employee.getUserId())){
 				throw new BizException("手机号已存在");
@@ -145,7 +154,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		}
 
 		// 同步更新机构手机号 如果它存在  138xxx -> 159xxx
-		SysUser user = sysUserFeignService.queryUserById(employee.getId());
+		SysUser user = teacherDao.getUser(employee.getId());
 		if (!Objects.equals(user.getPhone(), employee.getPhone())) {
 			tenantInfoService.updatePhone(employee.getPhone(), user.getPhone());
 		}
@@ -235,7 +244,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 	@Transactional(rollbackFor = Exception.class)
 	public void employeeOperate(Integer employeeId, EmployeeOperateEnum operate) {
 		Employee employee = employeeDao.get(employeeId);
-		SysUser sysUser = sysUserFeignService.queryUserById(employeeId);
+		SysUser sysUser = teacherDao.getUser(employeeId);
 		switch (operate){
 			case RESET_PASSWORD:
 				employeeDao.updatePassword(employeeId,new BCryptPasswordEncoder().encode(ParamEnum.INIT_PASSWORD.getCode().toString()));
@@ -393,7 +402,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		employeeDao.updateUserDemissionDate(levelUserId);
 		//冻结用户
 		employeeDao.updateUserLock(levelUserId,1);
-		ExecutorService executor = Executors.newFixedThreadPool(20);
+		ExecutorService executor = Executors.newFixedThreadPool(5);
 		CompletableFuture<Boolean> refreshUserFriend = CompletableFuture.supplyAsync(()->{
 			//获取用户担任教务老师、维修技师的所有乐团列表
 			List<String> musicGroupIds = employeeDao.queryMusicGroupIdByUserId(levelUserId);

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

@@ -312,25 +312,25 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
 		// 支付成功
 		if (studentPaymentOrder.getStatus() == DealStatusEnum.SUCCESS) {
 			// 查询会员订单信息
-			CloudTeacherOrder cloudTeacherOrder = cloudTeacherOrderService.queryByOrderId(studentPaymentOrder.getId());
-			cloudTeacherOrder.setStatus(2);
-			cloudTeacherOrder.setUpdateTime(nowDate);
-
-			PeriodEnum periodEnum = cloudTeacherOrder.getType();
+//			CloudTeacherOrder cloudTeacherOrder = cloudTeacherOrderService.queryByOrderId(studentPaymentOrder.getId());
+//			cloudTeacherOrder.setStatus(2);
+//			cloudTeacherOrder.setUpdateTime(nowDate);
+//
+//			PeriodEnum periodEnum = cloudTeacherOrder.getType();
 
-			if (student.getMemberRankSettingId() == null || nowDate.after(student.getMembershipEndTime())) {
-				cloudTeacherOrder.setStartTime(nowDate);
-				cloudTeacherOrder.setEndTime(studentService.getMembershipEndTime(periodEnum,nowDate,cloudTeacherOrder.getTime()));
-			} else {
-				cloudTeacherOrder.setStartTime(DateUtil.addDays(student.getMembershipEndTime(), 1));
-				cloudTeacherOrder.setEndTime(studentService.getMembershipEndTime(periodEnum,student.getMembershipEndTime(),cloudTeacherOrder.getTime()));
-			}
+//			if (student.getMemberRankSettingId() == null || nowDate.after(student.getMembershipEndTime())) {
+//				cloudTeacherOrder.setStartTime(nowDate);
+//				cloudTeacherOrder.setEndTime(studentService.getMembershipEndTime(periodEnum,nowDate,cloudTeacherOrder.getTime()));
+//			} else {
+//				cloudTeacherOrder.setStartTime(DateUtil.addDays(student.getMembershipEndTime(), 1));
+//				cloudTeacherOrder.setEndTime(studentService.getMembershipEndTime(periodEnum,student.getMembershipEndTime(),cloudTeacherOrder.getTime()));
+//			}
 
-			cloudTeacherOrderService.update(cloudTeacherOrder);
+//			cloudTeacherOrderService.update(cloudTeacherOrder);
 			// 添加会员有效时长
 //			studentService.updateMemberRank(cloudTeacherOrder);
 			//云教练活动赠送优惠券
-			cloudTeacherActiveGiveCoupon(cloudTeacherOrder);
+//			cloudTeacherActiveGiveCoupon(cloudTeacherOrder);
 //			// 插入交易明细
 			BigDecimal amount = studentPaymentOrder.getActualAmount();
 			if (amount.compareTo(BigDecimal.ZERO) > 0) {

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

@@ -3978,14 +3978,14 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 PeriodEnum periodEnum = activity.getPeriodEnum();
                 Integer cloudTime = activity.getMemberTime();
                 CloudTeacherOrder cloudTeacherOrder = new CloudTeacherOrder();
-                Date addDate = now;
-                if (student.getMemberRankSettingId() == null || now.after(student.getMembershipEndTime())) {
-                    cloudTeacherOrder.setStartTime(now);
-                } else {
-                    addDate = student.getMembershipEndTime();
-                    cloudTeacherOrder.setStartTime(DateUtil.addDays(addDate, 1));
-                }
-                cloudTeacherOrder.setEndTime(studentService.getMembershipEndTime(periodEnum, addDate, cloudTime));
+//                Date addDate = now;
+//                if (student.getMemberRankSettingId() == null || now.after(student.getMembershipEndTime())) {
+//                    cloudTeacherOrder.setStartTime(now);
+//                } else {
+//                    addDate = student.getMembershipEndTime();
+//                    cloudTeacherOrder.setStartTime(DateUtil.addDays(addDate, 1));
+//                }
+//                cloudTeacherOrder.setEndTime(studentService.getMembershipEndTime(periodEnum, addDate, cloudTime));
                 cloudTeacherOrder.setRemark("营销活动购买会员");
                 cloudTeacherOrder.setStatus(1);
                 cloudTeacherOrder.setOrderId(order.getId());
@@ -4019,14 +4019,14 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                     PeriodEnum periodEnum = activity.getGivePeriodEnum();
                     Integer cloudTime = activity.getGiveMemberTime();
                     CloudTeacherOrder cloudTeacherOrder = new CloudTeacherOrder();
-                    Date addDate = now;
-                    if (student.getMemberRankSettingId() == null || now.after(student.getMembershipEndTime())) {
-                        cloudTeacherOrder.setStartTime(now);
-                    } else {
-                        addDate = student.getMembershipEndTime();
-                        cloudTeacherOrder.setStartTime(DateUtil.addDays(addDate, 1));
-                    }
-                    cloudTeacherOrder.setEndTime(studentService.getMembershipEndTime(periodEnum, addDate, cloudTime));
+//                    Date addDate = now;
+//                    if (student.getMemberRankSettingId() == null || now.after(student.getMembershipEndTime())) {
+//                        cloudTeacherOrder.setStartTime(now);
+//                    } else {
+//                        addDate = student.getMembershipEndTime();
+//                        cloudTeacherOrder.setStartTime(DateUtil.addDays(addDate, 1));
+//                    }
+//                    cloudTeacherOrder.setEndTime(studentService.getMembershipEndTime(periodEnum, addDate, cloudTime));
                     cloudTeacherOrder.setRemark("营销活动赠送会员");
                     cloudTeacherOrder.setStatus(1);
                     cloudTeacherOrder.setOrderId(order.getId());
@@ -4216,14 +4216,14 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 if (order.getCreateTime().compareTo(startTime) >= 0 && order.getCreateTime().compareTo(endTime) <= 0) {
                     //赠送会员
                     CloudTeacherOrder cloudTeacherOrder = new CloudTeacherOrder();
-                    Date addDate = now;
-                    if (student.getMemberRankSettingId() == null || now.after(student.getMembershipEndTime())) {
-                        cloudTeacherOrder.setStartTime(now);
-                    } else {
-                        addDate = student.getMembershipEndTime();
-                        cloudTeacherOrder.setStartTime(DateUtil.addDays(addDate, 1));
-                    }
-                    cloudTeacherOrder.setEndTime(DateUtil.addDays(DateUtil.addMonths(addDate, 1), 1));
+//                    Date addDate = now;
+//                    if (student.getMemberRankSettingId() == null || now.after(student.getMembershipEndTime())) {
+//                        cloudTeacherOrder.setStartTime(now);
+//                    } else {
+//                        addDate = student.getMembershipEndTime();
+//                        cloudTeacherOrder.setStartTime(DateUtil.addDays(addDate, 1));
+//                    }
+//                    cloudTeacherOrder.setEndTime(DateUtil.addDays(DateUtil.addMonths(addDate, 1), 1));
                     cloudTeacherOrder.setRemark("双十一活动赠送会员");
                     cloudTeacherOrder.setStatus(1);
                     cloudTeacherOrder.setOrderId(order.getId());

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

@@ -747,15 +747,15 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
                 cloudTeacherOrder.setType(activity.getGivePeriodEnum());
                 cloudTeacherOrder.setOrganId(studentPaymentOrder.getOrganId());
 
-                Student student = studentService.get(studentPaymentOrder.getUserId());
-                Date startDate = now;
-                if (student.getMemberRankSettingId() == null || now.after(student.getMembershipEndTime())) {
-                    cloudTeacherOrder.setStartTime(now);
-                } else {
-                    cloudTeacherOrder.setStartTime(DateUtil.addDays(student.getMembershipEndTime(), 1));
-                    startDate = student.getMembershipEndTime();
-                }
-                cloudTeacherOrder.setEndTime(studentService.getMembershipEndTime(activity.getGivePeriodEnum(), startDate, activity.getGiveMemberTime()));
+//                Student student = studentService.get(studentPaymentOrder.getUserId());
+//                Date startDate = now;
+//                if (student.getMemberRankSettingId() == null || now.after(student.getMembershipEndTime())) {
+//                    cloudTeacherOrder.setStartTime(now);
+//                } else {
+//                    cloudTeacherOrder.setStartTime(DateUtil.addDays(student.getMembershipEndTime(), 1));
+//                    startDate = student.getMembershipEndTime();
+//                }
+//                cloudTeacherOrder.setEndTime(studentService.getMembershipEndTime(activity.getGivePeriodEnum(), startDate, activity.getGiveMemberTime()));
                 cloudTeacherOrder.setTime(activity.getGiveMemberTime());
                 cloudTeacherOrderService.insert(cloudTeacherOrder);
                 // 添加会员有效时长

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

@@ -1008,6 +1008,7 @@
         <result column="current_grade_" property="currentGrade"/>
         <result column="current_class_" property="currentClass"/>
         <result column="certificate_type_" property="certificateType"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <select id="getUser" resultMap="SysUser">