Merge remote-tracking branch 'origin/master'

cms/src/main/java/com/ym/mec/cms/controller/NewsController.java

@@ -24,6 +24,10 @@ public class NewsController extends BaseController {
 	@ApiOperation("资讯列表分页查询")
 	@GetMapping(value = "/list")
 	public Object getList(NewsInformationQueryInfo queryInfo) {
+		if(queryInfo.getTenantId() == null){
+			queryInfo.setTenantId(1);
+		}
+		
 		return succeed(sysNewsInformationService.queryPage(queryInfo));
 	}
 

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

@@ -140,53 +140,33 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 		if("register".equals(isRegister)){
 			throw new UsernameNotFoundException("404.9");
 		}
-		if(StringUtils.isNotEmpty(isLessee) && StringUtils.equalsIgnoreCase(clientId,"TEACHER")){
-			SysUser sysUser = new SysUser();
-			sysUser.setPhone(phone);
-			sysUser.setRealName("老师" + phone.substring(phone.length() - 6));
-			sysUser.setUserType("TEACHER");
-			sysUserDao.insert(sysUser);
-			//添加用户现金账户
-			imFeignService.register(new ImUserModel(sysUser.getId().toString(),phone,null));
-			userFeignService.createCashAccount(sysUser.getId());
-			//sysTenantAccount
-			sysUserDao.insertSysTenantAccount(sysUser.getId());
-			//创建teacher表
-			sysUserDao.insertTeacher(sysUser.getId(),lesseeOrganId);
-			return queryUserInfoByPhone(phone);
-		}else if(StringUtils.isNotEmpty(isLessee) && StringUtils.equalsIgnoreCase(clientId,"STUDENT")){
-			SysUser sysUser = new SysUser();
-			sysUser.setPhone(phone);
-			sysUser.setUsername("学生" + phone.substring(phone.length() - 6));
-			sysUser.setUserType("STUDENT");
-			sysUser.setOrganId(lesseeOrganId);
-			sysUserDao.insert(sysUser);
-			//添加用户现金账户
-			imFeignService.register(new ImUserModel(sysUser.getId().toString(),phone,null));
-			userFeignService.createCashAccount(sysUser.getId());
-			return queryUserInfoByPhone(phone);
-		}
-		if(autoRegister){
-			if(StringUtils.equalsIgnoreCase(clientId,"STUDENT")){
+		if(StringUtils.isNotEmpty(isLessee) || autoRegister){
+			if(StringUtils.isNotEmpty(isLessee) && StringUtils.equalsIgnoreCase(clientId,"TEACHER")){
+				SysUser sysUser = new SysUser();
+				sysUser.setPhone(phone);
+				sysUser.setRealName("老师" + phone.substring(phone.length() - 6));
+				sysUser.setUserType("TEACHER");
+				sysUserDao.insert(sysUser);
+				//添加用户现金账户
+				imFeignService.register(new ImUserModel(sysUser.getId().toString(),phone,null));
+				userFeignService.createCashAccount(sysUser.getId());
+				//sysTenantAccount
+				sysUserDao.insertSysTenantAccount(sysUser.getId());
+				//创建teacher表
+				sysUserDao.insertTeacher(sysUser.getId(),lesseeOrganId);
+				return queryUserInfoByPhone(phone);
+			}else if(StringUtils.isNotEmpty(isLessee) && StringUtils.equalsIgnoreCase(clientId,"STUDENT")){
 				SysUser sysUser = new SysUser();
 				sysUser.setPhone(phone);
+				sysUser.setUsername("学生" + phone.substring(phone.length() - 6));
 				sysUser.setUserType("STUDENT");
-				sysUser.setOrganId(36);
+				sysUser.setOrganId(lesseeOrganId);
 				sysUserDao.insert(sysUser);
 				//添加用户现金账户
 				imFeignService.register(new ImUserModel(sysUser.getId().toString(),phone,null));
 				userFeignService.createCashAccount(sysUser.getId());
 				return queryUserInfoByPhone(phone);
 			}
-		}else if(StringUtils.equalsIgnoreCase(clientId,"STUDENT")){
-			SysUser sysUser = new SysUser();
-			sysUser.setPhone(phone);
-			sysUser.setUserType("STUDENT");
-			sysUserDao.insert(sysUser);
-            //添加用户现金账户
-			imFeignService.register(new ImUserModel(sysUser.getId().toString(),phone,null));
-			userFeignService.createCashAccount(sysUser.getId());
-			return queryUserInfoByPhone(phone);
 		}
 		throw new UsernameNotFoundException("404.9");
 	}

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

@@ -72,7 +72,7 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 
 	@Autowired
 	private YqPayFeignService yqPayFeignService;
-
+	
 	@Override
 	public BaseDAO<Long, TenantPaymentOrder> getDAO() {
 		return tenantPaymentOrderDao;
@@ -106,7 +106,6 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 			throw new BizException("活动已结束");
 		}
 
-		int purchaseTimes = 0; // 购买次数
 		// 查询用户订单
 		List<TenantPaymentOrder> orderList = tenantPaymentOrderDao.queryByUserId(userId);
 		if (orderList != null && orderList.size() > 0) {
@@ -114,10 +113,10 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 				// 是否满足条件
 				if (tenantEntryActivities.getSuitableUser() == SuitableUser.NEW) {
 					if (po.getStatus() == DealStatusEnum.ING) {
-						throw new BizException("您存在'处理中' 的订单，请稍后重试（最多需等待30分钟）");
+						throw new BizException("您参加的首充活动正在处理中，预计于{}分钟后处理完毕，请稍后。",30 - DateUtil.minutesBetween(po.getCreateTime(), date));
 					}
 					if (po.getStatus() == DealStatusEnum.SUCCESS) {
-						throw new BizException("您已参与过当前活动，每人只能参与一次");
+						throw new BizException("首充优惠活动每个用户限参与一次。");
 					}
 				}
 			}

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

@@ -235,6 +235,11 @@ public class TeacherCourseScheduleController extends BaseController {
 			throw new BizException("调整失败，未开始的课程才能调整");
 		}
 		
+		endDateStr = DateUtil.format(courseSchedule.getClassDate(), "yyyy-MM-dd") + " " + DateUtil.format(courseSchedule.getStartClassTime(), "HH:mm:ss");
+		if (DateUtil.stringToDate(endDateStr, sdf).before(date)) {
+			throw new BizException("调整失败，只能调整到未来的时间");
+		}
+		
         if(Objects.isNull(courseSchedule.getClassGroupId())){
             courseSchedule.setClassGroupId(oldCourseSchedule.getClassGroupId());
         }