Joburgess 5 سال پیش
والد
کامیت
ed6ea33677
1فایلهای تغییر یافته به همراه5 افزوده شده و 3 حذف شده
  1. 5 3
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

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

@@ -1910,6 +1910,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		if(vipGroup.getStatus().equals(VipGroupStatusEnum.CANCEL)){
 			throw new BizException("不能对已停止的课程进行退课操作");
 		}
+		Map<String,BigDecimal> result=new HashMap<>();
 		Date now = new Date();
         BigDecimal bigDecimal;
         List<StudentCourseInfoDto> userCourseInfos = courseScheduleDao.findUserCourseInfos(GroupType.VIP, vipGroupId.toString(), studentId, null);
@@ -1920,6 +1921,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             }else{
                 bigDecimal=studentPaymentOrder.getActualAmount();
             }
+
+			result.put("suplusCourseOriginalFee", bigDecimal);
         }else if(!CollectionUtils.isEmpty(userCourseInfos)){
             BigDecimal historyPrice=new BigDecimal(0);
             BigDecimal allPrice=new BigDecimal(0);
@@ -1933,10 +1936,11 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             if(bigDecimal.longValue()<0){
                 bigDecimal=new BigDecimal(0);
             }
+			result.put("suplusCourseOriginalFee", allPrice);
         }else{
 		    bigDecimal=new BigDecimal(0);
+			result.put("suplusCourseOriginalFee", bigDecimal);
         }
-        Map<String,BigDecimal> result=new HashMap<>();
 		ClassGroup classGroup = classGroupDao.findByVipGroup(vipGroupId, null);
 		if(Objects.isNull(classGroup)){
 			throw new BizException("未找到对应班级");
@@ -1947,8 +1951,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
         VipGroupCategory vipGroupCategory = vipGroupCategoryDao.get(vipGroup.getVipGroupCategoryId().intValue());
 
-		result.put("suplusCourseOriginalFee", bigDecimal);
-
 		if(vipGroupCategory.getStudentNum()<=1){
             bigDecimal = bigDecimal.multiply(new BigDecimal(0.8)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP);
         }else{