|
@@ -2835,7 +2835,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
if (Objects.isNull(practiceGroupBuyParams.getSubjectId())) {
|
|
|
return BaseController.failed(HttpStatus.EXPECTATION_FAILED, "请选择声部");
|
|
|
}
|
|
|
- if (Objects.isNull(practiceGroupBuyParams.getCourseTimes())) {
|
|
|
+ if (Objects.isNull(practiceGroupBuyParams.getAllCourseNum())) {
|
|
|
return BaseController.failed(HttpStatus.EXPECTATION_FAILED, "请选择需要购买的课时数");
|
|
|
}
|
|
|
if (Objects.isNull(practiceGroupBuyParams.getDrillTimesOnWeek())) {
|
|
@@ -2989,7 +2989,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
} else {
|
|
|
oneMonthPrice = practiceGroupBuyParams.getDrillTimesOnWeek() == 1 ? practiceGroupSellPrice.getOnceOriginalPrice() : practiceGroupSellPrice.getTwiceOriginalPrice();
|
|
|
}*/
|
|
|
- BigDecimal amount = oneMonthPrice.multiply(new BigDecimal(practiceGroupBuyParams.getCourseTimes()));
|
|
|
+ BigDecimal amount = oneMonthPrice.multiply(new BigDecimal(practiceGroupBuyParams.getAllCourseNum()));
|
|
|
|
|
|
practiceGroupBuyParams.setDrillTimesJson(drillTimesObject.toJSONString());
|
|
|
practiceGroupBuyParams.setOrganId(sysUser.getOrganId());
|
|
@@ -4381,6 +4381,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
if(Objects.nonNull(practiceGroup.getType())&&(PracticeGroupType.CARE_PACKAGE.equals(practiceGroup.getType())||PracticeGroupType.COME_ON_PACKAGE.equals(practiceGroup.getType()))){
|
|
|
practiceCourseMinutes = 50;
|
|
|
}
|
|
|
+
|
|
|
+ practiceBuyResult.setCourseNum(practiceGroup.getAllCourseNum());
|
|
|
|
|
|
if(StringUtils.isNotEmpty(practiceGroup.getDrillTimesJson())){
|
|
|
JSONArray coursesArry = new JSONArray();
|