双十一活动

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

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.Collections;
 import java.util.List;
 
 @Service
@@ -30,6 +31,7 @@ public class MarketActivityServiceImpl extends BaseServiceImpl<Integer, MarketAc
     @Override
     public List<ActivityDetailDto> queryActivity(Integer marketPriceId,Integer organId) {
 		List<ActivityDetailDto> activityDetailDtos = marketActivityDao.queryActivity(marketPriceId);
+		activityDetailDtos.removeAll(Collections.singleton(null));
 		for (ActivityDetailDto activityDetailDto : activityDetailDtos) {
 			VipGroupDefaultClassesUnitPrice category = vipGroupDefaultClassesUnitPriceDao.getByVipGroupCategory(activityDetailDto.getCategoryId(), organId);
 			activityDetailDto.setOriginalPrice(activityDetailDto.getCourseNum().multiply(category.getOnlineClassesUnitPrice()).setScale(0, BigDecimal.ROUND_CEILING));