Merge remote-tracking branch 'origin/master'

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

@@ -1,9 +0,0 @@
-package com.ym.mec.biz.dal.dao;
-
-import com.ym.mec.biz.dal.entity.TenantEntryActivites;
-import com.ym.mec.common.dal.BaseDAO;
-
-public interface TenantEntryActivitesDao extends BaseDAO<Integer, TenantEntryActivites> {
-
-	
-}

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

@@ -0,0 +1,9 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.TenantEntryActivities;
+import com.ym.mec.common.dal.BaseDAO;
+
+public interface TenantEntryActivitiesDao extends BaseDAO<Integer, TenantEntryActivities> {
+
+	
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/TenantEntryActivites.java → mec-biz/src/main/java/com/ym/mec/biz/dal/entity/TenantEntryActivities.java

@@ -5,7 +5,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 /**
  * 对应数据库表(tenant_entry_activites):
  */
-public class TenantEntryActivites {
+public class TenantEntryActivities {
 
 	/**  */
 	private Integer id;
@@ -25,6 +25,8 @@ public class TenantEntryActivites {
 	/**  */
 	private java.math.BigDecimal discountPrice;
 	
+	private Integer purchaseMinutes;
+	
 	/**  */
 	private Integer giveMinutes;
 	
@@ -38,7 +40,7 @@ public class TenantEntryActivites {
 	private String condition;
 	
 	/**  */
-	private boolean delFlag;
+	private Boolean delFlag;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -94,6 +96,14 @@ public class TenantEntryActivites {
 		return this.discountPrice;
 	}
 			
+	public Integer getPurchaseMinutes() {
+		return purchaseMinutes;
+	}
+
+	public void setPurchaseMinutes(Integer purchaseMinutes) {
+		this.purchaseMinutes = purchaseMinutes;
+	}
+
 	public void setGiveMinutes(Integer giveMinutes){
 		this.giveMinutes = giveMinutes;
 	}
@@ -126,11 +136,11 @@ public class TenantEntryActivites {
 		return this.condition;
 	}
 			
-	public void setDelFlag(boolean delFlag){
+	public void setDelFlag(Boolean delFlag){
 		this.delFlag = delFlag;
 	}
 	
-	public boolean isDelFlag(){
+	public Boolean getDelFlag(){
 		return this.delFlag;
 	}
 			

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

@@ -1,14 +0,0 @@
-package com.ym.mec.biz.service;
-
-import com.ym.mec.biz.dal.entity.TenantEntryActivites;
-import com.ym.mec.common.service.BaseService;
-
-public interface TenantEntryActivitesService extends BaseService<Integer, TenantEntryActivites> {
-
-	/**
-	 * 合并对象
-	 * @param tenantEntryActivites
-	 * @return
-	 */
-	public boolean merge(TenantEntryActivites tenantEntryActivites);
-}

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

@@ -0,0 +1,22 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.TenantEntryActivities;
+import com.ym.mec.common.service.BaseService;
+
+public interface TenantEntryActivitiesService extends BaseService<Integer, TenantEntryActivities> {
+
+	/**
+	 * 合并对象
+	 * @param tenantEntryActivites
+	 * @return
+	 */
+	public boolean merge(TenantEntryActivities tenantEntryActivites);
+
+	/**
+	 * 入驻
+	 * @param userId 用户编号
+	 * @param activitiesId 活动编号
+	 * @return
+	 */
+	public boolean enter(Integer userId, Integer activitiesId);
+}

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

@@ -75,6 +75,8 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
     private CourseScheduleStudentPaymentDao courseScheduleStudentPaymentDao;
     @Autowired
     private SysTenantAccountService sysTenantAccountService;
+    @Autowired
+    private StudentDao studentDao;
 
     private static final Logger LOGGER = LoggerFactory
             .getLogger(PracticeGroupService.class);
@@ -108,6 +110,8 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
             throw new BizException("请填写课程数量");
         }
 
+        studentDao.lockUser(courseGroup.getTeacherId());
+
         //总课程时长
         Integer totalCourseTime=courseCycleInfo.getCourseCount()*courseCycleInfo.getSingleClassMinutes();
         SysTenantAccount sysTenantAccount = sysTenantAccountService.get(courseGroup.getTeacherId());
@@ -306,18 +310,27 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
         if(Objects.isNull(courseGroupId)){
             throw new BizException("请指定课程组");
         }
-        List<ClassGroupStudentMapper> groupStudents = classGroupStudentMapperDao.findGroupStudents(courseGroupId.toString(), GroupType.COMM, userId, null);
-        if(!CollectionUtils.isEmpty(groupStudents)){
-            throw new BizException("您已购买过此课程组");
-        }
+
+        studentDao.lockUser(userId);
+
         CoursesGroup coursesGroup = coursesGroupDao.get(courseGroupId);
         if(Objects.isNull(coursesGroup)){
             throw new BizException("此课程组不存在");
         }
+        if(coursesGroup.getStatus().equals(GroupStatusEnum.CANCEL)){
+            throw new BizException("此课程组已关闭");
+        }
+        List<ClassGroupStudentMapper> groupStudents = classGroupStudentMapperDao.findGroupStudents(courseGroupId.toString(), GroupType.COMM, userId, null);
+        if(!CollectionUtils.isEmpty(groupStudents)){
+            throw new BizException("您已购买过此课程组");
+        }
 
         Date now=new Date();
 
         ClassGroup classGroup = classGroupDao.findByMusicGroupAndType(courseGroupId.toString(), GroupType.COMM.getCode());
+        if(classGroup.getStudentNum()>=classGroup.getExpectStudentNum()){
+            throw new BizException("此课程组人数已达上限");
+        }
 
         BigDecimal amount = coursesGroup.getTotalCoursesPrice();
         if(Objects.isNull(amount)){
@@ -516,7 +529,11 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
         classGroupStudentMapperDao.insert(classGroupStudentMapper);
 
         List<ClassGroupStudentMapper> classGroupStudents = classGroupStudentMapperDao.findByClassGroup(classGroup.getId());
-        if(!CollectionUtils.isEmpty(classGroupStudents)&&classGroupStudents.size()==classGroup.getExpectStudentNum()){
+        if(!CollectionUtils.isEmpty(classGroupStudents)){
+            classGroup.setStudentNum(classGroupStudents.size());
+            classGroupDao.update(classGroup);
+        }
+        if(!CollectionUtils.isEmpty(classGroupStudents)&&classGroupStudents.size()>=classGroup.getExpectStudentNum()){
             coursesGroup.setStatus(GroupStatusEnum.NORMAL);
             coursesGroupDao.update(coursesGroup);
         }

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

@@ -1677,7 +1677,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 //        }
 
         List<String> musicGroupIds = studentRegistrationDao.queryStudentMusicGroup(practiceGroup.getStudentId());
-        if(!CollectionUtils.isEmpty(musicGroupIds)){
+        if(!CollectionUtils.isEmpty(musicGroupIds)&&musicGroupIds.size()<=1){
             MusicGroup musicGroup = musicGroupDao.get(musicGroupIds.get(0));
             if(Objects.nonNull(musicGroup)){
                 practiceGroup.setEducationalTeacherId(musicGroup.getEducationalTeacherId());
@@ -2048,6 +2048,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         }
 
         List<ImGroupMember> imGroupMemberList = new ArrayList<>();
+        if(Objects.nonNull(practiceGroup.getEducationalTeacherId())){
+            imGroupMemberList.add(new ImGroupMember(practiceGroup.getEducationalTeacherId().toString()));
+        }
         imGroupMemberList.add(new ImGroupMember(practiceGroup.getUserId().toString()));
         imGroupMemberList.add(new ImGroupMember(practiceGroup.getStudentId().toString()));
         ImGroupMember[] imGroupMembers = imGroupMemberList.toArray(new ImGroupMember[imGroupMemberList.size()]);
@@ -2712,7 +2715,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
         if(Objects.isNull(practiceGroupBuyParams.getEducationalTeacherId())){
             List<String> musicGroupIds = studentRegistrationDao.queryStudentMusicGroup(practiceGroupBuyParams.getStudentId());
-            if(!CollectionUtils.isEmpty(musicGroupIds)){
+            if(!CollectionUtils.isEmpty(musicGroupIds)&&musicGroupIds.size()<=1){
                 MusicGroup musicGroup = musicGroupDao.get(musicGroupIds.get(0));
                 if(Objects.nonNull(musicGroup)){
                     practiceGroupBuyParams.setEducationalTeacherId(musicGroup.getEducationalTeacherId());
@@ -3175,6 +3178,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         }
 
         List<ImGroupMember> imGroupMemberList = new ArrayList<>();
+        if(Objects.nonNull(practiceGroup.getEducationalTeacherId())){
+            imGroupMemberList.add(new ImGroupMember(practiceGroup.getEducationalTeacherId().toString()));
+        }
         imGroupMemberList.add(new ImGroupMember(practiceGroup.getUserId().toString()));
         imGroupMemberList.add(new ImGroupMember(practiceGroup.getStudentId().toString()));
         ImGroupMember[] imGroupMembers = imGroupMemberList.toArray(new ImGroupMember[imGroupMemberList.size()]);

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

@@ -1,51 +0,0 @@
-package com.ym.mec.biz.service.impl;
-
-import java.util.Date;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.ym.mec.biz.dal.dao.TenantEntryActivitesDao;
-import com.ym.mec.biz.dal.entity.TenantEntryActivites;
-import com.ym.mec.biz.service.TenantEntryActivitesService;
-import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.common.exception.BizException;
-import com.ym.mec.common.service.impl.BaseServiceImpl;
-
-@Service
-public class TenantEntryActivitesServiceImpl extends BaseServiceImpl<Integer, TenantEntryActivites> implements TenantEntryActivitesService {
-
-	@Autowired
-	private TenantEntryActivitesDao tenantEntryActivitesDao;
-
-	@Override
-	public BaseDAO<Integer, TenantEntryActivites> getDAO() {
-		return tenantEntryActivitesDao;
-	}
-
-	@Override
-	public boolean merge(TenantEntryActivites tenantEntryActivites) {
-
-		if (!tenantEntryActivites.getStartDate().before(tenantEntryActivites.getEndDate())) {
-			throw new BizException("活动开始时间必须在结束时间之前");
-		}
-
-		Date date = new Date();
-		if (tenantEntryActivites.getId() != null) {
-			TenantEntryActivites orginTenantEntryActivites = tenantEntryActivitesDao.get(tenantEntryActivites.getId());
-
-			if (orginTenantEntryActivites == null) {
-				throw new BizException("操作失败，请检查输入参数");
-			}
-			tenantEntryActivites.setCreateTime(orginTenantEntryActivites.getCreateTime());
-			tenantEntryActivites.setUpdateTime(date);
-			tenantEntryActivitesDao.update(tenantEntryActivites);
-		} else {
-			tenantEntryActivites.setCreateTime(date);
-			tenantEntryActivites.setUpdateTime(date);
-			tenantEntryActivitesDao.insert(tenantEntryActivites);
-		}
-		return true;
-	}
-
-}

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

@@ -0,0 +1,72 @@
+package com.ym.mec.biz.service.impl;
+
+import java.util.Date;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.ym.mec.biz.dal.dao.TenantEntryActivitiesDao;
+import com.ym.mec.biz.dal.entity.TenantEntryActivities;
+import com.ym.mec.biz.service.TenantEntryActivitiesService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+
+@Service
+public class TenantEntryActivitiesServiceImpl extends BaseServiceImpl<Integer, TenantEntryActivities> implements TenantEntryActivitiesService {
+
+	@Autowired
+	private TenantEntryActivitiesDao tenantEntryActivitiesDao;
+
+	@Override
+	public BaseDAO<Integer, TenantEntryActivities> getDAO() {
+		return tenantEntryActivitiesDao;
+	}
+
+	@Override
+	public boolean merge(TenantEntryActivities tenantEntryActivites) {
+
+		if (!tenantEntryActivites.getStartDate().before(tenantEntryActivites.getEndDate())) {
+			throw new BizException("活动开始时间必须在结束时间之前");
+		}
+
+		Date date = new Date();
+		if (tenantEntryActivites.getId() != null) {
+			TenantEntryActivities orginTenantEntryActivites = tenantEntryActivitiesDao.get(tenantEntryActivites.getId());
+
+			if (orginTenantEntryActivites == null) {
+				throw new BizException("操作失败，请检查输入参数");
+			}
+			tenantEntryActivites.setCreateTime(orginTenantEntryActivites.getCreateTime());
+			tenantEntryActivites.setUpdateTime(date);
+			tenantEntryActivitiesDao.update(tenantEntryActivites);
+		} else {
+			tenantEntryActivites.setCreateTime(date);
+			tenantEntryActivites.setUpdateTime(date);
+			tenantEntryActivitiesDao.insert(tenantEntryActivites);
+		}
+		return true;
+	}
+
+	@Override
+	@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+	public boolean enter(Integer userId, Integer activitiesId) {
+		TenantEntryActivities tenantEntryActivities = tenantEntryActivitiesDao.get(activitiesId);
+		if (tenantEntryActivities == null) {
+			throw new BizException("活动不存在");
+		}
+
+		Date date = new Date();
+		// 判断活动是否有效
+		if (tenantEntryActivities.getDelFlag() == true || date.before(tenantEntryActivities.getStartDate()) || date.after(tenantEntryActivities.getEndDate())) {
+			throw new BizException("活动已结束或未开始");
+		}
+		
+		//是否满足条件
+
+		return true;
+	}
+
+}

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

@@ -1076,6 +1076,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		List<ClassGroupStudentMapper> classGroupStudents = classGroupStudentMapperDao.findByClassGroup(classGroup.getId());
 
 		List<ImGroupMember> imGroupMemberList = new ArrayList<>();
+		imGroupMemberList.add(new ImGroupMember(vipGroupApplyBaseInfoDto.getEducationalTeacherId().toString()));
 		imGroupMemberList.add(new ImGroupMember(vipGroupApplyBaseInfoDto.getUserId().toString()));
 		//生成学生单课缴费信息
 		for (ClassGroupStudentMapper classGroupStudent : classGroupStudents) {
@@ -2242,6 +2243,18 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			courseScheduleDao.updateCourseSchoolByGroup(oldVipGroupInfo.getId().toString(), GroupType.VIP.getCode(), oldVipGroupInfo.getTeacherSchoolId());
 			isChange=true;
 		}
+		if(Objects.nonNull(vipGroupApplyBaseInfo.getEducationalTeacherId())&&!vipGroupApplyBaseInfo.getEducationalTeacherId().equals(oldVipGroupInfo.getEducationalTeacherId())){
+			ClassGroup classGroup = classGroupDao.findByMusicGroupAndType(oldVipGroupInfo.getId().toString(), GroupType.VIP.getCode());
+			if(Objects.nonNull(oldVipGroupInfo.getEducationalTeacherId())){
+				ImGroupMember[] imGroupMembers = new ImGroupMember[]{new ImGroupMember(oldVipGroupInfo.getEducationalTeacherId().toString())};
+				imFeignService.groupQuit(new ImGroupModel(classGroup.getId().toString(), imGroupMembers, classGroup.getName()));
+			}
+
+			oldVipGroupInfo.setEducationalTeacherId(vipGroupApplyBaseInfo.getEducationalTeacherId());
+			isChange=true;
+			ImGroupMember[] newImGroupMemberList = new ImGroupMember[]{new ImGroupMember(oldVipGroupInfo.getEducationalTeacherId().toString())};
+			imFeignService.groupJoin(new ImGroupModel(classGroup.getId().toString(), newImGroupMemberList,classGroup.getName()));
+		}
 		//更新vip课
 		if(isChange){
 			oldVipGroupInfo.setUpdateTime(now);

mec-biz/src/main/resources/config/mybatis/TenantEntryActivitesMapper.xml → mec-biz/src/main/resources/config/mybatis/TenantEntryActivitiesMapper.xml

@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!-- 这个文件是自动生成的。 不要修改此文件。所有改动将在下次重新自动生成时丢失。 -->
-<mapper namespace="com.ym.mec.biz.dal.dao.TenantEntryActivitesDao">
+<mapper namespace="com.ym.mec.biz.dal.dao.TenantEntryActivitiesDao">
 
-	<resultMap type="com.ym.mec.biz.dal.entity.TenantEntryActivites"
-		id="TenantEntryActivites">
+	<resultMap type="com.ym.mec.biz.dal.entity.TenantEntryActivities"
+		id="TenantEntryActivities">
 		<result column="id_" property="id" />
 		<result column="name_" property="name" />
 		<result column="cover_img_" property="coverImg" />
 		<result column="detail_" property="detail" />
 		<result column="total_price_" property="totalPrice" />
 		<result column="discount_price_" property="discountPrice" />
+		<result column="purchase_minutes_" property="purchaseMinutes" />
 		<result column="give_minutes_" property="giveMinutes" />
 		<result column="start_date_" property="startDate" />
 		<result column="end_date_" property="endDate" />
@@ -32,29 +33,29 @@
 	</sql>
 
 	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="TenantEntryActivites">
-		SELECT * FROM tenant_entry_activites WHERE id_ = #{id}
+	<select id="get" resultMap="TenantEntryActivities">
+		SELECT * FROM tenant_entry_activities WHERE id_ = #{id}
 	</select>
 
 	<!-- 全查询 -->
-	<select id="findAll" resultMap="TenantEntryActivites">
+	<select id="findAll" resultMap="TenantEntryActivities">
 		SELECT * FROM
-		tenant_entry_activites ORDER BY id_
+		tenant_entry_activities ORDER BY id_
 	</select>
 
 	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.TenantEntryActivites"
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.TenantEntryActivities"
 		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
-		INSERT INTO tenant_entry_activites
-		(id_,name_,cover_img_,detail_,total_price_,discount_price_,give_minutes_,start_date_,end_date_,condition_,del_flag_,create_time_,update_time_)
-		VALUES(#{id},#{name},#{coverImg},#{detail},#{totalPrice},#{discountPrice},#{giveMinutes},#{startDate},#{endDate},#{condition},#{delFlag},#{createTime},#{updateTime})
+		INSERT INTO tenant_entry_activities
+		(id_,name_,cover_img_,detail_,total_price_,discount_price_,purchase_minutes_,give_minutes_,start_date_,end_date_,condition_,del_flag_,create_time_,update_time_)
+		VALUES(#{id},#{name},#{coverImg},#{detail},#{totalPrice},#{discountPrice},#{purchaseMinutes},#{giveMinutes},#{startDate},#{endDate},#{condition},#{delFlag},#{createTime},#{updateTime})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.biz.dal.entity.TenantEntryActivites">
-		UPDATE tenant_entry_activites
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.TenantEntryActivities">
+		UPDATE tenant_entry_activities
 		<set>
 			<if test="condition != null">
 				condition_ = #{condition},
@@ -71,6 +72,9 @@
 			<if test="id != null">
 				id_ = #{id},
 			</if>
+			<if test="purchaseMinutes != null">
+				purchase_minutes_ = #{purchaseMinutes},
+			</if>
 			<if test="giveMinutes != null">
 				give_minutes_ = #{giveMinutes},
 			</if>
@@ -101,13 +105,13 @@
 
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete">
-		DELETE FROM tenant_entry_activites WHERE id_ = #{id}
+		DELETE FROM tenant_entry_activities WHERE id_ = #{id}
 	</delete>
 
 	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="TenantEntryActivites"
+	<select id="queryPage" resultMap="TenantEntryActivities"
 		parameterType="map">
-		SELECT * FROM tenant_entry_activites
+		SELECT * FROM tenant_entry_activities
 		<include refid="queryCondition" />
 		order by id_ desc
 		<include refid="global.limit" />
@@ -115,7 +119,7 @@
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM tenant_entry_activites
+		SELECT COUNT(*) FROM tenant_entry_activities
 		<include refid="queryCondition" />
 		order by id_ desc
 	</select>

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TenantEntryActivitesController.java → mec-teacher/src/main/java/com/ym/mec/teacher/controller/TenantEntryActivitiesController.java

@@ -11,23 +11,23 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.ym.mec.biz.dal.page.TenantEntryActivitesQueryInfo;
-import com.ym.mec.biz.service.TenantEntryActivitesService;
+import com.ym.mec.biz.service.TenantEntryActivitiesService;
 import com.ym.mec.common.controller.BaseController;
 
-@RequestMapping("tenantEntryActivites")
+@RequestMapping("tenantEntryActivities")
 @Api(tags = "租客入驻活动")
 @RestController
-public class TenantEntryActivitesController extends BaseController {
+public class TenantEntryActivitiesController extends BaseController {
 
     @Autowired
-    private TenantEntryActivitesService tenantEntryActivitesService;
+    private TenantEntryActivitiesService tenantEntryActivitiesService;
 
     @ApiOperation(value = "分页查询活动列表")
     @GetMapping("/queryPage")
     public Object queryPage(TenantEntryActivitesQueryInfo queryInfo) {
     	queryInfo.setDelFlag(false);
     	queryInfo.setStartDate(new Date());
-        return succeed(tenantEntryActivitesService.queryPage(queryInfo));
+        return succeed(tenantEntryActivitiesService.queryPage(queryInfo));
     }
 
 }

mec-web/src/main/java/com/ym/mec/web/controller/TenantEntryActivitesController.java → mec-web/src/main/java/com/ym/mec/web/controller/TenantEntryActivitiesController.java

@@ -11,38 +11,38 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ym.mec.biz.dal.entity.TenantEntryActivites;
-import com.ym.mec.biz.service.TenantEntryActivitesService;
+import com.ym.mec.biz.dal.entity.TenantEntryActivities;
+import com.ym.mec.biz.service.TenantEntryActivitiesService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.page.QueryInfo;
 
-@RequestMapping("tenantEntryActivites")
+@RequestMapping("tenantEntryActivities")
 @Api(tags = "租客入驻活动")
 @RestController
-public class TenantEntryActivitesController extends BaseController {
+public class TenantEntryActivitiesController extends BaseController {
 
 	@Autowired
-	private TenantEntryActivitesService tenantEntryActivitesService;
+	private TenantEntryActivitiesService tenantEntryActivitiesService;
 
 	@ApiOperation(value = "分页查询活动列表")
 	@GetMapping("/queryPage")
-	@PreAuthorize("@pcs.hasPermissions('tenantEntryActivites/queryPage')")
+	@PreAuthorize("@pcs.hasPermissions('tenantEntryActivities/queryPage')")
 	public Object queryPage(QueryInfo queryInfo) {
-		return succeed(tenantEntryActivitesService.queryPage(queryInfo));
+		return succeed(tenantEntryActivitiesService.queryPage(queryInfo));
 	}
 
 	@ApiOperation(value = "查询活动信息")
 	@GetMapping("/query")
-	@PreAuthorize("@pcs.hasPermissions('tenantEntryActivites/query')")
+	@PreAuthorize("@pcs.hasPermissions('tenantEntryActivities/query')")
 	public Object query(Integer id) {
-		return succeed(tenantEntryActivitesService.get(id));
+		return succeed(tenantEntryActivitiesService.get(id));
 	}
 
 	@ApiOperation(value = "新增、修改活动")
 	@PostMapping("/merge")
-	@PreAuthorize("@pcs.hasPermissions('tenantEntryActivites/merge')")
-	public Object merge(@RequestBody TenantEntryActivites tenantEntryActivites) {
-		tenantEntryActivitesService.merge(tenantEntryActivites);
+	@PreAuthorize("@pcs.hasPermissions('tenantEntryActivities/merge')")
+	public Object merge(@RequestBody TenantEntryActivities tenantEntryActivites) {
+		tenantEntryActivitiesService.merge(tenantEntryActivites);
 		return succeed();
 	}