update

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

@@ -37,4 +37,11 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
      */
     List<CourseScheduleTeacherSalary> findSomeDayAgoTeacherCourseSalaryNoSettlement(Integer days);
 
+    /**
+     * 查询老师指定课程的课酬
+     * @param courseScheduleId
+     * @param teacherId
+     * @return
+     */
+    CourseScheduleTeacherSalary queryByCourseScheduleIdAndUserId(Long courseScheduleId,Integer teacherId);
 }

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
+import com.ym.mec.biz.dal.entity.School;
 import com.ym.mec.biz.dal.entity.VipGroup;
 import com.ym.mec.common.dal.BaseDAO;
 
@@ -189,4 +190,11 @@ public interface VipGroupDao extends BaseDAO<Long, VipGroup> {
 	 * @return
 	 */
 	List<TeacherVipClassInfoDto> getTeacherVipClass(Map<String, Object> params);
+    
+    /**
+     * 根据老师查询vip课教学点
+     * @param userId
+     * @return
+     */
+    List<School> querySchoolByUserId(Integer userId);
 }

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

@@ -1,16 +1,27 @@
 package com.ym.mec.biz.service;
 
-import com.ym.mec.biz.dal.dto.*;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+import com.ym.mec.biz.dal.dto.StudentVipGroupDetailDto;
+import com.ym.mec.biz.dal.dto.TeachingRecordBaseInfo;
+import com.ym.mec.biz.dal.dto.VipGroupApplyDto;
+import com.ym.mec.biz.dal.dto.VipGroupBuyParamsDto;
+import com.ym.mec.biz.dal.dto.VipGroupCostCountDto;
+import com.ym.mec.biz.dal.dto.VipGroupCostCountParamsDto;
+import com.ym.mec.biz.dal.dto.VipGroupManageDetailDto;
+import com.ym.mec.biz.dal.entity.School;
 import com.ym.mec.biz.dal.entity.StudentApplyRefunds;
 import com.ym.mec.biz.dal.entity.VipGroup;
-import com.ym.mec.biz.dal.page.*;
+import com.ym.mec.biz.dal.page.StudentVipGroupQueryInfo;
+import com.ym.mec.biz.dal.page.VipGroupAttendanceQueryInfo;
+import com.ym.mec.biz.dal.page.VipGroupQueryInfo;
+import com.ym.mec.biz.dal.page.VipGroupSalaryQueryInfo;
+import com.ym.mec.biz.dal.page.VipGroupTeachingRecordQueryInfo;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
 public interface VipGroupService extends BaseService<Long, VipGroup> {
 
     /**
@@ -181,4 +192,11 @@ public interface VipGroupService extends BaseService<Long, VipGroup> {
      */
     boolean awardedMonthlyRewards();
     
+    /**
+     * 根据老师查询vip课教学点
+     * @param userId
+     * @return
+     */
+    List<School> querySchoolByUserId(Integer userId);
+    
 }

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

@@ -18,6 +18,7 @@ import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.im.ImFeignService;
 import com.ym.mec.util.collection.MapUtil;
+
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -783,4 +784,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 		return true;
 	}
+
+	@Override
+	public List<School> querySchoolByUserId(Integer userId) {
+		return vipGroupDao.querySchoolByUserId(userId);
+	}
 }

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

@@ -36,6 +36,23 @@
         <result column="organ_id_" property="organId"/>
         <result column="schoole_id_" property="schoolId"/>
     </resultMap>
+    
+    <resultMap type="com.ym.mec.biz.dal.entity.School" id="School">
+        <result column="id_" property="id"/>
+        <result column="user_id_" property="userId"/>
+        <result column="name_" property="name"/>
+        <result column="organ_id_" property="organId"/>
+        <result column="address_" property="address"/>
+        <result column="contact_phone_" property="contactPhone"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+        <result column="del_flag_" property="delFlag"/>
+        <result column="contact_name_" property="contactName"/>
+        <result column="longitude_latitude_" property="longitudeLatitude"/>
+        <result column="subsidy_" property="subsidy"/>
+        <result column="cooperation_organ_id_" property="cooperationOrganId"/>
+        <result column="remark_" property="remark"/>
+    </resultMap>
 
     <resultMap id="studentManageVipGroup" type="com.ym.mec.biz.dal.dto.StudentManageVipGroupDto" extends="VipGroup">
         <result property="vipGroupCategory" column="vip_group_category_"/>
@@ -578,6 +595,7 @@
         <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="vip_group_activity_id_" property="activityId"/>
     </resultMap>
+    
     <select id="getTeacherVipClass" resultMap="getTeacherVipClassMap">
         SELECT vg.id_ vip_group_id_,vg.name_ vip_group_name_,vg.status_,vg.audit_status_,vg.create_time_,
         vg.payment_expire_date_,vg.courses_expire_date_,vg.online_classes_unit_price_,vg.offline_classes_unit_price_,
