update

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicGroupSubjectGoodsAndInfoDto.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.dto;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -12,6 +13,7 @@ import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
 import com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup;
 import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
+import com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail;
 
 /**
  * 乐团报名缴费相关信息
@@ -47,6 +49,8 @@ public class MusicGroupSubjectGoodsAndInfoDto {
     
     @ApiModelProperty(value = "会员权益",required = false)
     private List<MemberPrivilegesItem> memberPrivilegesItemList;
+    
+    private List<StudentPaymentOrderDetail> studentPaymentOrderDetailList;
 
     public Map getCourseScheduleInfo() {
         return CourseScheduleInfo;
@@ -127,4 +131,12 @@ public class MusicGroupSubjectGoodsAndInfoDto {
 	public void setMemberPrivilegesItemList(List<MemberPrivilegesItem> memberPrivilegesItemList) {
 		this.memberPrivilegesItemList = memberPrivilegesItemList;
 	}
+
+	public List<StudentPaymentOrderDetail> getStudentPaymentOrderDetailList() {
+		return studentPaymentOrderDetailList;
+	}
+
+	public void setStudentPaymentOrderDetailList(List<StudentPaymentOrderDetail> studentPaymentOrderDetailList) {
+		this.studentPaymentOrderDetailList = studentPaymentOrderDetailList;
+	}
 }

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

@@ -5,11 +5,15 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Resource;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSON;
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.ChargeTypeSubjectMapperDao;
 import com.ym.mec.biz.dal.dao.GoodsDao;
 import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderCourseSettingsDao;
@@ -30,6 +34,7 @@ import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
 import com.ym.mec.biz.dal.entity.OrganizationCloudTeacherFee;
 import com.ym.mec.biz.dal.entity.Subject;
 import com.ym.mec.biz.dal.enums.CourseViewTypeEnum;
+import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.GoodsType;
 import com.ym.mec.biz.service.GoodsService;
 import com.ym.mec.biz.service.MemberRankPrivilegesService;
@@ -77,6 +82,9 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
 
 	@Autowired
 	private MemberRankPrivilegesService memberRankPrivilegesService;
+	
+    @Resource
+    private SysUserFeignService sysUserFeignService;
 
     @Override
     public BaseDAO<Integer, MusicGroupSubjectPlan> getDAO() {
@@ -169,6 +177,14 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
 				musicGroupSubjectGoodsAndInfo.setMemberPrivilegesItemList(memberRankPrivilegesService.queryByMemberRankId(1));
 			}
 		}
+		
+		// 查询已购买内容
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser != null){
+        	Integer userId = sysUser.getId();
+        	musicGroupSubjectGoodsAndInfo.setStudentPaymentOrderDetailList(studentPaymentOrderDetailDao.findUserApplyOrder(userId, musicGroupId, DealStatusEnum.SUCCESS));
+        }
+        
         return musicGroupSubjectGoodsAndInfo;
     }