Merge branch 'zouxuan_activity_2022-06-09' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -630,19 +630,19 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
             cloudTeacherOrder.setOrganId(studentPaymentOrder.getOrganId());
             cloudTeacherOrder.setAmount(studentPaymentOrder.getExpectAmount());
             cloudTeacherOrderService.save(cloudTeacherOrder,tenantConfigService.autoActivationFlag(cloudTeacherOrder.getTenantId()));
-
+            //赠送陪练课
+            ActivityUserMapper activityUserMapper = new ActivityUserMapper();
+            activityUserMapper.setTeacherId(student.getTeacherId());
+            activityUserMapper.setPaymentOrderId(studentPaymentOrder.getId());
+            activityUserMapper.setUserId(studentPaymentOrder.getUserId());
+            activityUserMapper.setActivityId(activity.getId());
+            activityUserMapper.setActualPrice(BigDecimal.ZERO);
+            activityUserMapper.setGivePracticeFlag(1);
+            activityUserMapper.setReturnFee(false);
             //如果是买的商品1那么赠送陪练课和训练营
             if(Objects.equals(studentPaymentOrder.getClassGroupId(),1)){
                 //赠送陪练课
-                ActivityUserMapper activityUserMapper = new ActivityUserMapper();
-                activityUserMapper.setTeacherId(student.getTeacherId());
-                activityUserMapper.setPaymentOrderId(studentPaymentOrder.getId());
-                activityUserMapper.setUserId(studentPaymentOrder.getUserId());
-                activityUserMapper.setActivityId(activity.getId());
-                activityUserMapper.setActualPrice(BigDecimal.ZERO);
                 activityUserMapper.setGivePracticeFlag(1);
-                activityUserMapper.setReturnFee(false);
-                activityUserMapperDao.insert(activityUserMapper);
                 //赠送训练营
                 TempLittleArtistTrainingCampUserRelation tempLittleArtistTrainingCamp = new TempLittleArtistTrainingCampUserRelation();
                 tempLittleArtistTrainingCamp.setUserId(studentPaymentOrder.getUserId());
@@ -650,6 +650,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
                 tempLittleArtistTrainingCamp.setCreateTime(nowDate);
                 tempLittleArtistTrainingCampUserRelationDao.insert(tempLittleArtistTrainingCamp);
             }
+            activityUserMapperDao.insert(activityUserMapper);
             //生成订单详情
             StudentPaymentOrderDetail studentPaymentOrderDetail = new StudentPaymentOrderDetail();
             studentPaymentOrderDetail.setPaymentOrderId(studentPaymentOrder.getId());