活动排课

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

@@ -182,8 +182,8 @@ public interface StudentPaymentOrderService extends BaseService<Long, StudentPay
      */
     Integer activityGive(Integer vipGroupActivityId,
                          StudentPaymentOrder studentPaymentOrder,
-                         Long vipGroupId,
-                         Long practiceGroupId,
+                         String vipGroupId,
+                         String practiceGroupId,
                          Integer teacherId);
 
     /**

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

@@ -3154,7 +3154,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         if (order.getStatus().equals(DealStatusEnum.SUCCESS)) {
             Integer activityUserMapperId = studentPaymentOrderService.activityGive(practiceGroup.getVipGroupActivityId(), order,
                     null,
-                    practiceGroup.getId(), practiceGroup.getUserId());
+                    practiceGroup.getId().toString(), practiceGroup.getUserId());
             practiceGroup.setActivityUserMapperId(activityUserMapperId);
             if (classGroup.getDelFlag() == 1) {
                 this.updatePracticeGroupStudentNumAndStatus(practiceGroup, classGroup, order);

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

@@ -762,13 +762,13 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Integer activityGive(Integer vipGroupActivityId, StudentPaymentOrder studentPaymentOrder, Long vipGroupId, Long practiceGroupId, Integer teacherId) {
+    public Integer activityGive(Integer vipGroupActivityId, StudentPaymentOrder studentPaymentOrder, String vipGroupId, String practiceGroupId, Integer teacherId) {
         Integer activityUserMapperId = null;
         if (vipGroupActivityId != null) {
             VipGroupActivity activity = vipGroupActivityDao.get(vipGroupActivityId);
             ActivityUserMapper activityUserMapper = new ActivityUserMapper();
-            activityUserMapper.setVipGroupId(vipGroupId.toString());
-            activityUserMapper.setPracticeGroupId(practiceGroupId.toString());
+            activityUserMapper.setVipGroupId(vipGroupId);
+            activityUserMapper.setPracticeGroupId(practiceGroupId);
             activityUserMapper.setPaymentOrderId(studentPaymentOrder.getId());
             activityUserMapper.setUserId(studentPaymentOrder.getUserId());
             activityUserMapper.setActivityId(vipGroupActivityId);

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

@@ -2761,7 +2761,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             } else {
                 //活动赠送
                 Integer activityUserMapperId = studentPaymentOrderService.activityGive(vipGroup.getVipGroupActivityId(), studentPaymentOrder,
-                        vipGroup.getId(), null, vipGroup.getUserId());
+                        vipGroup.getId().toString(), null, vipGroup.getUserId());
 
                 //生成班级学员关联
                 ClassGroupStudentMapper classGroupStudentMapper = new ClassGroupStudentMapper();