活动排课

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

@@ -161,13 +161,13 @@ public class GroupClassServiceImpl implements GroupClassService {
         }
         Date now = new Date();
         if (groupType.equals(GroupType.PRACTICE)) {
-            BigDecimal refundAmount = returnFeeDto.getAmount();
+//            BigDecimal refundAmount = returnFeeDto.getAmount();
             PracticeGroup practiceGroup = practiceGroupDao.get(groupId);
             if (Objects.isNull(practiceGroup)) {
                 throw new BizException("指定的课程组不存在");
             }
             List<StudentPaymentOrder> orders = studentPaymentOrderDao.findOrderByGroup(practiceGroup.getId().toString(), GroupType.PRACTICE, DealStatusEnum.SUCCESS);
-            if (CollectionUtils.isEmpty(orders) && Objects.nonNull(refundAmount)) {
+            if (CollectionUtils.isEmpty(orders)) {
                 throw new BizException("未获取到订单");
             }
             if (!practiceGroup.getGroupStatus().equals(GroupStatusEnum.NORMAL) || practiceGroup.getCoursesExpireDate().before(now)) {
@@ -178,12 +178,12 @@ public class GroupClassServiceImpl implements GroupClassService {
             if(result.getCode() != 200){
                 return result;
             }
-            if (Objects.nonNull(refundAmount) && refundAmount.compareTo(BigDecimal.ZERO) > 0) {
-                if (refundAmount.compareTo(orders.get(0).getExpectAmount()) > 0) {
-                    throw new BizException("退款不可大于购买金额");
-                }
-                sysUserCashAccountService.updateBalance(practiceGroup.getStudentId(), refundAmount, PlatformCashAccountDetailTypeEnum.REFUNDS, "后台关闭网管课");
-            }
+//            if (Objects.nonNull(refundAmount) && refundAmount.compareTo(BigDecimal.ZERO) > 0) {
+//                if (refundAmount.compareTo(orders.get(0).getExpectAmount()) > 0) {
+//                    throw new BizException("退款不可大于购买金额");
+//                }
+//                sysUserCashAccountService.updateBalance(practiceGroup.getStudentId(), refundAmount, PlatformCashAccountDetailTypeEnum.REFUNDS, "后台关闭网管课");
+//            }
             cleanGroupInfo(groupId.toString(), GroupType.PRACTICE);
             practiceGroup.setMemo("后台关闭网管课");
             practiceGroup.setGroupStatus(GroupStatusEnum.CANCEL);

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

@@ -923,7 +923,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		if(CollectionUtils.isEmpty(vscps)){
 			vscps = new ArrayList<>();
 			for (Integer canBuyStudentId : canBuyStudentIds) {
-				vscps.add(new VipGroupStudentCoursePrice(canBuyStudentId, vipGroupApplyBaseInfoDto.getOfflineClassesUnitPrice(), vipGroupApplyBaseInfoDto.getOfflineClassesUnitPrice(), vipGroupApplyBaseInfoDto.getTotalPrice()));
+				vscps.add(new VipGroupStudentCoursePrice(canBuyStudentId, vipGroupApplyBaseInfoDto.getOnlineClassesUnitPrice(), vipGroupApplyBaseInfoDto.getOfflineClassesUnitPrice(), vipGroupApplyBaseInfoDto.getTotalPrice()));
 			}
 		}
 		Teacher teacher = teacherService.get(vipGroupApplyBaseInfoDto.getUserId());
@@ -1310,7 +1310,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		if(CollectionUtils.isEmpty(vscps)){
 			vscps = new ArrayList<>();
 			for (Integer canBuyStudentId : canBuyStudentIds) {
-				vscps.add(new VipGroupStudentCoursePrice(canBuyStudentId, applyBaseInfo.getOfflineClassesUnitPrice(), applyBaseInfo.getOfflineClassesUnitPrice(), applyBaseInfo.getTotalPrice()));
+				vscps.add(new VipGroupStudentCoursePrice(canBuyStudentId, applyBaseInfo.getOnlineClassesUnitPrice(), applyBaseInfo.getOfflineClassesUnitPrice(), applyBaseInfo.getTotalPrice()));
 			}
 		}
 		Teacher teacher = teacherService.get(applyBaseInfo.getUserId());
@@ -3513,7 +3513,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                 allPrice = allPrice.add(userCourseInfo.getExpectPrice());
                 if(now.after(userCourseInfo.getStartClassTime())){
 					overNum++;
-                    historyPrice = historyPrice.add(userCourseInfo.getTeachMode().equals(TeachModeEnum.ONLINE)?vipGroup.getOnlineClassesUnitPrice():vipGroup.getOfflineClassesUnitPrice());
+					historyPrice = historyPrice.add(userCourseInfo.getExpectPrice());
                 }
             }
             bigDecimal = allPrice.subtract(historyPrice);