|
@@ -6,7 +6,9 @@ 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;
|
|
@@ -14,14 +16,17 @@ 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课类别")
|
|
@@ -31,7 +36,8 @@ public class VipGroupCategoryController extends BaseController {
|
|
|
|
|
|
@Autowired
|
|
|
private VipGroupCategoryService vipGroupCategoryService;
|
|
|
-
|
|
|
+ @Autowired
|
|
|
+ private VipGroupDefaultClassesUnitPriceService vipGroupDefaultClassesUnitPriceService;
|
|
|
@Autowired
|
|
|
private SysUserFeignService sysUserFeignService;
|
|
|
|
|
@@ -89,12 +95,29 @@ public class VipGroupCategoryController extends BaseController {
|
|
|
vipGroupCategory.setUpdateTime(date);
|
|
|
vipGroupCategory.setDelFlag("0");
|
|
|
|
|
|
+ // 强制更新分类名称
|
|
|
+ if (CourseSchedule.CourseScheduleType.LIVE.getCode().equals(vipGroupCategory.getGroupType())) {
|
|
|
+ vipGroupCategory.setName(vipGroupCategory.getSingleClassMinutes());
|
|
|
+ }
|
|
|
+
|
|
|
// 课程分类编号
|
|
|
long vipCategoryId = vipGroupCategoryService.insert(vipGroupCategory);
|
|
|
|
|
|
// 直播流程,主动添加购买价格
|
|
|
if (CourseSchedule.CourseScheduleType.LIVE.getCode().equals(vipGroupCategory.getGroupType())) {
|
|
|
|
|
|
+ VipGroupDefaultClassesUnitPrice vipGroupDefaultClassesUnitPrice = new VipGroupDefaultClassesUnitPrice();
|
|
|
+ vipGroupDefaultClassesUnitPrice.setOrganId(-1);
|
|
|
+ vipGroupDefaultClassesUnitPrice.setVipGroupCategoryId((int) vipCategoryId);
|
|
|
+ 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();
|