Merge branch 'feature/1022_vip' of http://git.dayaedu.com/yonge/mec into feature/1022_vip

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

@@ -278,7 +278,7 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 		BigDecimal actualAmount;
 		if(vipGroupActivity.getActivityType().equals(1)){
 			//获取团练宝价格
-			actualAmount = memberFeeSettingService.getAmount(organId,1,
+			actualAmount = memberFeeSettingService.getAmount(organId, vipGroupActivity.getMemberRankId(),
 					vipGroupActivity.getPeriodEnum(),buyNum,
 					MemberFeeSettingServiceImpl::getCurrentFee);
 		}else {