Merge branch 'active_course_2021-09-26～29' of http://git.dayaedu.com/yonge/mec into 2021-double-eleven

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

@@ -3455,9 +3455,11 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         }else if(!CollectionUtils.isEmpty(userCourseInfos)){
             BigDecimal historyPrice = ZERO;
             BigDecimal allPrice = ZERO;
+            int overNum = 0;
             for (StudentCourseInfoDto userCourseInfo : userCourseInfos) {
                 allPrice = allPrice.add(userCourseInfo.getExpectPrice());
                 if(now.after(userCourseInfo.getStartClassTime())){
+					overNum++;
                     historyPrice = historyPrice.add(userCourseInfo.getTeachMode().equals(TeachModeEnum.ONLINE)?vipGroup.getOnlineClassesUnitPrice():vipGroup.getOfflineClassesUnitPrice());
                 }
             }
@@ -3465,6 +3467,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             if(bigDecimal.compareTo(ZERO) < 0){
                 bigDecimal = ZERO;
             }
+            if(overNum == userCourseInfos.size()){
+				bigDecimal = ZERO;
+			}
 			result.put("suplusCourseOriginalFee", allPrice);
         }else{
 		    bigDecimal = new BigDecimal(0);