Merge branch 'feature/0529-live' of http://git.dayaedu.com/yonge/mec into master_saas

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentVipGroupDetailDto.java

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.entity.CourseSchedule;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.util.List;
 
@@ -9,6 +10,7 @@ import java.util.List;
  * @Author Joburgess
  * @Date 2019/9/23
  */
+@Data
 public class StudentVipGroupDetailDto extends StudentVipGroupShowListDto {
 
     @ApiModelProperty(value = "总课时")
@@ -23,35 +25,6 @@ public class StudentVipGroupDetailDto extends StudentVipGroupShowListDto {
     @ApiModelProperty(value = "课程列表",required = false)
     private List<CourseSchedule> courseSchedules;
 
-    public Integer getTotalClassTimes() {
-        return totalClassTimes;
-    }
-
-    public void setTotalClassTimes(Integer totalClassTimes) {
-        this.totalClassTimes = totalClassTimes;
-    }
-
-    public Integer getNumberOfClasses() {
-        return numberOfClasses;
-    }
-
-    public void setNumberOfClasses(Integer numberOfClasses) {
-        this.numberOfClasses = numberOfClasses;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    public List<CourseSchedule> getCourseSchedules() {
-        return courseSchedules;
-    }
-
-    public void setCourseSchedules(List<CourseSchedule> courseSchedules) {
-        this.courseSchedules = courseSchedules;
-    }
+    @ApiModelProperty("直播间配置信息")
+    private String liveConfigJson;
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/TeacherLeaveRecord.java

@@ -3,22 +3,17 @@ package com.ym.mec.biz.dal.entity;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.enums.AuditStatusEnum;
 import com.ym.mec.common.entity.BaseEntity;
-
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
  * 对应数据库表(teacher_leave_record):
  */
+@Data
 public class TeacherLeaveRecord extends BaseEntity {
 
-    /**
-     *
-     */
     private Long id;
 
-    /**
-     *
-     */
     private Integer userId;
 
     /**
@@ -46,14 +41,8 @@ public class TeacherLeaveRecord extends BaseEntity {
      */
     private String remark;
 
-    /**
-     *
-     */
     private java.util.Date createTime;
 
-    /**
-     *
-     */
     private java.util.Date updateTime;
 
     /**
@@ -83,152 +72,17 @@ public class TeacherLeaveRecord extends BaseEntity {
     
     private SysUser user = new SysUser();
 
-    public String getLeaveCategoryName() {
-        return leaveCategoryName;
-    }
-
-    public void setLeaveCategoryName(String leaveCategoryName) {
-        this.leaveCategoryName = leaveCategoryName;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return this.id;
-    }
-
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
-
-    public Integer getUserId() {
-        return this.userId;
-    }
-
-    public void setDays(double days) {
-        this.days = days;
-    }
-
-    public double getDays() {
-        return this.days;
-    }
-
-    public Integer getLeaveCategoryId() {
-        return leaveCategoryId;
-    }
-
-    public void setLeaveCategoryId(Integer leaveCategoryId) {
-        this.leaveCategoryId = leaveCategoryId;
-    }
-
-    public void setStatus(AuditStatusEnum status) {
-        this.status = status;
-    }
-
-    public AuditStatusEnum getStatus() {
-        return this.status;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getRemark() {
-        return this.remark;
-    }
-
-    public void setCreateTime(java.util.Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public java.util.Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setUpdateTime(java.util.Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public java.util.Date getUpdateTime() {
-        return this.updateTime;
-    }
-
-    public void setStartTime(java.util.Date startTime) {
-        this.startTime = startTime;
-    }
-
-    public java.util.Date getStartTime() {
-        return this.startTime;
-    }
-
-    public void setEndTime(java.util.Date endTime) {
-        this.endTime = endTime;
-    }
-
-    public java.util.Date getEndTime() {
-        return this.endTime;
-    }
-
-    public void setCoursesScheduleJson(String coursesScheduleJson) {
-        this.coursesScheduleJson = coursesScheduleJson;
-    }
-
-    public String getCoursesScheduleJson() {
-        return this.coursesScheduleJson;
-    }
-
-    public void setWfProcessId(String wfProcessId) {
-        this.wfProcessId = wfProcessId;
-    }
-
-    public String getWfProcessId() {
-        return this.wfProcessId;
-    }
-
-    public void setWfOrderId(String wfOrderId) {
-        this.wfOrderId = wfOrderId;
-    }
-
-    public String getWfOrderId() {
-        return this.wfOrderId;
-    }
-
-    public SysUser getUser() {
-		return user;
-	}
-
-	public void setUser(SysUser user) {
-		this.user = user;
-	}
-
 	@Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
     }
 
 
+    @Data
     public static class CoursesScheduleHistory {
 
         private CourseSchedule before;
 
         private CourseSchedule after;
-
-        public CourseSchedule getBefore() {
-            return before;
-        }
-
-        public void setBefore(CourseSchedule before) {
-            this.before = before;
-        }
-
-        public CourseSchedule getAfter() {
-            return after;
-        }
-
-        public void setAfter(CourseSchedule after) {
-            this.after = after;
-        }
     }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/VipGroup.java

@@ -7,6 +7,7 @@ import com.ym.mec.common.entity.BaseEntity;
 
 import io.swagger.annotations.ApiModelProperty;
 
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.math.BigDecimal;
@@ -15,6 +16,7 @@ import java.util.Date;
 /**
  * 对应数据库表(vip_group):
  */
+@Data
 public class VipGroup extends BaseEntity {
 
 	/**  */
@@ -150,376 +152,8 @@ public class VipGroup extends BaseEntity {
 
 	private int enableDelete;
 
-	public Integer getEnableDelete() {
-		return enableDelete;
-	}
-
-	public void setEnableDelete(Integer enableDelete) {
-		this.enableDelete = enableDelete;
-	}
-
-	public String getVipGroupCategoryName() {
-		return vipGroupCategoryName;
-	}
-
-	public void setVipGroupCategoryName(String vipGroupCategoryName) {
-		this.vipGroupCategoryName = vipGroupCategoryName;
-	}
-
-	public BigDecimal getCourseUnitPrice() {
-		return courseUnitPrice;
-	}
-
-	public void setCourseUnitPrice(BigDecimal courseUnitPrice) {
-		this.courseUnitPrice = courseUnitPrice;
-	}
-
-	public String getLastOverTime() {
-		return lastOverTime;
-	}
-
-	public void setLastOverTime(String lastOverTime) {
-		this.lastOverTime = lastOverTime;
-	}
-
-	public String getUserInfo() {
-		return userInfo;
-	}
-
-	public void setUserInfo(String userInfo) {
-		this.userInfo = userInfo;
-	}
-
-	public String getEducationalTeacherName() {
-		return educationalTeacherName;
-	}
-
-	public void setEducationalTeacherName(String educationalTeacherName) {
-		this.educationalTeacherName = educationalTeacherName;
-	}
-
-	public Integer getEducationalTeacherId() {
-		return educationalTeacherId;
-	}
-
-	public void setEducationalTeacherId(Integer educationalTeacherId) {
-		this.educationalTeacherId = educationalTeacherId;
-	}
-
-	public Integer getSubClassTimes() {
-		return subClassTimes;
-	}
-
-	public void setSubClassTimes(Integer subClassTimes) {
-		this.subClassTimes = subClassTimes;
-	}
-
-	public String getStudentIdList() {
-		return studentIdList;
-	}
-
-	public void setStudentIdList(String studentIdList) {
-		this.studentIdList = studentIdList;
-	}
-
-	public String getCourseSchedulesJson() {
-		return courseSchedulesJson;
-	}
-
-	public void setCourseSchedulesJson(String courseSchedulesJson) {
-		this.courseSchedulesJson = courseSchedulesJson;
-	}
-
-	public Date getCourseStartDate() {
-		return courseStartDate;
-	}
-
-	public void setCourseStartDate(Date courseStartDate) {
-		this.courseStartDate = courseStartDate;
-	}
-
-	public Integer getMonthConsumeRate() {
-		return monthConsumeRate;
-	}
-
-	public void setMonthConsumeRate(Integer monthConsumeRate) {
-		this.monthConsumeRate = monthConsumeRate;
-	}
-
-	public String getStopReason() {
-		return stopReason;
-	}
-
-	public void setStopReason(String stopReason) {
-		this.stopReason = stopReason;
-	}
-
-	public String getMemo() {
-		return memo;
-	}
-
-	public void setMemo(String memo) {
-		this.memo = memo;
-	}
-
-	public String getVipGroupActivityName() {
-		return vipGroupActivityName;
-	}
-
-	public void setVipGroupActivityName(String vipGroupActivityName) {
-		this.vipGroupActivityName = vipGroupActivityName;
-	}
-
-	public String getUserName() {
-		return userName;
-	}
-
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-
-	public Integer getStudentNum() {
-		return studentNum;
-	}
-
-	public void setStudentNum(Integer studentNum) {
-		this.studentNum = studentNum;
-	}
-
-	public Integer getTotalClassTimes() {
-		return totalClassTimes;
-	}
-
-	public void setTotalClassTimes(Integer totalClassTimes) {
-		this.totalClassTimes = totalClassTimes;
-	}
-
-	public Integer getCurrentClassTimes() {
-		return currentClassTimes;
-	}
-
-	public void setCurrentClassTimes(Integer currentClassTimes) {
-		this.currentClassTimes = currentClassTimes;
-	}
-
-	public VipGroupStatusEnum getStatus() {
-		return status;
-	}
-
-	public void setStatus(VipGroupStatusEnum status) {
-		this.status = status;
-	}
-
-	public Integer getVipGroupActivityId() {
-		return vipGroupActivityId;
-	}
-
-	public void setVipGroupActivityId(Integer vipGroupActivityId) {
-		this.vipGroupActivityId = vipGroupActivityId;
-	}
-
-	public AuditStatusEnum getAuditStatus() {
-		return auditStatus;
-	}
-
-	public void setAuditStatus(AuditStatusEnum auditStatus) {
-		this.auditStatus = auditStatus;
-	}
-
-	public Integer getVipGroupCategoryId() {
-		return vipGroupCategoryId;
-	}
-
-	public void setVipGroupCategoryId(Integer vipGroupCategoryId) {
-		this.vipGroupCategoryId = vipGroupCategoryId;
-	}
-
-	public BigDecimal getOnlineClassesUnitPrice() {
-		return onlineClassesUnitPrice;
-	}
-
-	public void setOnlineClassesUnitPrice(BigDecimal onlineClassesUnitPrice) {
-		this.onlineClassesUnitPrice = onlineClassesUnitPrice;
-	}
-
-	public BigDecimal getOfflineClassesUnitPrice() {
-		return offlineClassesUnitPrice;
-	}
-
-	public void setOfflineClassesUnitPrice(BigDecimal offlineClassesUnitPrice) {
-		this.offlineClassesUnitPrice = offlineClassesUnitPrice;
-	}
-
-	public BigDecimal getTotalPrice() {
-		return totalPrice;
-	}
-
-	public void setTotalPrice(BigDecimal totalPrice) {
-		this.totalPrice = totalPrice;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getId() {
-		return this.id;
-	}
-
-	public void setUserId(Integer userId) {
-		this.userId = userId;
-	}
-
-	public Integer getUserId() {
-		return this.userId;
-	}
-
-	public void setSingleClassMinutes(Integer singleClassMinutes) {
-		this.singleClassMinutes = singleClassMinutes;
-	}
-
-	public Integer getSingleClassMinutes() {
-		return this.singleClassMinutes;
-	}
-
-	public void setPaymentExpireDate(java.util.Date paymentExpireDate) {
-		this.paymentExpireDate = paymentExpireDate;
-	}
-
-	public java.util.Date getPaymentExpireDate() {
-		return this.paymentExpireDate;
-	}
-
-	public void setCoursesExpireDate(java.util.Date coursesExpireDate) {
-		this.coursesExpireDate = coursesExpireDate;
-	}
-
-	public java.util.Date getCoursesExpireDate() {
-		return this.coursesExpireDate;
-	}
-
-	public void setCreateTime(java.util.Date createTime) {
-		this.createTime = createTime;
-	}
-
-	public java.util.Date getCreateTime() {
-		return this.createTime;
-	}
-
-	public void setUpdateTime(java.util.Date updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public java.util.Date getUpdateTime() {
-		return this.updateTime;
-	}
-
-	public void setTeacherSchoolId(Integer teacherSchoolId) {
-		this.teacherSchoolId = teacherSchoolId;
-	}
-
-	public Integer getTeacherSchoolId() {
-		return this.teacherSchoolId;
-	}
-
-	public void setOnlineClassesNum(Integer onlineClassesNum) {
-		this.onlineClassesNum = onlineClassesNum;
-	}
-
-	public Integer getOnlineClassesNum() {
-		return this.onlineClassesNum;
-	}
-
-	public void setOfflineClassesNum(Integer offlineClassesNum) {
-		this.offlineClassesNum = offlineClassesNum;
-	}
-
-	public Integer getOfflineClassesNum() {
-		return this.offlineClassesNum;
-	}
-
-	public Date getRegistrationStartTime() {
-		return registrationStartTime;
-	}
-
-	public void setRegistrationStartTime(Date registrationStartTime) {
-		this.registrationStartTime = registrationStartTime;
-	}
-
-	public String getOrganIdList() {
-		return organIdList;
-	}
-
-	public void setOrganIdList(String organIdList) {
-		this.organIdList = organIdList;
-	}
-
-	public TeachModeEnum getGiveTeachMode() {
-		return giveTeachMode;
-	}
-
-	public void setGiveTeachMode(TeachModeEnum giveTeachMode) {
-		this.giveTeachMode = giveTeachMode;
-	}
-
-	public Integer getOrganId() {
-		return organId;
-	}
-
-	public void setOrganId(Integer organId) {
-		this.organId = organId;
-	}
-
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);
 	}
-
-	public String getOrganName() {
-		return organName;
-	}
-
-	public void setOrganName(String organName) {
-		this.organName = organName;
-	}
-
-	public String getSchoolName() {
-		return schoolName;
-	}
-
-	public void setSchoolName(String schoolName) {
-		this.schoolName = schoolName;
-	}
-
-	public String getSubjectName() {
-		return subjectName;
-	}
-
-	public void setSubjectName(String subjectName) {
-		this.subjectName = subjectName;
-	}
-
-	public String getGroupType() {
-		return groupType;
-	}
-
-	public void setGroupType(String groupType) {
-		this.groupType = groupType;
-	}
-
-	public String getLiveConfigJson() {
-		return liveConfigJson;
-	}
-
-	public void setLiveConfigJson(String liveConfigJson) {
-		this.liveConfigJson = liveConfigJson;
-	}
 }

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

@@ -22,6 +22,7 @@ import com.ym.mec.biz.event.source.SendSeoMessageSource;
 import com.ym.mec.biz.service.CourseScheduleService;
 import com.ym.mec.biz.service.SchoolStaffService;
 import com.ym.mec.biz.service.SysMessageService;
+import com.ym.mec.biz.service.SysUserService;
 import com.ym.mec.biz.service.TeacherLeaveRecordService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.dal.BaseDAO;
@@ -59,7 +60,7 @@ public class TeacherLeaveRecordServiceImpl extends BaseServiceImpl<Long, Teacher
 	@Autowired
 	private SendSeoMessageSource sendSeoMessageSource;
 	@Autowired
-	private SysUserFeignService sysUserFeignService;
+	private SysUserService sysUserService;
 
     @Autowired
     private SchoolStaffService schoolStaffService;
@@ -72,12 +73,9 @@ public class TeacherLeaveRecordServiceImpl extends BaseServiceImpl<Long, Teacher
 	}
 
 	@Override
-	@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+	@Transactional(rollbackFor = Exception.class)
 	public boolean askForLeave(TeacherLeaveRecord teacherLeaveRecord) {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (Objects.isNull(sysUser)) {
-			throw new BizException("获取用户信息失败");
-		}
+		SysUser sysUser = sysUserService.getUser();
 		Date date = new Date();
 
 		teacherLeaveRecord.setUserId(sysUser.getId());
@@ -95,7 +93,7 @@ public class TeacherLeaveRecordServiceImpl extends BaseServiceImpl<Long, Teacher
 				List<CourseSchedule> list = new ArrayList<CourseSchedule>();
 
 				for (CoursesScheduleHistory his : coursesScheduleHistoryList) {
-					if (his.getBefore().getType() != CourseScheduleType.VIP) {
+					if (his.getBefore().getType() != CourseScheduleType.VIP && his.getBefore().getType() != CourseScheduleType.LIVE) {
 						continue;
 					}
 					if(!teacherLeaveRecord.getEndTime().before(his.getAfter().getStartClassTime())
@@ -105,10 +103,6 @@ public class TeacherLeaveRecordServiceImpl extends BaseServiceImpl<Long, Teacher
 
 					list.add(his.getAfter());
 				}
-
-				if(list.size() > 0){
-					// checkCourseSchedulePlansExitLeaveRecord(list);
-				}
 			}
 		}
 		teacherLeaveRecordDao.insert(teacherLeaveRecord);
@@ -123,10 +117,6 @@ public class TeacherLeaveRecordServiceImpl extends BaseServiceImpl<Long, Teacher
 	@Override
 	@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
 	public HttpResponseResult approve(Long id, Integer userId, AuditStatusEnum status, String remark, Boolean allowZeroSalary) {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (Objects.isNull(sysUser)) {
-			throw new BizException("获取用户信息失败");
-		}
 		TeacherLeaveRecord teacherLeaveRecord = teacherLeaveRecordDao.get(id);
 		if (teacherLeaveRecord == null) {
 			throw new BizException("请假记录不存在");

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

@@ -2170,7 +2170,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         if (Objects.isNull(groupId)) {
             throw new BizException("请指定课程组");
         }
-        // groupType -> PRACTICE, VIP, LIVE
         if ("PRACTICE".equals(groupType)) {
             PracticeGroup practiceGroup = practiceGroupService.get(groupId);
             if (Objects.isNull(practiceGroup)) {
@@ -2473,26 +2472,26 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             courseScheduleService.checkNewCourseSchedules(courseSchedules, false, false);
         } else {
             VipGroup vipGroup = get(vipGroupId.longValue());
-            if (StringUtils.isNotEmpty(vipGroup.getStudentIdList())) {
-                Set<Integer> userIds = Arrays.asList(vipGroup.getStudentIdList().split(",")).stream().mapToInt(Integer::parseInt).boxed().collect(Collectors.toSet());
-                if (!userIds.contains(userId)) {
-                    throw new BizException("您无法购买此课程");
+            ClassGroup classGroup = classGroupDao.findByVipGroup(vipGroupId.longValue(), vipGroup.getGroupType());
+            if("VIP".equals(vipGroup.getGroupType())){
+                if (StringUtils.isNotEmpty(vipGroup.getStudentIdList())) {
+                    Set<Integer> userIds = Arrays.asList(vipGroup.getStudentIdList().split(",")).stream().mapToInt(Integer::parseInt).boxed().collect(Collectors.toSet());
+                    if (!userIds.contains(userId)) {
+                        throw new BizException("您无法购买此课程");
+                    }
+                }
+                if (classGroup.getStudentNum() > 0 && (VipGroupStatusEnum.APPLYING.equals(vipGroup.getStatus()))) {
+                    int i = studentPaymentOrderDao.countGroupOrderWithoutFailed(vipGroupId.toString(), GroupType.VIP);
+                    if (i <= 0) {
+                        throw new BizException("该课程已经无法通过购买加入，请联系教务老师!");
+                    }
                 }
             }
-            ClassGroup classGroup = classGroupDao.findByVipGroup(vipGroupId.longValue(), vipGroup.getGroupType());
             //是否已经购买
             Boolean exist = classGroupStudentMapperDao.existByClassGroupIds(classGroup.getId().toString(), userId);
             if (exist) {
                 throw new BizException("您已加入此课程");
             }
-
-            if (classGroup.getStudentNum() > 0 && (VipGroupStatusEnum.APPLYING.equals(vipGroup.getStatus()))) {
-                int i = studentPaymentOrderDao.countGroupOrderWithoutFailed(vipGroupId.toString(), GroupType.VIP);
-                if (i <= 0) {
-                    throw new BizException("该课程已经无法通过购买加入，请联系教务老师!");
-                }
-            }
-
             List<CourseSchedule> courseSchedules = JSON.parseArray(vipGroup.getCourseSchedulesJson(), CourseSchedule.class);
             courseScheduleService.checkNewCourseSchedules(courseSchedules, false, false);
         }
@@ -2651,7 +2650,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         studentPaymentOrder.setMusicGroupId(vipGroup.getId().toString());
         studentPaymentOrder.setMusicGroupId(vipGroup.getId().toString());
         studentPaymentOrder.setClassGroupId(classGroup.getId());
-        studentPaymentOrder.setOrganId(vipGroup.getOrganId());
+        studentPaymentOrder.setOrganId(user.getOrganId());
         studentPaymentOrder.setVersion(0);
         studentPaymentOrder.setActivityBuyNum(vipGroup.getOnlineClassesNum() + vipGroup.getOfflineClassesNum());
         Integer vipGroupActivityId = vipGroup.getVipGroupActivityId();
@@ -2667,14 +2666,14 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             }
             studentPaymentOrder.setPaymentChannel("BALANCE");
             if (userCashAccount.getBalance().subtract(amount).doubleValue() >= 0) {
-                studentPaymentRouteOrderService.addRouteOrder(orderNo, vipGroup.getOrganId(), vipGroup.getTotalPrice());
+                studentPaymentRouteOrderService.addRouteOrder(orderNo, user.getOrganId(), vipGroup.getTotalPrice());
                 // 更新订单信息
                 studentPaymentOrder.setActualAmount(new BigDecimal(0));
                 studentPaymentOrder.setBalancePaymentAmount(amount);
                 studentPaymentOrder.setStatus(DealStatusEnum.SUCCESS);
                 studentPaymentOrder.setUpdateTime(date);
-                studentPaymentOrder.setOrganId(vipGroup.getOrganId());
-                studentPaymentOrder.setRoutingOrganId(vipGroup.getOrganId());
+                studentPaymentOrder.setOrganId(user.getOrganId());
+                studentPaymentOrder.setRoutingOrganId(user.getOrganId());
 
                 this.orderCallback(studentPaymentOrder);
 
@@ -2717,12 +2716,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                 baseApiUrl + "/api-student/studentOrder/paymentResult?orderNo=" + orderNo,
                 groupType.getDesc() + "购买",
                 vipGroup.getName(),
-                vipGroup.getOrganId(),
+                user.getOrganId(),
                 orderTypeEnum.getCode()
         );
 
-        studentPaymentOrder.setOrganId(vipGroup.getOrganId());
-        studentPaymentOrder.setRoutingOrganId(vipGroup.getOrganId());
+        studentPaymentOrder.setOrganId(user.getOrganId());
+        studentPaymentOrder.setRoutingOrganId(user.getOrganId());
         studentPaymentOrder.setMerNos((String) payMap.get("routingMerNos"));
         studentPaymentOrder.setPaymentChannel((String) payMap.get("type"));
         studentPaymentOrder.setUpdateTime(date);

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

@@ -1,14 +1,18 @@
 package com.ym.mec.teacher.controller;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.dao.VipGroupCategoryDao;
 import com.ym.mec.biz.dal.dao.VipGroupDefaultClassesUnitPriceDao;
-import com.ym.mec.biz.dal.dto.*;
-import com.ym.mec.biz.dal.entity.*;
+import com.ym.mec.biz.dal.dto.StudentVipDouble11Dto;
+import com.ym.mec.biz.dal.dto.VipGroupApplyDto;
+import com.ym.mec.biz.dal.entity.CourseSchedule;
+import com.ym.mec.biz.dal.entity.Teacher;
+import com.ym.mec.biz.dal.entity.VipGroupCategory;
+import com.ym.mec.biz.dal.entity.VipGroupDefaultClassesUnitPrice;
 import com.ym.mec.biz.dal.page.StudentManageQueryInfo;
 import com.ym.mec.biz.service.StudentManageService;
+import com.ym.mec.biz.service.SysUserService;
 import com.ym.mec.biz.service.VipGroupService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
@@ -18,8 +22,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
@@ -39,7 +41,7 @@ public class TeacherVipGroupController extends BaseController {
 	@Autowired
 	private VipGroupService vipGroupService;
 	@Autowired
-	private SysUserFeignService sysUserFeignService;
+	private SysUserService sysUserService;
 	@Autowired
 	private TeacherDao teacherDao;
 	@Autowired
@@ -53,10 +55,7 @@ public class TeacherVipGroupController extends BaseController {
 	@PostMapping("/vipGroupApply")
 	@AuditLogAnnotation(operateName = "vip课申请")
 	public Object vipGroupApply(@RequestBody VipGroupApplyDto vipGroupApplyDto) {
-		SysUser user = sysUserFeignService.queryUserInfo();
-		if (Objects.isNull(user)) {
-			return failed(HttpStatus.FORBIDDEN, "请登录");
-		}
+		SysUser user = sysUserService.getUser();
 		Integer userId = user.getId();
 		Teacher teacher = teacherDao.get(userId);
 		vipGroupApplyDto.getVipGroupApplyBaseInfo().setUserId(userId);
@@ -76,10 +75,7 @@ public class TeacherVipGroupController extends BaseController {
 	@PostMapping("/vipGroupApplyForDouble11")
 	@Transactional(rollbackFor = Exception.class)
 	public Object vipGroupApplyForDouble11(@RequestBody VipGroupApplyDto vipGroupApplyDto) {
-		SysUser user = sysUserFeignService.queryUserInfo();
-		if (Objects.isNull(user)) {
-			return failed(HttpStatus.FORBIDDEN, "请登录");
-		}
+		SysUser user = sysUserService.getUser();
 		Integer userId = user.getId();
 		Teacher teacher = teacherDao.get(userId);
 		vipGroupApplyDto.getVipGroupApplyBaseInfo().setUserId(userId);
@@ -138,64 +134,37 @@ public class TeacherVipGroupController extends BaseController {
 		return result;
 	}
 
-	@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()));
+		return succeed(vipGroupService.querySchoolByUserId(sysUserService.getUserId()));
 	}
 
 	@ApiOperation(value = "获取教师所在分部学生列表")
 	@GetMapping("/queryStudentsWithTeacher")
 	public Object queryStudentsWithTeacher(StudentManageQueryInfo queryInfo){
-		SysUser user = sysUserFeignService.queryUserInfo();
-		if (Objects.isNull(user)) {
-			return failed(HttpStatus.FORBIDDEN, "请登录");
-		}
-		queryInfo.setTeacherId(user.getId());
+		queryInfo.setTeacherId(sysUserService.getUserId());
 		return succeed(studentManageService.queryStudentsWithTeacher(queryInfo));
 	}
 
 	@ApiOperation(value = "获取教师所在分部学生列表")
 	@GetMapping("/queryStudentsWithTeacherByOrganId")
 	public Object queryStudentsWithTeacherByOrganId(StudentManageQueryInfo queryInfo){
-		SysUser user = sysUserFeignService.queryUserInfo();
-		if (Objects.isNull(user)) {
-			return failed(HttpStatus.FORBIDDEN, "请登录");
-		}
-		queryInfo.setTeacherId(user.getId());
+		queryInfo.setTeacherId(sysUserService.getUserId());
 		return succeed(studentManageService.queryStudentsWithTeacherByOrganId(queryInfo));
 	}
 
 	@ApiOperation(value = "获取参与双十一活动学员列表")
 	@GetMapping("/queryDouble11Students")
 	public HttpResponseResult queryDouble11Students(StudentManageQueryInfo queryInfo){
-		SysUser user = sysUserFeignService.queryUserInfo();
-		if (Objects.isNull(user)) {
-			return failed(HttpStatus.FORBIDDEN, "请登录");
-		}
-		queryInfo.setTeacherId(user.getId());
+		queryInfo.setTeacherId(sysUserService.getUserId());
 		return succeed(studentManageService.queryDouble11Students(queryInfo));
 	}
 
 	@ApiOperation(value = "获取六一活动学生列表")
 	@GetMapping("queryChildrenDayStudentList")
 	public Object queryStudentList(StudentManageQueryInfo queryInfo){
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (sysUser == null) {
-			return failed("用户信息获取失败");
-		}
-		Teacher teacher = teacherDao.get(sysUser.getId());
+		Teacher teacher = teacherDao.get(sysUserService.getUserId());
 		if(Objects.isNull(teacher)){
 			return failed("教师信息不存在");
 		}
@@ -216,12 +185,8 @@ public class TeacherVipGroupController extends BaseController {
 	@ApiOperation(value = "创建六一活动vip课")
 	@PostMapping("/createActivityVipGroup")
 	public Object createActivityVipGroup(@RequestBody VipGroupApplyDto vipGroupApplyDto){
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (sysUser == null) {
-			return failed("用户信息获取失败");
-		}
-		vipGroupApplyDto.getVipGroupApplyBaseInfo().setUserId(sysUser.getId());
-		Integer userId = vipGroupApplyDto.getVipGroupApplyBaseInfo().getUserId();
+		Integer userId = sysUserService.getUserId();
+		vipGroupApplyDto.getVipGroupApplyBaseInfo().setUserId(userId);
 		Teacher teacher = teacherDao.get(userId);
 		if(Objects.isNull(teacher)){
 			return failed("请指定指导老师!");
@@ -248,7 +213,7 @@ public class TeacherVipGroupController extends BaseController {
 			vipGroupApplyDto.getVipGroupApplyBaseInfo().setOfflineClassesUnitPrice(vipGroupDefaultClassesUnitPrice.getOfflineClassesUnitPrice());
 		}
 
-		vipGroupApplyDto.getVipGroupApplyBaseInfo().setEducationalTeacherId(sysUser.getId());
+		vipGroupApplyDto.getVipGroupApplyBaseInfo().setEducationalTeacherId(userId);
 		return vipGroupService.createActivityVipGroup(vipGroupApplyDto);
 	}
 }