Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/config/ResourceServerConfig.java

@@ -26,7 +26,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
 	@Override
 	public void configure(HttpSecurity http) throws Exception {
 		http.csrf().disable().exceptionHandling().accessDeniedHandler(baseAccessDeniedHandler).authenticationEntryPoint(baseAuthenticationEntryPoint).and()
-				.authorizeRequests().antMatchers("/task/**","/user/updatePassword").hasIpAddress("0.0.0.0/0").anyRequest().authenticated().and().httpBasic();
+				.authorizeRequests().antMatchers("/task/**","/user/updatePassword","/user/noAuth/queryUserByPhone").hasIpAddress("0.0.0.0/0").anyRequest().authenticated().and().httpBasic();
 	}
 
 	@Override

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/filter/PhoneLoginAuthenticationFilter.java

@@ -4,6 +4,7 @@ import com.ym.mec.auth.api.dto.SysUserInfo;
 import com.ym.mec.auth.config.token.PhoneAuthenticationToken;
 import com.ym.mec.auth.service.SysUserService;
 import com.ym.mec.common.security.SecurityConstants;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.authentication.AbstractAuthenticationToken;
 import org.springframework.security.authentication.AuthenticationServiceException;
 import org.springframework.security.authentication.LockedException;
@@ -54,6 +55,8 @@ public class PhoneLoginAuthenticationFilter extends AbstractAuthenticationProces
 		String clientId = request.getParameter(clientIdParameter).toUpperCase();
 		if (userInfo == null) {
 			userInfo = sysUserService.initUser(principal,clientId,isRegister,isLessee);
+		}else if(StringUtils.isNotEmpty(isLessee)){
+			throw new LockedException("用户已存在");
 		}
 		if("EDUCATION".equals(clientId)){
 			clientId = "SYSTEM";

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -11,6 +11,7 @@ import com.ym.mec.common.security.AuthUser;
 import com.ym.mec.common.security.SecurityConstants;
 import com.ym.mec.common.security.SecurityUtils;
 import com.ym.mec.common.service.IdGeneratorService;
+import com.ym.mec.util.date.DateUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -73,6 +74,15 @@ public class UserController extends BaseController {
 		return sysUserService.queryByPhone(mobile);
 	}
 
+	@GetMapping(value = "/noAuth/queryUserByPhone")
+	public Object noAuthQueryUserByPhone(String mobile) {
+		SysUser sysUser = sysUserService.queryByPhone(mobile);
+		if(sysUser == null){
+			return succeed(0);
+		}
+		return succeed(1);
+	}
+
 	@GetMapping(value = "/queryUserById/{userId}")
 	public SysUser queryUserById(@PathVariable("userId") Integer userId) {
 		return sysUserService.get(userId);
@@ -203,6 +213,9 @@ public class UserController extends BaseController {
 			Date date = new Date();
 			sysUser.setId(user.getUserId());
 			sysUser.setUpdateTime(date);
+			if(sysUser.getBirthdate() != null && DateUtil.daysBetween(sysUser.getBirthdate(),date) <= 0){
+				throw new BizException("出生日期不可超过当前时间");
+			}
 			sysUserService.updateBaseInfo(sysUser);
 			return succeed();
 		}

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TenantPaymentOrderDao.java

@@ -18,6 +18,14 @@ public interface TenantPaymentOrderDao extends BaseDAO<Long, TenantPaymentOrder>
 	List<TenantPaymentOrder> queryByUserId(Integer userId);
 
 	/**
+	 * 查询用户所有订单
+	 * @param userId
+	 * @param activitiesId
+	 * @return
+	 */
+	List<TenantPaymentOrder> queryByUserIdAndActivitiesId(@Param("userId") Integer userId, @Param("activitiesId") Integer activitiesId);
+
+	/**
 	 * 根据订单号查询订单
 	 *
 	 * @param orderNo

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

@@ -3276,7 +3276,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         List<CourseSchedule> updateList = new ArrayList<CourseSchedule>();
 
         for (CourseSchedule courseSchedule : list) {
-            courseSchedule.setStatus(CourseStatusEnum.OVER);
+            courseSchedule.setStatus(CourseStatusEnum.UNDERWAY);
             courseSchedule.setUpdateTime(date);
             updateList.add(courseSchedule);
         }

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

@@ -356,7 +356,7 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
         result.put("teacherName", teacher.getRealName());
         result.put("avatar",teacher.getAvatar());
         result.put("introduction", teacher.getIntroduction());
-        result.put("lectureNum", teacher.getLectureNum());
+        result.put("lectureNum", courseScheduleTeacherSalaryDao.countTeacherGiveLesson(coursesGroup.getTeacherId()));
         result.put("subjectNames", StringUtils.join(subjectNames,","));
         List<CourseSchedule> groupNotStartCourses = courseScheduleDao.findGroupNotStartCourses(groupId.toString(), GroupType.COMM);
         result.put("courseSchedules",groupNotStartCourses);

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;
@@ -107,13 +107,13 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 		}
 
 		// 查询用户订单
-		List<TenantPaymentOrder> orderList = tenantPaymentOrderDao.queryByUserId(userId);
+		List<TenantPaymentOrder> orderList = tenantPaymentOrderDao.queryByUserIdAndActivitiesId(userId, activitiesId);
 		if (orderList != null && orderList.size() > 0) {
 			for (TenantPaymentOrder po : orderList) {
 				// 是否满足条件
 				if (tenantEntryActivities.getSuitableUser() == SuitableUser.NEW) {
 					if (po.getStatus() == DealStatusEnum.ING) {
-						throw new BizException("您参加的首充活动正在处理中，预计于{}分钟后处理完毕，请稍后。",30 - DateUtil.minutesBetween(po.getCreateTime(), date));
+						throw new BizException("您参加的首充活动正在处理中，预计于{}分钟后处理完毕，请稍后。", 30 - DateUtil.minutesBetween(po.getCreateTime(), date));
 					}
 					if (po.getStatus() == DealStatusEnum.SUCCESS) {
 						throw new BizException("首充优惠活动每个用户限参与一次。");

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

@@ -151,6 +151,10 @@
 	<select id="queryByUserId" resultMap="TenantPaymentOrder">
 		SELECT * FROM tenant_payment_order where user_id_ = #{userId} ORDER BY id_
 	</select>
+	
+	<select id="queryByUserIdAndActivitiesId" resultMap="TenantPaymentOrder" parameterType="map">
+		SELECT * FROM tenant_payment_order where user_id_ = #{userId} and activities_id_ = #{activitiesId} ORDER BY id_
+	</select>
 
     <!-- 根据订单号查询订单 -->
     <select id="findOrderByOrderNo" resultMap="TenantPaymentOrder">