活动排课,资格管理

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

@@ -206,5 +206,5 @@ public interface ActivityUserMapperService extends BaseService<Integer, Activity
 
     ActivityUserMapperDao getDao();
 
-    void use(List<ActivityUserMapper> activityUserMappers, List<ActivityUserMapper> freeActivityUserMappers, int j, int a,Long groupId,CourseScheduleStudentPayment courseScheduleStudentPayment);
+    void use(List<ActivityUserMapper> activityUserMappers, List<ActivityUserMapper> freeActivityUserMappers, BaseMapDto<Integer,Integer> indexDto,Long groupId,CourseScheduleStudentPayment courseScheduleStudentPayment);
 }

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

@@ -1076,27 +1076,28 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 		return activityUserMapperDao;
 	}
 
+
 	@Override
 	public void use(List<ActivityUserMapper> activityUserMappers, List<ActivityUserMapper> freeActivityUserMappers,
-						  int j, int a,Long groupId,CourseScheduleStudentPayment courseScheduleStudentPayment) {
+										   BaseMapDto<Integer,Integer> indexDto,Long groupId,CourseScheduleStudentPayment courseScheduleStudentPayment) {
 		//扣除排课资格
-		if (!org.springframework.util.CollectionUtils.isEmpty(freeActivityUserMappers) && freeActivityUserMappers.size() > j) {
-			ActivityUserMapper activityUserMapper = freeActivityUserMappers.get(j);
-			Integer subCourseNum = activityUserMapper.getSubCourseNum();
+		if (!org.springframework.util.CollectionUtils.isEmpty(freeActivityUserMappers) && freeActivityUserMappers.size() > indexDto.getKey()) {
+			ActivityUserMapper activityUserMapper = freeActivityUserMappers.get(indexDto.getKey());
+			Integer subCourseNum = activityUserMapper.getSubGiveCourseNum();
 			if(subCourseNum == 1){
-				j++;
+				indexDto.setKey(indexDto.getKey() + 1);
 			}
-			activityUserMapper.setSubCourseNum(subCourseNum - 1);
+			activityUserMapper.setSubGiveCourseNum(subCourseNum - 1);
 			this.modifyGiveGroupId(activityUserMapper,groupId);
 			courseScheduleStudentPayment.setActivityUserMapperId(activityUserMapper.getId());
 			courseScheduleStudentPayment.setActualPrice(ZERO);
 			courseScheduleStudentPayment.setExpectPrice(ZERO);
-		}else if(!org.springframework.util.CollectionUtils.isEmpty(activityUserMappers) && activityUserMappers.size() > a){
-			ActivityUserMapper activityUserMapper = activityUserMappers.get(a);
+		}else if(!org.springframework.util.CollectionUtils.isEmpty(activityUserMappers) && activityUserMappers.size() > indexDto.getValue()){
+			ActivityUserMapper activityUserMapper = activityUserMappers.get(indexDto.getValue());
 			BigDecimal consumerPrice = ZERO;
 			Integer subCourseNum = activityUserMapper.getSubCourseNum();
 			if(subCourseNum == 1){
-				a++;
+				indexDto.setValue(indexDto.getValue() + 1);
 				consumerPrice = activityUserMapper.getSubNoCoursePrice();
 				activityUserMapper.setSubNoCoursePrice(ZERO);
 			}else {

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

@@ -3072,8 +3072,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         List<ActivityUserMapper> activityUserMappers = activityUserMapperService.getDao().findByStudents(studentIdList,vipGroup.getVipGroupCategoryId(),vipGroup.getSingleClassMinutes());
         //获取学员赠送排课资格
         List<ActivityUserMapper> freeActivityUserMappers = activityUserMapperService.getDao().findByStudents1(studentIdList,vipGroup.getVipGroupCategoryId(),vipGroup.getSingleClassMinutes());
-        int j = 0;
-        int a = 0;
+        BaseMapDto<Integer, Integer> indexDto = new BaseMapDto<>(0, 0);
         for (int i = 0; i < surplusCourseWithGroup.size(); i++) {
             CourseScheduleStudentPayment courseScheduleStudentPayment = new CourseScheduleStudentPayment();
             BigDecimal actualPrice = coursePrices.get(i);
@@ -3084,7 +3083,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                 courseBalance = courseBalance.subtract(actualPrice);
             }else {
                 //扣除排课资格
-                activityUserMapperService.use(activityUserMappers,freeActivityUserMappers,j,a,vipGroup.getId(),courseScheduleStudentPayment);
+                activityUserMapperService.use(activityUserMappers,freeActivityUserMappers,indexDto,vipGroup.getId(),courseScheduleStudentPayment);
             }
             courseScheduleStudentPayment.setGroupType(GroupType.VIP);
             courseScheduleStudentPayment.setMusicGroupId(studentRecoverInfo.getVipGroupId().toString());
@@ -3913,9 +3912,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             List<ActivityUserMapper> activityUserMappers = activityUserMapperService.getDao().findByStudents(studentIdList,vipGroup.getVipGroupCategoryId(),vipGroup.getSingleClassMinutes());
             //获取学员赠送排课资格
             List<ActivityUserMapper> freeActivityUserMappers = activityUserMapperService.getDao().findByStudents1(studentIdList,vipGroup.getVipGroupCategoryId(),vipGroup.getSingleClassMinutes());
-            int j = 0;
-            int a = 0;
-
+            BaseMapDto<Integer, Integer> indexDto = new BaseMapDto<>(0, 0);
             //实际支付金额，去除优惠券
             BigDecimal divide = ZERO;
             BigDecimal firstAmount = ZERO;
@@ -3940,7 +3937,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                     courseBalance = courseBalance.subtract(actualPrice);
                 }else {
                     //扣除排课资格
-                    activityUserMapperService.use(activityUserMappers, freeActivityUserMappers, j, a, vipGroup.getId(),courseScheduleStudentPayment);
+                    activityUserMapperService.use(activityUserMappers, freeActivityUserMappers,indexDto, vipGroup.getId(),courseScheduleStudentPayment);
                 }
                 courseScheduleStudentPayment.setGroupType(GroupType.VIP);
                 courseScheduleStudentPayment.setMusicGroupId(vipGroupId.toString());