Merge remote-tracking branch 'origin/master_saas' into master_saas

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

@@ -12,12 +12,15 @@ import java.util.List;
  */
 public class VipGroupApplyDto {
 
-    @ApiModelProperty(value = "vip课基本信息",required = false)
+    @ApiModelProperty(value = "vip课基本信息")
     private VipGroupApplyBaseInfoDto vipGroupApplyBaseInfo;
 
-    @ApiModelProperty(value = "课程计划列表",required = false)
+    @ApiModelProperty(value = "课程计划列表")
     private List<CourseSchedule> courseSchedules;
 
+    @ApiModelProperty("直播间信息")
+    private ImLiveBroadcastRoomDto liveBroadcastRoom;
+
     @ApiModelProperty(value = "课程组只能是正常状态")
     private boolean onlyProgress;
 
@@ -86,4 +89,12 @@ public class VipGroupApplyDto {
     public void setOnlyProgress(boolean onlyProgress) {
         this.onlyProgress = onlyProgress;
     }
+
+    public ImLiveBroadcastRoomDto getLiveBroadcastRoom() {
+        return liveBroadcastRoom;
+    }
+
+    public void setLiveBroadcastRoom(ImLiveBroadcastRoomDto liveBroadcastRoom) {
+        this.liveBroadcastRoom = liveBroadcastRoom;
+    }
 }

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

@@ -123,6 +123,14 @@ public class ImLiveBroadcastRoom implements Serializable {
     @ApiModelProperty("购物车标题")
     private String shoppingTitle;
 
+    @TableField("group_type_")
+    @ApiModelProperty("直播间类型")
+    private String groupType;
+
+    @TableField("subject_id_")
+    @ApiModelProperty("声部编号")
+    private String subjectId;
+
     @TableField("created_by_")
     @ApiModelProperty(value = "创建人")
     private Integer createdBy;
@@ -383,5 +391,21 @@ public class ImLiveBroadcastRoom implements Serializable {
     public void setShoppingTitle(String shoppingTitle) {
         this.shoppingTitle = shoppingTitle;
     }
+
+    public String getGroupType() {
+        return groupType;
+    }
+
+    public void setGroupType(String groupType) {
+        this.groupType = groupType;
+    }
+
+    public String getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(String subjectId) {
+        this.subjectId = subjectId;
+    }
 }
 

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

@@ -33,6 +33,9 @@ public class TeacherDefaultVipGroupSalary extends BaseEntity {
 	/** 线下课薪酬 */
 	@ApiModelProperty(value = "线下课薪酬", required = false)
 	private java.math.BigDecimal offlineClassesSalary;
+
+	@ApiModelProperty("课程类型")
+	private String groupType;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -104,6 +107,14 @@ public class TeacherDefaultVipGroupSalary extends BaseEntity {
 		this.musicTheory = musicTheory;
 	}
 
+	public String getGroupType() {
+		return groupType;
+	}
+
+	public void setGroupType(String groupType) {
+		this.groupType = groupType;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -46,6 +46,9 @@ public class VipGroupCategory extends BaseEntity {
 	@ApiModelProperty(value = "是否乐理课")
 	private Boolean musicTheory = false;
 
+	@ApiModelProperty("购买单价id")
+	private Integer unitPriceId;
+
 	public Boolean getMusicTheory() {
 		return musicTheory;
 	}
@@ -134,6 +137,14 @@ public class VipGroupCategory extends BaseEntity {
 		this.groupType = groupType;
 	}
 
+	public Integer getUnitPriceId() {
+		return unitPriceId;
+	}
+
+	public void setUnitPriceId(Integer unitPriceId) {
+		this.unitPriceId = unitPriceId;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.biz.dal.dao.VipGroupDefaultClassesUnitPriceDao;
 import com.ym.mec.biz.dal.entity.VipGroupDefaultClassesUnitPrice;
+import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.service.VipGroupDefaultClassesUnitPriceService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
@@ -26,7 +27,8 @@ public class VipGroupDefaultClassesUnitPriceServiceImpl extends BaseServiceImpl<
 
 	@Override
 	public long insert(VipGroupDefaultClassesUnitPrice bean) {
-		if(Objects.isNull(bean.getOrganId())){
+
+		if(Objects.isNull(bean.getOrganId()) && GroupType.VIP.getCode().equals(bean.getGroupType())) {
 			throw new BizException("请选择分部");
 		}
 		VipGroupDefaultClassesUnitPrice byVipGroupCategory = vipGroupDefaultClassesUnitPriceDao.getByVipGroupCategory(bean.getVipGroupCategoryId(),

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

@@ -7,21 +7,12 @@ import static java.math.BigDecimal.*;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import com.ym.mec.biz.service.*;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -353,10 +344,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         }
         List<VipGroupStudentCoursePrice> vscps = vipGroup.getVipGroupApplyBaseInfo().getVipGroupStudentCoursePrices();
 
-
         // VIP课参数校验
         if (CourseSchedule.CourseScheduleType.VIP.getCode().equals(groupType)) {
+
+            // 校验VIP课参数
             vipGroupRequestParamValid(vipGroup, vipGroupApplyBaseInfoDto, totalClassTimes, firstCourseSchedule, latestCourseSchedule);
+
         }
 
         // LIVE课参数校验
@@ -378,9 +371,13 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         className.append(StringUtils.join(studentNames, ","));
         vipGroupApplyBaseInfoDto.setName(className.toString());
         vipGroupDao.insert(vipGroupApplyBaseInfoDto);
+
+        Map<String, BigDecimal> costInfo = Maps.newHashMap();
         //计算课程相关费用信息
-        Map<String, BigDecimal> costInfo = countVipGroupPredictFee1(vipGroupApplyBaseInfoDto,
-                vipGroupApplyBaseInfoDto.getUserId(), null);
+        if (CourseSchedule.CourseScheduleType.VIP.getCode().equals(groupType)) {
+            // 计算老师课薪
+            costInfo = countVipGroupPredictFee1(vipGroupApplyBaseInfoDto, vipGroupApplyBaseInfoDto.getUserId(), null);
+        }
 
         vipGroupApplyBaseInfoDto.setAuditStatus(AuditStatusEnum.PASS);
 
@@ -390,7 +387,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 //			vipGroupApplyBaseInfoDto.setAuditStatus(AuditStatusEnum.ING);
 //		}
 
-        vipGroupApplyBaseInfoDto.setTotalPrice(costInfo.get("totalPrice"));
+        vipGroupApplyBaseInfoDto.setTotalPrice(costInfo.getOrDefault("totalPrice", ZERO));
         if (CollectionUtils.isEmpty(vscps)) {
             vscps = new ArrayList<>();
             for (Integer canBuyStudentId : canBuyStudentIds) {
@@ -1675,7 +1672,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                     vipGroup.setOrganName(organNameMap.get(vipGroup.getOrganId()));
 
                     if ((Objects.isNull(aLong1) || aLong1 <= 0)
-                            && (classGroup.getStudentNum() <= 0)) {
+                            && (Objects.isNull(classGroup) || Optional.ofNullable(classGroup.getStudentNum()).orElse(0) <= 0)) {
                         vipGroup.setEnableDelete(1);
                     }
 

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

@@ -16,6 +16,7 @@
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
         <result column="tenant_id_" property="tenantId"/>
+        <result column="group_type_" property="groupType" />
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -79,7 +80,9 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="TeacherDefaultVipGroupSalary" parameterType="map">
-        SELECT tdvgs.*,vgc.name_ vip_group_category_name_,vgc.music_theory_ FROM teacher_default_vip_group_salary tdvgs
+        SELECT tdvgs.*,vgc.name_ vip_group_category_name_,vgc.music_theory_
+             , vgc.group_type_
+        FROM teacher_default_vip_group_salary tdvgs
         LEFT JOIN  vip_group_category vgc ON tdvgs.vip_group_category_id_ = vgc.id_
         <where>
         	tdvgs.tenant_id_ = #{tenantId}

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

@@ -16,6 +16,7 @@
 		<result column="online_classes_unit_price_" property="onlineClassesUnitPrice" />
 		<result column="offline_classes_unit_price_" property="offlineClassesUnitPrice" />
         <result column="tenant_id_" property="tenantId"/>
+		<result column="unit_price_id_" property="unitPriceId" />
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -36,8 +37,9 @@
 		    vgc.*
 		    , vgdcup.online_classes_unit_price_
 		    , vgdcup.offline_classes_unit_price_
+			, vgdcup.id_ AS unit_price_id_
 		FROM vip_group_category vgc
-		LEFT JOIN vip_group_default_classes_unit_price_ vgdcup ON vgc.id_=vgdcup.vip_group_category_id_ AND FIND_IN_SET(vgdcup.organ_id_,#{organId})
+		LEFT JOIN vip_group_default_classes_unit_price_ vgdcup ON vgc.id_=vgdcup.vip_group_category_id_ <if test="organId != null"> AND FIND_IN_SET(vgdcup.organ_id_,#{organId})</if>
 		WHERE vgc.del_flag_ != 1
 		<if test="groupType != null">
 			AND vgc.group_type_ = #{groupType}

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

@@ -239,12 +239,12 @@
          update_time_,teacher_school_id_,online_classes_num_,offline_classes_num_,registration_start_time_,
          name_,organ_id_list_,vip_group_activity_id_,group_status_,online_classes_unit_price_,offline_classes_unit_price_,
          total_price_,give_teach_mode_,vip_group_category_id_,organ_id_,stop_reason_,memo_,audit_status_,courses_start_date,
-         course_schedules_json_,student_id_list_,tenant_id_)
+         course_schedules_json_,student_id_list_,tenant_id_, group_type_)
         VALUES(#{id},#{userId},#{singleClassMinutes},#{paymentExpireDate},#{coursesExpireDate},now(),now(),#{teacherSchoolId},
                #{onlineClassesNum},#{offlineClassesNum},#{registrationStartTime},#{name},#{organIdList},#{vipGroupActivityId},
                #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{onlineClassesUnitPrice},#{offlineClassesUnitPrice},
                #{totalPrice},#{giveTeachMode},#{vipGroupCategoryId},#{organId},#{stopReason},#{memo},
-               #{auditStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{courseStartDate},#{courseSchedulesJson},#{studentIdList},#{tenantId})
+               #{auditStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{courseStartDate},#{courseSchedulesJson},#{studentIdList},#{tenantId}, #{groupType})
     </insert>
 
     <!-- 根据主键查询一条记录 -->

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

@@ -6,21 +6,27 @@ import com.ym.mec.biz.dal.dao.TeacherDao;
 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.service.VipGroupCategoryService;
+import com.ym.mec.biz.service.VipGroupDefaultClassesUnitPriceService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Api(tags = "vip课类别")
@@ -30,7 +36,8 @@ public class VipGroupCategoryController extends BaseController {
 
 	@Autowired
 	private VipGroupCategoryService vipGroupCategoryService;
-
+	@Autowired
+	private VipGroupDefaultClassesUnitPriceService vipGroupDefaultClassesUnitPriceService;
 	@Autowired
 	private SysUserFeignService sysUserFeignService;
 	
@@ -77,11 +84,43 @@ public class VipGroupCategoryController extends BaseController {
 	@ApiOperation("新增")
 	@PostMapping(value = "/add")
 	public Object add(VipGroupCategory vipGroupCategory) {
+
+		// 设置默认值
+		if (StringUtils.isBlank(vipGroupCategory.getGroupType())) {
+			vipGroupCategory.setGroupType("VIP");
+		}
+
 		Date date = new Date();
 		vipGroupCategory.setCreateTime(date);
 		vipGroupCategory.setUpdateTime(date);
 		vipGroupCategory.setDelFlag("0");
+
+		// 强制更新分类名称
+		if (CourseSchedule.CourseScheduleType.LIVE.getCode().equals(vipGroupCategory.getGroupType())) {
+			vipGroupCategory.setName(vipGroupCategory.getSingleClassMinutes());
+			vipGroupCategory.setStudentNum(0);
+		}
+
+		// 课程分类编号
 		vipGroupCategoryService.insert(vipGroupCategory);
+
+		// 直播流程，主动添加购买价格
+		if (CourseSchedule.CourseScheduleType.LIVE.getCode().equals(vipGroupCategory.getGroupType())) {
+
+			VipGroupDefaultClassesUnitPrice vipGroupDefaultClassesUnitPrice = new VipGroupDefaultClassesUnitPrice();
+			vipGroupDefaultClassesUnitPrice.setOrganId(vipGroupCategory.getTenantId());
+			vipGroupDefaultClassesUnitPrice.setVipGroupCategoryId(vipGroupCategory.getId());
+			vipGroupDefaultClassesUnitPrice.setGroupType(vipGroupCategory.getGroupType());
+			vipGroupDefaultClassesUnitPrice.setCreateTime(DateTime.now().toDate());
+			vipGroupDefaultClassesUnitPrice.setUpdateTime(DateTime.now().toDate());
+			// 售价
+			vipGroupDefaultClassesUnitPrice.setOnlineClassesUnitPrice(Optional.ofNullable(vipGroupCategory.getOnlineClassesUnitPrice()).orElse(BigDecimal.ZERO));
+			// 原价
+			vipGroupDefaultClassesUnitPrice.setOfflineClassesUnitPrice(Optional.ofNullable(vipGroupCategory.getOfflineClassesUnitPrice()).orElse(BigDecimal.ZERO));
+
+			vipGroupDefaultClassesUnitPriceService.insert(vipGroupDefaultClassesUnitPrice);
+		}
+
 		return succeed();
 	}
 

mec-web/src/main/java/com/ym/mec/web/controller/TeacherDefaultVipGroupSalaryController.java

@@ -1,19 +1,19 @@
 package com.ym.mec.web.controller;
 
+import com.ym.mec.common.page.PageInfo;
 import com.yonge.log.model.AuditLogAnnotation;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.ym.mec.biz.dal.entity.TeacherDefaultVipGroupSalary;
 import com.ym.mec.biz.service.TeacherDefaultVipGroupSalaryService;
@@ -40,10 +40,22 @@ public class TeacherDefaultVipGroupSalaryController extends BaseController {
     }
 
     @ApiOperation(value = "获取教师的vip课酬列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "search", value = "关键字匹配", dataType = "String", paramType = "query"),
+            @ApiImplicitParam(name = "groupType", value = "课程类型", dataType = "String", paramType = "query"),
+    })
     @GetMapping("/queryPageByTeacherId")
     @PreAuthorize("@pcs.hasPermissions('teacherDefaultVipGroupSalary/queryPageByTeacherId')")
-    public Object queryPageByTeacherId(QueryInfo queryInfo){
-        return succeed(teacherDefaultVipGroupSalaryService.queryPage(queryInfo));
+    public Object queryPageByTeacherId(QueryInfo queryInfo, @RequestParam(defaultValue = "VIP") String groupType){
+
+        PageInfo<TeacherDefaultVipGroupSalary> salaryPageInfo = teacherDefaultVipGroupSalaryService.queryPage(queryInfo);
+
+        List<TeacherDefaultVipGroupSalary> collect = salaryPageInfo.getRows().stream()
+                .filter(x -> x.getGroupType().equals(groupType)).collect(Collectors.toList());
+        // 重置过滤后的数据
+        salaryPageInfo.setRows(collect);
+
+        return succeed(salaryPageInfo);
     }
 
     @ApiOperation(value = "批量新增、修改教师vip课酬")

mec-web/src/main/java/com/ym/mec/web/controller/VipGroupCategoryController.java

@@ -1,18 +1,27 @@
 package com.ym.mec.web.controller;
 
+import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.dal.entity.VipGroupCategory;
+import com.ym.mec.biz.dal.entity.VipGroupDefaultClassesUnitPrice;
 import com.ym.mec.biz.service.VipGroupCategoryService;
+import com.ym.mec.biz.service.VipGroupDefaultClassesUnitPriceService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 @Api(tags = "vip课类别")
 @RequestMapping("vipGroupCategory")
@@ -21,6 +30,8 @@ public class VipGroupCategoryController extends BaseController {
 
 	@Autowired
 	private VipGroupCategoryService vipGroupCategoryService;
+	@Autowired
+	private VipGroupDefaultClassesUnitPriceService vipGroupDefaultClassesUnitPriceService;
 
 	@ApiOperation("单查询")
 	@GetMapping(value = "/query")
@@ -38,14 +49,29 @@ public class VipGroupCategoryController extends BaseController {
 	@GetMapping(value = "/queryAll")
     @PreAuthorize("@pcs.hasPermissions('vipGroupCategory/queryAll')")
 	public Object queryAll(String organId, @RequestParam(defaultValue = "VIP") String groupType) {
+
+		// 直播课强制转换为
+		if (CourseSchedule.CourseScheduleType.LIVE.getCode().equals(groupType)) {
+			organId = String.valueOf(TenantContextHolder.getTenantId());
+		}
+
 		return succeed(vipGroupCategoryService.findAllByOrgan(organId, groupType));
 	}
 
 	@ApiOperation("获取教师课酬")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "userId", value = "教师id", dataType = "Integer", paramType = "query"),
+			@ApiImplicitParam(name = "groupType", value = "课程类型", dataType = "String", paramType = "query", defaultValue = "VIP"),
+	})
 	@PostMapping(value = "/findTeacherDefaultSalary")
 	@PreAuthorize("@pcs.hasPermissions('vipGroupCategory/findTeacherDefaultSalary')")
-	public Object findTeacherDefaultSalary(Integer userId) {
-		return succeed(vipGroupCategoryService.findTeacherSalary(userId));
+	public Object findTeacherDefaultSalary(Integer userId, @RequestParam(defaultValue = "VIP") String groupType) {
+
+		// 返回LIVE, VIP课薪资设置
+		List<VipGroupCategory> teacherSalary = vipGroupCategoryService.findTeacherSalary(userId).stream()
+				.filter(x -> x.getGroupType().equals(groupType)).collect(Collectors.toList());
+		
+		return succeed(teacherSalary);
 	}
 
 	@ApiOperation("新增")
@@ -62,7 +88,33 @@ public class VipGroupCategoryController extends BaseController {
 		vipGroupCategory.setCreateTime(date);
 		vipGroupCategory.setUpdateTime(date);
 		vipGroupCategory.setDelFlag("0");
+
+		// 强制更新分类名称
+		if (CourseSchedule.CourseScheduleType.LIVE.getCode().equals(vipGroupCategory.getGroupType())) {
+			vipGroupCategory.setStudentNum(0);
+			vipGroupCategory.setName(vipGroupCategory.getSingleClassMinutes());
+		}
+
+		// 课程分类编号
 		vipGroupCategoryService.insert(vipGroupCategory);
+
+		// 直播流程，主动添加购买价格
+		if (CourseSchedule.CourseScheduleType.LIVE.getCode().equals(vipGroupCategory.getGroupType())) {
+
+			VipGroupDefaultClassesUnitPrice vipGroupDefaultClassesUnitPrice = new VipGroupDefaultClassesUnitPrice();
+			vipGroupDefaultClassesUnitPrice.setOrganId(vipGroupCategory.getTenantId());
+			vipGroupDefaultClassesUnitPrice.setVipGroupCategoryId(vipGroupCategory.getId());
+			vipGroupDefaultClassesUnitPrice.setGroupType(vipGroupCategory.getGroupType());
+			vipGroupDefaultClassesUnitPrice.setCreateTime(DateTime.now().toDate());
+			vipGroupDefaultClassesUnitPrice.setUpdateTime(DateTime.now().toDate());
+			// 售价
+			vipGroupDefaultClassesUnitPrice.setOnlineClassesUnitPrice(Optional.ofNullable(vipGroupCategory.getOnlineClassesUnitPrice()).orElse(BigDecimal.ZERO));
+			// 原价
+			vipGroupDefaultClassesUnitPrice.setOfflineClassesUnitPrice(Optional.ofNullable(vipGroupCategory.getOfflineClassesUnitPrice()).orElse(BigDecimal.ZERO));
+
+			vipGroupDefaultClassesUnitPriceService.insert(vipGroupDefaultClassesUnitPrice);
+		}
+
 		return succeed();
 	}