活动排课,资格管理

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();
 
-    BigDecimal use(List<ActivityUserMapper> activityUserMappers, List<ActivityUserMapper> freeActivityUserMappers, int j, int a,Long groupId);
+    void use(List<ActivityUserMapper> activityUserMappers, List<ActivityUserMapper> freeActivityUserMappers, int j, int a,Long groupId,CourseScheduleStudentPayment courseScheduleStudentPayment);
 }

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

@@ -1077,7 +1077,8 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 	}
 
 	@Override
-	public BigDecimal use(List<ActivityUserMapper> activityUserMappers, List<ActivityUserMapper> freeActivityUserMappers, int j, int a,Long groupId) {
+	public void use(List<ActivityUserMapper> activityUserMappers, List<ActivityUserMapper> freeActivityUserMappers,
+						  int j, int a,Long groupId,CourseScheduleStudentPayment courseScheduleStudentPayment) {
 		//扣除排课资格
 		if (!org.springframework.util.CollectionUtils.isEmpty(freeActivityUserMappers) && freeActivityUserMappers.size() > j) {
 			ActivityUserMapper activityUserMapper = freeActivityUserMappers.get(j);
@@ -1087,7 +1088,9 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 			}
 			activityUserMapper.setSubCourseNum(subCourseNum - 1);
 			this.modifyGiveGroupId(activityUserMapper,groupId);
-			return ZERO;
+			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);
 			BigDecimal consumerPrice = ZERO;
@@ -1105,7 +1108,9 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 			}
 			activityUserMapper.setSubCourseNum(subCourseNum - 1);
 			this.modifyGroupId(activityUserMapper,groupId);
-			return consumerPrice;
+			courseScheduleStudentPayment.setActivityUserMapperId(activityUserMapper.getId());
+			courseScheduleStudentPayment.setActualPrice(consumerPrice);
+			courseScheduleStudentPayment.setExpectPrice(consumerPrice);
 		}else {
 			throw new BizException("所选学员排课资格不足");
 		}

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

@@ -2552,11 +2552,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         }
         VipGroupCategory vipGroupCategory = vipGroupCategoryService.get(vipGroup.getVipGroupCategoryId().intValue());
         surplusCourseFee = sysUserCashAccountLogService.vipReturnFeeCharges(surplusCourseFee, vipGroupCategory == null ? 0 : vipGroupCategory.getStudentNum());
-//        if(vipGroupCategory.getStudentNum()<=1){
-//            surplusCourseFee = surplusCourseFee.multiply(new BigDecimal(0.8)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP);
-//        }else{
-//            surplusCourseFee = surplusCourseFee.multiply(new BigDecimal(0.7)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP);
-//        }
 
         studentApplyRefunds.setExpectAmount(surplusCourseFee);
         studentApplyRefunds.setStatus(StudentApplyRefundsStatus.ING);
@@ -3083,14 +3078,14 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             CourseScheduleStudentPayment courseScheduleStudentPayment = new CourseScheduleStudentPayment();
             BigDecimal actualPrice = coursePrices.get(i);
             courseScheduleStudentPayment.setExpectPrice(actualPrice);
+            courseScheduleStudentPayment.setActualPrice(actualPrice);
             //按课扣除课程余额
             if(courseBalance.compareTo(actualPrice) >= 0){
                 courseBalance = courseBalance.subtract(actualPrice);
             }else {
                 //扣除排课资格
-                actualPrice = activityUserMapperService.use(activityUserMappers,freeActivityUserMappers,j,a,vipGroup.getId());
+                activityUserMapperService.use(activityUserMappers,freeActivityUserMappers,j,a,vipGroup.getId(),courseScheduleStudentPayment);
             }
-            courseScheduleStudentPayment.setActualPrice(actualPrice);
             courseScheduleStudentPayment.setGroupType(GroupType.VIP);
             courseScheduleStudentPayment.setMusicGroupId(studentRecoverInfo.getVipGroupId().toString());
             courseScheduleStudentPayment.setMusicGroupId(classGroup.getMusicGroupId());
@@ -3945,7 +3940,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                     courseBalance = courseBalance.subtract(actualPrice);
                 }else {
                     //扣除排课资格
-                    courseScheduleStudentPayment.setActualPrice(activityUserMapperService.use(activityUserMappers,freeActivityUserMappers,j,a,vipGroup.getId()));
+                    activityUserMapperService.use(activityUserMappers, freeActivityUserMappers, j, a, vipGroup.getId(),courseScheduleStudentPayment);
                 }
                 courseScheduleStudentPayment.setGroupType(GroupType.VIP);
                 courseScheduleStudentPayment.setMusicGroupId(vipGroupId.toString());
@@ -3957,7 +3952,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                 } else if (vipGroupCourseSchedule.getTeachMode().equals(TeachModeEnum.ONLINE)) {
                     courseScheduleStudentPayment.setOriginalPrice(vipGroup.getOnlineClassesUnitPrice());
                 }
-                courseScheduleStudentPayment.setActualPrice(courseScheduleStudentPayment.getExpectPrice());
                 courseScheduleStudentPayment.setCreateTime(now);
                 courseScheduleStudentPayment.setUpdateTime(now);
                 courseScheduleStudentPayments.add(courseScheduleStudentPayment);