fix merger

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dto;
 
+import com.ym.mec.biz.dal.entity.Goods;
 import com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup;
 import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
 
@@ -20,6 +21,9 @@ public class MusicGroupSubjectGoodsAndInfoDto {
     //乐团计划及收费信息
     private MusicGroupSubjectPlan musicGroupSubjectPlan;
 
+    //其他商品（教材、琴谱）
+    private List<Goods> otherGoods;
+
     public Map getCourseScheduleInfo() {
         return CourseScheduleInfo;
     }
@@ -43,4 +47,12 @@ public class MusicGroupSubjectGoodsAndInfoDto {
     public void setMusicGroupSubjectPlan(MusicGroupSubjectPlan musicGroupSubjectPlan) {
         this.musicGroupSubjectPlan = musicGroupSubjectPlan;
     }
+
+    public List<Goods> getOtherGoods() {
+        return otherGoods;
+    }
+
+    public void setOtherGoods(List<Goods> otherGoods) {
+        this.otherGoods = otherGoods;
+    }
 }

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

@@ -76,10 +76,14 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
                 });
             }
         });
+        //获取声部（科目）下其他商品
+        List<Goods> otherGoods = goodsService.findGoodsBySubId(subjectId, "OTHER");
+
         MusicGroupSubjectGoodsAndInfoDto musicGroupSubjectGoodsAndInfo = new MusicGroupSubjectGoodsAndInfoDto();
         musicGroupSubjectGoodsAndInfo.setMusicGroupSubjectPlan(musicOneSubjectClassPlan);
         musicGroupSubjectGoodsAndInfo.setCourseScheduleInfo(courseForm);
         musicGroupSubjectGoodsAndInfo.setMusicGroupSubjectGoodsGroupList(goodsGroups);
+        musicGroupSubjectGoodsAndInfo.setOtherGoods(otherGoods);
         return musicGroupSubjectGoodsAndInfo;
     }