Merge branch '2021-double-eleven' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MarketActivityDao.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.dao;
 import com.ym.mec.biz.dal.entity.ActivityDetailDto;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.biz.dal.entity.MarketActivity;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -16,5 +17,5 @@ public interface MarketActivityDao extends BaseDAO<Integer, MarketActivity> {
     * @author zx
     * @date 2021/10/19 15:50
     */
-    List<ActivityDetailDto> queryActivity(Integer marketPriceId);
+    List<ActivityDetailDto> queryActivity(@Param("marketPriceId") Integer marketPriceId, @Param("organId") Integer organId);
 }

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

@@ -31,7 +31,7 @@ public class MarketActivityServiceImpl extends BaseServiceImpl<Integer, MarketAc
 
     @Override
     public List<ActivityDetailDto> queryActivity(Integer marketPriceId,Integer organId) {
-		List<ActivityDetailDto> activityDetailDtos = marketActivityDao.queryActivity(marketPriceId);
+		List<ActivityDetailDto> activityDetailDtos = marketActivityDao.queryActivity(marketPriceId,organId);
 		activityDetailDtos.removeAll(Collections.singleton(null));
 		for (ActivityDetailDto activityDetailDto : activityDetailDtos) {
 			VipGroupDefaultClassesUnitPrice category = vipGroupDefaultClassesUnitPriceDao.getByVipGroupCategory(activityDetailDto.getCategoryId(), organId);

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

@@ -3536,7 +3536,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			bigDecimal = new BigDecimal(0);
 		}
 
-		if(vipGroupCategory.getStudentNum() <= 1){
+		if(vipGroupCategory == null || vipGroupCategory.getStudentNum() <= 1){
             bigDecimal = bigDecimal.multiply(new BigDecimal(0.8)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP);
         }else{
             bigDecimal = bigDecimal.multiply(new BigDecimal(0.7)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP);
@@ -3549,7 +3549,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			if(Objects.nonNull(studentPaymentOrder)){
 				BigDecimal suplusCourseOriginalFee = studentPaymentOrder.getActualAmount().add(studentPaymentOrder.getBalancePaymentAmount());
 				result.put("suplusCourseOriginalFee", suplusCourseOriginalFee);
-				if(vipGroupCategory.getStudentNum() <= 1){
+				if(vipGroupCategory == null || vipGroupCategory.getStudentNum() <= 1){
 					result.put("suplusCourseFee", suplusCourseOriginalFee.multiply(new BigDecimal(0.8)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP));
 				}else{
 					result.put("suplusCourseFee", suplusCourseOriginalFee.multiply(new BigDecimal(0.7)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP));

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

@@ -84,6 +84,6 @@
 		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_
-		WHERE ma.id_ = #{marketPriceId}
+		WHERE ma.id_ = #{marketPriceId} AND FIND_IN_SET(#{organId},vga.organ_id_)
 	</select>
 </mapper>