update:会员团显示课程明细

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

@@ -3,10 +3,11 @@ package com.ym.mec.biz.dal.dto;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.ym.mec.biz.dal.entity.CourseSchedule.CourseScheduleType;
 import com.ym.mec.biz.dal.entity.Goods;
 import com.ym.mec.biz.dal.entity.MemberPrivilegesItem;
 import com.ym.mec.biz.dal.entity.MusicGroup;
@@ -51,6 +52,8 @@ public class MusicGroupSubjectGoodsAndInfoDto {
     private List<MemberPrivilegesItem> memberPrivilegesItemList;
     
     private List<StudentPaymentOrderDetail> studentPaymentOrderDetailList;
+    
+    private Map<CourseScheduleType, BigDecimal> memberCoursePrice = new HashMap<CourseScheduleType, BigDecimal>();
 
     public Map getCourseScheduleInfo() {
         return CourseScheduleInfo;
@@ -139,4 +142,12 @@ public class MusicGroupSubjectGoodsAndInfoDto {
 	public void setStudentPaymentOrderDetailList(List<StudentPaymentOrderDetail> studentPaymentOrderDetailList) {
 		this.studentPaymentOrderDetailList = studentPaymentOrderDetailList;
 	}
+
+	public Map<CourseScheduleType, BigDecimal> getMemberCoursePrice() {
+		return memberCoursePrice;
+	}
+
+	public void setMemberCoursePrice(Map<CourseScheduleType, BigDecimal> memberCoursePrice) {
+		this.memberCoursePrice = memberCoursePrice;
+	}
 }

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

@@ -186,6 +186,8 @@ public class MusicGroup {
 	private Integer cloudTeacherType;
 	
 	private Integer musicalInstrumentsProvideStatus;
+	
+	private Boolean memberCourseShowFlag;
 
 	public Integer getCloudTeacherType() {
 		return cloudTeacherType;
@@ -644,4 +646,12 @@ public class MusicGroup {
 	public void setMusicalInstrumentsProvideStatus(Integer musicalInstrumentsProvideStatus) {
 		this.musicalInstrumentsProvideStatus = musicalInstrumentsProvideStatus;
 	}
+
+	public Boolean getMemberCourseShowFlag() {
+		return memberCourseShowFlag;
+	}
+
+	public void setMemberCourseShowFlag(Boolean memberCourseShowFlag) {
+		this.memberCourseShowFlag = memberCourseShowFlag;
+	}
 }

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.service.impl;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -25,6 +26,7 @@ import com.ym.mec.biz.dal.dto.MusicGroupGoodsAndDiscountDto;
 import com.ym.mec.biz.dal.dto.MusicGroupRegRespDto;
 import com.ym.mec.biz.dal.dto.MusicGroupSubjectGoodsAndInfoDto;
 import com.ym.mec.biz.dal.entity.ChargeTypeSubjectMapper;
+import com.ym.mec.biz.dal.entity.CourseSchedule.CourseScheduleType;
 import com.ym.mec.biz.dal.entity.Goods;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
@@ -32,6 +34,7 @@ import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderCourseSettings;
 import com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup;
 import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
 import com.ym.mec.biz.dal.entity.OrganizationCloudTeacherFee;
+import com.ym.mec.biz.dal.entity.OrganizationCourseUnitPriceSettings;
 import com.ym.mec.biz.dal.entity.Subject;
 import com.ym.mec.biz.dal.enums.CourseViewTypeEnum;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
@@ -41,6 +44,7 @@ import com.ym.mec.biz.service.MemberRankPrivilegesService;
 import com.ym.mec.biz.service.MusicGroupService;
 import com.ym.mec.biz.service.MusicGroupSubjectGoodsGroupService;
 import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
+import com.ym.mec.biz.service.OrganizationCourseUnitPriceSettingsService;
 import com.ym.mec.biz.service.StudentRegistrationService;
 import com.ym.mec.biz.service.SubjectService;
 import com.ym.mec.common.dal.BaseDAO;
@@ -83,6 +87,9 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
 	@Autowired
 	private MemberRankPrivilegesService memberRankPrivilegesService;
 	
+	@Autowired
+	private OrganizationCourseUnitPriceSettingsService organizationCourseUnitPriceSettingsService;
+	
     @Resource
     private SysUserFeignService sysUserFeignService;
 
@@ -176,6 +183,19 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
 			} else{
 				musicGroupSubjectGoodsAndInfo.setMemberPrivilegesItemList(memberRankPrivilegesService.queryByMemberRankId(1));
 			}
+			
+			Map<CourseScheduleType, BigDecimal> memberCoursePrice = new HashMap<CourseScheduleType, BigDecimal>();
+			
+			OrganizationCourseUnitPriceSettings singleUnitPriceSettings = organizationCourseUnitPriceSettingsService.queryByOrganIdAndCourseTypeAndChargeType(musicGroup.getOrganId(), CourseScheduleType.SINGLE, musicGroup.getChargeTypeId());
+			if (singleUnitPriceSettings != null) {
+				memberCoursePrice.put(CourseScheduleType.SINGLE,
+						singleUnitPriceSettings.getUnitPrice().multiply(new BigDecimal(1980)).setScale(0, BigDecimal.ROUND_HALF_UP));
+			}
+			OrganizationCourseUnitPriceSettings mixUnitPriceSettings = organizationCourseUnitPriceSettingsService.queryByOrganIdAndCourseTypeAndChargeType(musicGroup.getOrganId(), CourseScheduleType.MIX, musicGroup.getChargeTypeId());
+			if (mixUnitPriceSettings != null) {
+				memberCoursePrice.put(CourseScheduleType.MIX,
+						mixUnitPriceSettings.getUnitPrice().multiply(new BigDecimal(1980)).setScale(0, BigDecimal.ROUND_HALF_UP));
+			}
 		}
 		
 		// 查询已购买内容

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

@@ -45,6 +45,7 @@
                 typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="is_show_record_of_student_" property="isShowRecordOfStudent"/>
         <result column="musical_instruments_provide_status_" property="musicalInstrumentsProvideStatus"/>
+        <result column="member_course_show_flag_" property="memberCourseShowFlag"/>
     </resultMap>
     
     <resultMap type="com.ym.mec.biz.dal.dto.MusicGroupBasicDto" id="MusicGroupBasicDto" extends="MusicGroup">