Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -16,15 +16,24 @@ import java.util.Map;
 public interface VipGroupService extends BaseService<Long, VipGroup> {
 
     /**
-     * @Author: Joburgess
-     * @Date: 2019/10/3
-     * @params [vipGroup]
-     * @return void
      * @describe 创建vip课
+     * @author Joburgess
+     * @date 2019/10/30
+     * @param vipGroup: VIP课申请信息
+     * @return void
      */
     void createVipGroup(VipGroupApplyDto vipGroup);
 
     /**
+     * @describe 更新vip课程信息
+     * @author Joburgess
+     * @date 2019/10/30
+     * @param vipGroupApplyInfo: vip课信息
+     * @return void
+     */
+    void updateVipGroup(VipGroupApplyDto vipGroupApplyInfo);
+
+    /**
      * @describe vip课程审核
      * @author Joburgess
      * @date 2019/10/22

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

@@ -255,7 +255,16 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				vipGroupApplyBaseInfoDto.getOfflineTeacherSalary());
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void updateVipGroup(VipGroupApplyDto vipGroupApplyInfo) {
+		VipGroupApplyBaseInfoDto vipGroupUpdateInfo = vipGroupApplyInfo.getVipGroupApplyBaseInfo();
+		if(Objects.isNull(vipGroupUpdateInfo.getId())){
+			throw new BizException("请指定vip课");
+		}
+		VipGroup oldVipGroupInfo = vipGroupDao.get(vipGroupUpdateInfo.getId());
 
+	}
 
 	@Override
 	public void vipApplyAudit(Long vipGroupId, AuditStatusEnum auditStatus, String reason) {

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

@@ -1,6 +1,5 @@
 package com.ym.mec.teacher.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.ClassDateAdjustDto;
@@ -60,7 +59,6 @@ public class TeacherCourseScheduleController extends BaseController {
         if(null==user){
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        System.out.println(JSON.toJSONString(user));
         List<CourseScheduleDto> teacherCourseSchedulesWithDate = scheduleService.getTeacherCourseSchedulesWithDate(user.getId(),date,type);
         Map<String,Object> result = new HashMap<>();
         result.put("rows",teacherCourseSchedulesWithDate);