商品新增乐团收费模式字段，乐团选择商品时关联

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupSubjectPlanService.java

@@ -82,5 +82,5 @@ public interface MusicGroupSubjectPlanService extends BaseService<Integer, Music
      * @param chargeTypeId
      * @return
      */
-    List<MusicGroupGoodsAndDiscountDto> getSubjectGoods(Integer subjectId, String type, Integer chargeTypeId,Integer courseViewType);
+    List<MusicGroupGoodsAndDiscountDto> getSubjectGoods(Integer subjectId, String type, Integer chargeTypeId,Integer courseViewType,String musicGroupId);
 }

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

@@ -200,6 +200,12 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 		Map<String,String> columns = IniFileUtil.readIniFile(inputStream, TemplateTypeEnum.GOODS.getMsg());
 		List<Goods> goodsList = new ArrayList<>();
 		Map<String, Integer> map = getMap("goods_category","name_","id_",true,String.class,Integer.class);
+		Map<String,String> courseViewTypeMap = new HashMap<>();
+		courseViewTypeMap.put("系统收费","0");
+		courseViewTypeMap.put("系统收费\\课程收费","0,1");
+		courseViewTypeMap.put("系统收费\\云教练收费","0,2");
+		courseViewTypeMap.put("课程收费\\云教练收费","1,2");
+		courseViewTypeMap.put("系统收费\\课程收费\\云教练收费","0,1,2");
 		for (String e : sheetsListMap.keySet()) {
 			List<Map<String, Object>> sheet = sheetsListMap.get(e);
 			valueIsNull: for (Map<String, Object> row : sheet) {
@@ -216,6 +222,17 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 						LOGGER.error("商品导入异常：参数{}不可为空 param:{}",columnValue,objectMap);
 						continue valueIsNull;
 					}
+					if (columnValue.equals("courseViewType")) {
+						if(row.get(s) != null){
+							for (String courseViewType : courseViewTypeMap.keySet()) {
+								if (courseViewType.equals(row.get(s).toString())) {
+									objectMap.put(columnValue, courseViewTypeMap.get(courseViewType));
+									break;
+								}
+							}
+						}
+						continue;
+					}
 					if (columnValue.equals("type")) {
 						for (GoodsType goodsType : GoodsType.values()) {
 							if (goodsType.getDesc().equals(row.get(s).toString())) {

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

@@ -233,7 +233,11 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
     }
 
     @Override
-    public List<MusicGroupGoodsAndDiscountDto> getSubjectGoods(Integer subjectId, String type, Integer chargeTypeId,Integer courseViewType) {
+    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);
         if (chargeTypeId == null || (type != null && !"INSTRUMENT".equals(type))) {
             return goodsList;

mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupSubjectPlanController.java

@@ -74,15 +74,16 @@ public class MusicGroupSubjectPlanController extends BaseController {
     @ApiImplicitParams({ @ApiImplicitParam(name = "subjectId", value = "科目编号", required = true, dataType = "Integer"),
             @ApiImplicitParam(name = "type", value = "INSTRUMENT 乐器, ACCESSORIES 教辅", required = true, dataType = "String"),
             @ApiImplicitParam(name = "chargeTypeId", value = "收费模式id", required = true, dataType = "Integer"),
-            @ApiImplicitParam(name = "courseViewType", value = "收费模式", required = true, dataType = "Integer")
+            @ApiImplicitParam(name = "courseViewType", value = "收费模式", required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "musicGroupId")
     })
-    public HttpResponseResult getSubjectGoods(String subjectIds, String type, Integer chargeTypeId,Integer courseViewType) {
+    public HttpResponseResult getSubjectGoods(String subjectIds, String type, Integer chargeTypeId,Integer courseViewType,String musicGroupId) {
         if(StringUtils.isBlank(subjectIds)){
             return succeed();
         }
         Map<String, List<MusicGroupGoodsAndDiscountDto>> result = new HashMap<>();
         for (String subjectIdStr : subjectIds.split(",")) {
-            result.put(subjectIdStr, musicGroupSubjectPlanService.getSubjectGoods(Integer.valueOf(subjectIdStr), type, chargeTypeId,courseViewType));
+            result.put(subjectIdStr, musicGroupSubjectPlanService.getSubjectGoods(Integer.valueOf(subjectIdStr), type, chargeTypeId,courseViewType,musicGroupId));
         }
         return succeed(result);
     }

mec-web/src/main/resources/columnMapper.ini

@@ -18,6 +18,7 @@
 是否App展示 = clientShow
 是否在教务端展示 = educationalShow
 是否在乐团展示 = musicGroupShow
+乐团收费类型 = courseViewType
 是否乐器置换 = replacementShow
 库存类型 = stockType
 商品详情 = desc