双十一活动

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

@@ -7,6 +7,7 @@ import com.ym.mec.biz.dal.entity.MarketActivity;
 import com.ym.mec.biz.dal.entity.VipGroupDefaultClassesUnitPrice;
 import com.ym.mec.biz.service.MarketActivityService;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -34,6 +35,9 @@ public class MarketActivityServiceImpl extends BaseServiceImpl<Integer, MarketAc
 		activityDetailDtos.removeAll(Collections.singleton(null));
 		for (ActivityDetailDto activityDetailDto : activityDetailDtos) {
 			VipGroupDefaultClassesUnitPrice category = vipGroupDefaultClassesUnitPriceDao.getByVipGroupCategory(activityDetailDto.getCategoryId(), organId);
+			if(category == null){
+				throw new BizException("请设置分部收费标准");
+			}
 			activityDetailDto.setOriginalPrice(activityDetailDto.getCourseNum().multiply(category.getOnlineClassesUnitPrice()).setScale(0, BigDecimal.ROUND_CEILING));
 		}
 		return activityDetailDtos;

mec-biz/src/main/resources/config/mybatis/MarketActivityMapper.xml

@@ -79,7 +79,8 @@
 		<result property="courseNum" column="course_num_"/>
 	</resultMap>
     <select id="queryActivity" resultMap="ActivityDetailDto">
-		SELECT vga.id_,vga.name_,vga.description_,vga.market_price_,vgc.name_ category_name_,vgc.id_ category_id_,vga.min_course_num_ course_num_
+		SELECT vga.id_,vga.name_,vga.description_,vga.market_price_,vgc.name_ category_name_,
+		vgc.id_ category_id_,vga.min_course_num_ course_num_
 		FROM market_activity ma
 		LEFT JOIN vip_group_activity vga ON FIND_IN_SET(vga.id_,ma.activity_ids_)
 		LEFT JOIN vip_group_category vgc ON vgc.id_ = vga.vip_group_category_id_list_

mec-student/src/main/java/com/ym/mec/student/controller/ActivityController.java

@@ -70,7 +70,7 @@ public class ActivityController extends BaseController {
             return failed("用户信息有误，没有分部信息");
         }
         Map<String,Object> resultMap = new HashMap<>(3);
-        resultMap.put("activityDetailList",marketActivityService.queryActivity(12,sysUser.getOrganId()));
+        resultMap.put("activityDetailList",marketActivityService.queryActivity(13,sysUser.getOrganId()));
         resultMap.put("horseRaceLampList",luckDrawPrizeService.queryHorseRaceLampDto(3));
         LuckDrawCount luckDrawCount = luckDrawCountService.findByIdAndGroupId(sysUser.getId(),3);
         if(luckDrawCount != null){