Merge branch 'active_course_2021-09-26～29' of http://git.dayaedu.com/yonge/mec into 2021-double-eleven

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

@@ -4649,7 +4649,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 case TEACHER_DEFAULT:
                     break;
                 case FIXED_SALARY:
-                    results.put("onlineTeacherSalary",salarySettlement.getSettlementValue().setScale(0, BigDecimal.ROUND_HALF_UP));
+                    teacherDefaultSalary = salarySettlement.getSettlementValue().setScale(0, BigDecimal.ROUND_HALF_UP);
                     break;
                 default:
                     throw new BizException("错误的课酬结算标准!");
@@ -4951,7 +4951,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         applyBaseInfo.setCoursesExpireDate(latestCourseSchedule.getEndClassTime());
 
         applyBaseInfo.setPaymentExpireDate(DateUtil.getLastSecondWithDay(applyBaseInfo.getPaymentExpireDate()));
-
+        applyBaseInfo.setType(giveFlag?PracticeGroupType.FREE:PracticeGroupType.CHARGE);
         practiceGroupDao.insert(applyBaseInfo);
         //消耗排课资格
         List<Integer> activityUserMapperIds = activityUserMappers.stream().map(e -> e.getId()).collect(Collectors.toList());