fix

.idea/httpRequests/http-requests-log.http

@@ -39,6 +39,66 @@ Accept-Encoding: br,deflate,gzip,x-gzip
 
 ###
 
+POST http://127.0.0.1:8005/vipGroupCategory/add?name=测试2&singleClassMinutes=30&studentNum=2&musicTheory=false&groupType=LIVE&onlineClassesUnitPrice=1&offlineClassesUnitPrice=1
+Content-Type: application/x-www-form-urlencoded
+Authorization: bearer 4260a06a-5781-409d-810f-49a1b4092145
+Content-Length: 0
+Proxy-Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+<> 2023-05-31T170616.200.json
+
+###
+
+POST http://127.0.0.1:8005/vipGroupCategory/add?name=测试2&singleClassMinutes=30&studentNum=2&musicTheory=false&groupType=LIVE&onlineClassesUnitPrice=1&offlineClassesUnitPrice=1
+Content-Type: application/x-www-form-urlencoded
+Authorization: bearer 4260a06a-5781-409d-810f-49a1b4092145
+Content-Length: 0
+Proxy-Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+<> 2023-05-31T170238.200.json
+
+###
+
+POST http://127.0.0.1:8005/vipGroupCategory/add?name=测试2&singleClassMinutes=30&studentNum=2&musicTheory=false&groupType=LIVE&onlineClassesUnitPrice=1&offlineClassesUnitPrice=1
+Content-Type: application/x-www-form-urlencoded
+Authorization: bearer 4260a06a-5781-409d-810f-49a1b4092145
+Content-Length: 0
+Proxy-Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+<> 2023-05-31T170031.200.json
+
+###
+
+POST http://127.0.0.1:8005/vipGroupCategory/add?name=测试2&singleClassMinutes=30&studentNum=2&musicTheory=false&groupType=LIVE&onlineClassesUnitPrice=1&offlineClassesUnitPrice=1
+Content-Type: application/x-www-form-urlencoded
+Authorization: bearer 4260a06a-5781-409d-810f-49a1b4092145
+Content-Length: 0
+Proxy-Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+<> 2023-05-31T170025.200.json
+
+###
+
+POST http://127.0.0.1:8005/vipGroupCategory/add?name=测试2&singleClassMinutes=30&studentNum=2&musicTheory=false&groupType=LIVE&onlineClassesUnitPrice=1&offlineClassesUnitPrice=1
+Content-Type: application/x-www-form-urlencoded
+Authorization: bearer 4260a06a-5781-409d-810f-49a1b4092145
+Content-Length: 0
+Proxy-Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+<> 2023-05-31T165829.200.json
+
+###
+
 GET http://127.0.0.1:9001/imLiveBroadcastRoom/joinRoom?roomUid=LIVE-2248336-1684474334299&userId=2248479&microphoneFlag=false
 Authorization: bearer aeec0ea9-4079-4765-aa72-346a7d37e735
 Connection: Keep-Alive
@@ -372,7 +432,7 @@ Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-05-18T145937.200.json
+<> 2023-05-19T170850.200.json
 
 ###
 

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(-1);
+			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/VipGroupCategoryController.java

@@ -1,18 +1,24 @@
 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 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.Optional;
 
 @Api(tags = "vip课类别")
 @RequestMapping("vipGroupCategory")
@@ -21,6 +27,8 @@ public class VipGroupCategoryController extends BaseController {
 
 	@Autowired
 	private VipGroupCategoryService vipGroupCategoryService;
+	@Autowired
+	private VipGroupDefaultClassesUnitPriceService vipGroupDefaultClassesUnitPriceService;
 
 	@ApiOperation("单查询")
 	@GetMapping(value = "/query")
@@ -62,7 +70,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(-1);
+			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();
 	}