ソースを参照

1、陪练课调整
2、付费陪练课可预约时间调整

Joburgess 5 年 前
コミット
27b28ff392

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/GroupClassServiceImpl.java

@@ -125,7 +125,7 @@ public class GroupClassServiceImpl implements GroupClassService {
                 throw new BizException("指定的课程组不存在");
             }
             List<StudentPaymentOrder> orders = studentPaymentOrderDao.findOrderByGroup(practiceGroup.getId().toString(), GroupType.PRACTICE, DealStatusEnum.SUCCESS);
-            if(CollectionUtils.isEmpty(orders)){
+            if(CollectionUtils.isEmpty(orders)&&Objects.nonNull(refundAmount)){
                 throw new BizException("未获取到订单");
             }
             if(refundAmount.compareTo(orders.get(0).getExpectAmount())>0){

+ 2 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/impl/PracticeGroupServiceImpl.java

@@ -1861,8 +1861,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         classGroupTeacherSalary.setClassGroupId(classGroup.getId());
         classGroupTeacherSalary.setTeacherRole(TeachTypeEnum.BISHOP);
         classGroupTeacherSalary.setUserId(practiceGroup.getUserId());
-        classGroupTeacherSalary.setSalary(new BigDecimal(practiceCourseSalaryConfig.getParanValue(Integer.class)));
-        classGroupTeacherSalary.setOnlineClassesSalary(new BigDecimal(practiceCourseSalaryConfig.getParanValue(Integer.class)));
+        classGroupTeacherSalary.setSalary(new BigDecimal(practiceCourseSalaryConfig.getParanValue()));
+        classGroupTeacherSalary.setOnlineClassesSalary(new BigDecimal(practiceCourseSalaryConfig.getParanValue()));
         classGroupTeacherSalary.setGroupType(GroupType.PRACTICE);
         classGroupTeacherSalary.setCreateTime(now);
         classGroupTeacherSalary.setUpdateTime(now);