update 报名加上云教练+

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

@@ -36,6 +36,9 @@ public class MusicGroupSubjectGoodsAndInfoDto {
     @ApiModelProperty(value = "乐团云教练价格",required = false)
     private BigDecimal cloudTeacherFee;
 
+    @ApiModelProperty(value = "乐团云教练+价格",required = false)
+    private BigDecimal cloudTeacherPlusFee;
+
     public Map getCourseScheduleInfo() {
         return CourseScheduleInfo;
     }
@@ -99,4 +102,12 @@ public class MusicGroupSubjectGoodsAndInfoDto {
     public void setCloudTeacherFee(BigDecimal cloudTeacherFee) {
         this.cloudTeacherFee = cloudTeacherFee;
     }
+
+    public BigDecimal getCloudTeacherPlusFee() {
+        return cloudTeacherPlusFee;
+    }
+
+    public void setCloudTeacherPlusFee(BigDecimal cloudTeacherPlusFee) {
+        this.cloudTeacherPlusFee = cloudTeacherPlusFee;
+    }
 }

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

@@ -38,6 +38,9 @@ public class RegisterPayDto {
     @ApiModelProperty(value = "购买云教练",required = false)
     private Boolean buyCloudTeacher= false;
 
+    @ApiModelProperty(value = "购买云教练+",required = false)
+    private Boolean buyCloudTeacherPlus= false;
+
     public Integer getRegisterId() {
         return registerId;
     }
@@ -125,4 +128,12 @@ public class RegisterPayDto {
     public void setBuyCloudTeacher(Boolean buyCloudTeacher) {
         this.buyCloudTeacher = buyCloudTeacher;
     }
+
+    public Boolean getBuyCloudTeacherPlus() {
+        return buyCloudTeacherPlus;
+    }
+
+    public void setBuyCloudTeacherPlus(Boolean buyCloudTeacherPlus) {
+        this.buyCloudTeacherPlus = buyCloudTeacherPlus;
+    }
 }

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

@@ -16,6 +16,9 @@ public class OrganizationCloudTeacherFee {
     @ApiModelProperty(value = "云教练价格")
     private BigDecimal price;
 
+    @ApiModelProperty(value = "云教练+价格")
+    private BigDecimal plusPrice;
+
     private Date createTime;
 
     private Date updateTime;
@@ -39,6 +42,14 @@ public class OrganizationCloudTeacherFee {
         this.price = price;
     }
 
+    public BigDecimal getPlusPrice() {
+        return plusPrice;
+    }
+
+    public void setPlusPrice(BigDecimal plusPrice) {
+        this.plusPrice = plusPrice;
+    }
+
     public Date getCreateTime() {
         return createTime;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/CourseViewTypeEnum.java

@@ -5,7 +5,8 @@ import com.ym.mec.common.enums.BaseEnum;
 public enum CourseViewTypeEnum implements BaseEnum<Integer, CourseViewTypeEnum> {
     COURSE_lIST(0, "课程详情"),
     AMR(1, "器乐练习系统"),
-    CLOUD_TEACHER(2, "云教练收费");
+    CLOUD_TEACHER(2, "云教练收费"),
+    CLOUD_TEACHER_PLUS(3, "云教练+收费");
 
     private Integer code;
 

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

@@ -674,12 +674,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             orderAmount = orderAmount.add(maintenancePrice);
         }
 
-        //云教练
         MusicGroup musicGroup = musicGroupDao.get(studentRegistration.getMusicGroupId());
         studentRegistration.setOrganId(musicGroup.getOrganId());
-        if (registerPayDto.getBuyCloudTeacher()) {
+        //云教练/云教练+
+        if (registerPayDto.getBuyCloudTeacher() || registerPayDto.getBuyCloudTeacherPlus()) {
             OrganizationCloudTeacherFee cloudTeacher = organizationCloudTeacherFeeDao.getByOrganId(studentRegistration.getOrganId());
-            BigDecimal cloudTeacherPrice = cloudTeacher.getPrice();
+            BigDecimal cloudTeacherPrice = registerPayDto.getBuyCloudTeacher() ? cloudTeacher.getPrice() : cloudTeacher.getPlusPrice();
             orderAmount = orderAmount.add(cloudTeacherPrice);
         }
 
@@ -846,10 +846,10 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
         MusicGroup musicGroup = musicGroupDao.get(studentRegistration.getMusicGroupId());
         studentRegistration.setOrganId(musicGroup.getOrganId());
-        //云教练
-        if (registerPayDto.getBuyCloudTeacher()) {
+        //云教练/云教练+
+        if (registerPayDto.getBuyCloudTeacher() || registerPayDto.getBuyCloudTeacherPlus()) {
             OrganizationCloudTeacherFee cloudTeacher = organizationCloudTeacherFeeDao.getByOrganId(studentRegistration.getOrganId());
-            BigDecimal cloudTeacherPrice = cloudTeacher.getPrice();
+            BigDecimal cloudTeacherPrice = registerPayDto.getBuyCloudTeacher() ? cloudTeacher.getPrice() : cloudTeacher.getPlusPrice();
             orderAmount = orderAmount.add(cloudTeacherPrice);
         }
 

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

@@ -127,9 +127,10 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
         musicGroupSubjectGoodsAndInfo.setMusicGroupPaymentCalender(musicGroupRegCalender);
         musicGroupSubjectGoodsAndInfo.setMusicGroupSubjectGoodsGroupList(goodsGroups);
         musicGroupSubjectGoodsAndInfo.setMusicGroup(musicGroup);
-        if (musicGroup.getCourseViewType().equals(CourseViewTypeEnum.CLOUD_TEACHER)) {
+        if (musicGroup.getCourseViewType().equals(CourseViewTypeEnum.CLOUD_TEACHER) || musicGroup.getCourseViewType().equals(CourseViewTypeEnum.CLOUD_TEACHER_PLUS)) {
             OrganizationCloudTeacherFee cloudTeacherFee = organizationCloudTeacherFeeDao.getByOrganId(musicGroup.getOrganId());
             musicGroupSubjectGoodsAndInfo.setCloudTeacherFee(cloudTeacherFee.getPrice());
+            musicGroupSubjectGoodsAndInfo.setCloudTeacherPlusFee(cloudTeacherFee.getPlusPrice());
         }
         return musicGroupSubjectGoodsAndInfo;
     }
@@ -237,12 +238,12 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
     }
 
     @Override
-    public List<MusicGroupGoodsAndDiscountDto> getSubjectGoods(Integer subjectId, String type, Integer chargeTypeId,Integer courseViewType,String musicGroupId) {
-        if(StringUtils.isNotEmpty(musicGroupId)){
+    public List<MusicGroupGoodsAndDiscountDto> getSubjectGoods(Integer subjectId, String type, Integer chargeTypeId, Integer courseViewType, String musicGroupId) {
+        if (StringUtils.isNotEmpty(musicGroupId)) {
             MusicGroup musicGroup = musicGroupService.get(musicGroupId);
             courseViewType = musicGroup.getCourseViewType().getCode();
         }
-        List<MusicGroupGoodsAndDiscountDto> goodsList = goodsDao.getMusicGroupGoodsAndDiscount(subjectId, type,courseViewType);
+        List<MusicGroupGoodsAndDiscountDto> goodsList = goodsDao.getMusicGroupGoodsAndDiscount(subjectId, type, courseViewType);
         if (chargeTypeId == null || (type != null && !"INSTRUMENT".equals(type))) {
             return goodsList;
         }