@@ -589,4 +607,8 @@
         WHERE cs.actual_teacher_id_ = #{teacherId} AND cs.type_ = 'VIP' AND cg.del_flag_ = 0 GROUP BY vg.id_,cg.id_
         <include refid="global.limit"/>
     </select>
+    
+    <select id="querySchoolByUserId" resultMap="School">
+        SELECT * from school where user_id_ = #{userId} or user_id_ is null
+    </select>
 </mapper>

mec-student/src/main/java/com/ym/mec/student/config/WebMvcConfig.java

@@ -14,13 +14,13 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import com.ym.mec.common.config.EnumConverterFactory;
 import com.ym.mec.common.config.LocalFastJsonHttpMessageConverter;
-import com.ym.mec.student.interceptor.RequestInterceptor;
+import com.ym.mec.student.interceptor.MDCInterceptor;
 
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {
 
 	@Autowired
-	private RequestInterceptor requestInterceptor;
+	private MDCInterceptor mdcInterceptor;
 
 	/**
 	 * 枚举类的转换器 addConverterFactory
@@ -40,7 +40,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
 		List<String> excludePathPatterns = new ArrayList<String>();
 		excludePathPatterns.add("/login");
 
-		registry.addInterceptor(requestInterceptor).addPathPatterns(includePathPatterns).excludePathPatterns(excludePathPatterns);
+		registry.addInterceptor(mdcInterceptor).addPathPatterns(includePathPatterns).excludePathPatterns(excludePathPatterns);
 	}
 
 	@Bean

mec-student/src/main/java/com/ym/mec/student/interceptor/RequestInterceptor.java → mec-student/src/main/java/com/ym/mec/student/interceptor/MDCInterceptor.java

@@ -10,7 +10,7 @@ import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 import com.ym.mec.util.web.WebUtil;
 
 @Component
-public class RequestInterceptor extends HandlerInterceptorAdapter {
+public class MDCInterceptor extends HandlerInterceptorAdapter {
 
 	private static final String IP = "ip";
 

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

@@ -6,9 +6,12 @@ import com.ym.mec.biz.dal.dto.VipGroupApplyDto;
 import com.ym.mec.biz.dal.dto.VipGroupCostCountParamsDto;
 import com.ym.mec.biz.service.VipGroupService;
 import com.ym.mec.common.controller.BaseController;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,30 +28,40 @@ import java.util.Objects;
 @RestController
 public class TeacherVipGroupController extends BaseController {
 
-    @Autowired
-    private VipGroupService vipGroupService;
-
-    @Autowired
-    private SysUserFeignService sysUserFeignService;
-
-    @ApiOperation("vip课申请")
-    @PostMapping("/vipGroupApply")
-    public Object vipGroupApply(@RequestBody VipGroupApplyDto vipGroupApplyDto){
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if(Objects.isNull(user)){
-            return failed("请登录");
-        }
-        vipGroupApplyDto.getVipGroupApplyBaseInfo().setTeacherId(Long.valueOf(user.getId()));
-        vipGroupApplyDto.getVipGroupApplyBaseInfo().setOrganIdList(user.getOrganId().toString());
-        vipGroupService.createVipGroup(vipGroupApplyDto);
-        return succeed();
-    }
-
-    @ApiOperation("获取vip课课程和课酬总费用")
-    @PostMapping("/getVipGroupCostCount")
-    public Object getVipGroupCostCount(VipGroupCostCountParamsDto vipGroupCostCountParamsDto){
-//        return succeed(vipGroupService.vipGroupCostCount(vipGroupCostCountParamsDto));
-        return succeed();
-    }
+	@Autowired
+	private VipGroupService vipGroupService;
+
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
+
+	@ApiOperation("vip课申请")
+	@PostMapping("/vipGroupApply")
+	public Object vipGroupApply(@RequestBody VipGroupApplyDto vipGroupApplyDto) {
+		SysUser user = sysUserFeignService.queryUserInfo();
+		if (Objects.isNull(user)) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+		vipGroupApplyDto.getVipGroupApplyBaseInfo().setTeacherId(Long.valueOf(user.getId()));
+		vipGroupApplyDto.getVipGroupApplyBaseInfo().setOrganIdList(user.getOrganId().toString());
+		vipGroupService.createVipGroup(vipGroupApplyDto);
+		return succeed();
+	}
+
+	@ApiOperation("获取vip课课程和课酬总费用")
+	@PostMapping("/getVipGroupCostCount")
+	public Object getVipGroupCostCount(VipGroupCostCountParamsDto vipGroupCostCountParamsDto) {
+		// return succeed(vipGroupService.vipGroupCostCount(vipGroupCostCountParamsDto));
+		return succeed();
+	}
+
+	@ApiOperation("获取vip课教学点")
+	@PostMapping("/getSchools")
+	public Object getSchools() {
+		SysUser user = sysUserFeignService.queryUserInfo();
+		if (Objects.isNull(user)) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+		return succeed(vipGroupService.querySchoolByUserId(user.getId()));
+	}
 
 }