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

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

@@ -195,6 +195,12 @@ public class ActivityController extends BaseController {
         Map<String, String> categoryMap = vipGroupCategoryDao.findConditionCategorys().stream().collect(Collectors.toMap(e-> e.getId().toString(), ConditionDto::getName));
         vipGroupActivity.setVipGroupCategoryNames(categoryMap.get(vipGroupActivity.getVipGroupCategoryIdList()));
         vipGroupActivity.setGiveCategoryName(categoryMap.get(vipGroupActivity.getGiveCategoryId()));
+        if (vipGroupActivity.getMemberRankId() != null) {
+            MemberRankSetting rankSetting = memberRankSettingService.get(vipGroupActivity.getMemberRankId());
+            if(rankSetting != null){
+                vipGroupActivity.setMemberRankName(rankSetting.getName());
+            }
+        }
         if (vipGroupActivity.getGiveMemberRankId() != null) {
             MemberRankSetting rankSetting = memberRankSettingService.get(vipGroupActivity.getGiveMemberRankId());
             if(rankSetting != null){

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/VipGroupActivity.java

@@ -73,6 +73,9 @@ public class VipGroupActivity{
 	@ApiModelProperty(value = "赠课名称")
 	private String giveMemberRankName;
 
+	@ApiModelProperty(value = "课名称")
+	private String memberRankName;
+
 	@ApiModelProperty(value = "课类型")
 	private String courseType;