小小训练营

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

@@ -4258,6 +4258,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
         applyBaseInfo.setPaymentExpireDate(DateUtil.getLastSecondWithDay(applyBaseInfo.getPaymentExpireDate()));
         applyBaseInfo.setType(giveFlag ? PracticeGroupType.FREE : PracticeGroupType.CHARGE);
+        applyBaseInfo.setMemo(activity.getName());
         practiceGroupDao.insert(applyBaseInfo);
         //消耗排课资格
         List<Integer> activityUserMapperIds = activityUserMappers.stream().map(e -> e.getId()).collect(Collectors.toList());
@@ -5052,9 +5053,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         practiceGroupBuyParams.setOrganId(sysUser.getOrganId());
         practiceGroupBuyParams.setSingleClassMinutes(practiceCourseMinutes);
         practiceGroupBuyParams.setGroupStatus(GroupStatusEnum.NORMAL);
-        practiceGroupBuyParams.setType(PracticeGroupType.CHARGE);
+        practiceGroupBuyParams.setType(PracticeGroupType.FREE);
         practiceGroupBuyParams.setMemo("小小训练营活动排课");
-        practiceGroupBuyParams.setActivityUserMapperId(activityUserMapper.getId());
+//        practiceGroupBuyParams.setActivityUserMapperId(activityUserMapper.getId());
         practiceGroupBuyParams.setVipGroupActivityId(activityUserMapper.getActivityId());
         practiceGroupDao.insert(practiceGroupBuyParams);