活动排课

mec-biz/src/main/java/com/ym/mec/biz/service/StudentPaymentOrderService.java

@@ -209,5 +209,5 @@ public interface StudentPaymentOrderService extends BaseService<Long, StudentPay
     * @author zx
     * @date 2021/10/11 10:36
     */
-    Integer activityGive(Integer vipGroupActivityId,Integer userId,Long paymentOrderId,Long vipGroupId,Long practiceGroupId,Integer buyNum);
+    Integer activityGive(Integer vipGroupActivityId,Integer userId,Long paymentOrderId,Long vipGroupId,Long practiceGroupId,Integer buyNum,Integer organId);
 }

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

@@ -3703,7 +3703,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                     order.getUserId(),
                     order.getId(),
                     null,
-                    practiceGroup.getId(),order.getActivityBuyNum());
+                    practiceGroup.getId(),order.getActivityBuyNum(),order.getOrganId());
             practiceGroup.setActivityUserMapperId(activityUserMapperId);
             if(classGroup.getDelFlag() == 1){
                 updatePracticeGroupStudentNumAndStatus(practiceGroup, classGroup,order);

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

@@ -716,7 +716,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Integer activityGive(Integer vipGroupActivityId, Integer userId, Long paymentOrderId,Long vipGroupId,Long practiceGroupId,Integer buyNum) {
+    public Integer activityGive(Integer vipGroupActivityId, Integer userId, Long paymentOrderId,Long vipGroupId,Long practiceGroupId,Integer buyNum,Integer organId) {
         Integer activityUserMapperId = null;
         if(vipGroupActivityId != null){
             ActivityUserMapper activityUserMapper = new ActivityUserMapper();
@@ -757,6 +757,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
                 cloudTeacherOrder.setLevel(activity.getGiveMemberRankId());
                 cloudTeacherOrder.setStudentId(userId);
                 cloudTeacherOrder.setType(2);
+                cloudTeacherOrder.setOrganId(organId);
                 PeriodEnum periodEnum = activity.getGivePeriodEnum();
                 switch (periodEnum){
                     case DAY:

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

@@ -2952,7 +2952,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 					userId,
 					studentPaymentOrder.getId(),
 					vipGroupId,
-					null,studentPaymentOrder.getActivityBuyNum());
+					null,studentPaymentOrder.getActivityBuyNum(),studentPaymentOrder.getOrganId());
 			if(classGroup.getDelFlag() == 1){
 				updateVipGroupStudentNumAndStatus(vipGroupId, classGroup,0,true);
 			}