Merge branch 'online1' of http://git.dayaedu.com/yonge/mec

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

@@ -201,11 +201,13 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 		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");
+		courseViewTypeMap.put("课程收费","0");
+		courseViewTypeMap.put("系统收费","1");
+		courseViewTypeMap.put("云教练收费","2");
+		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) {

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

@@ -222,7 +222,7 @@ public class ExportController extends BaseController {
                     "零售价(元)", "商品团购价(元)", "商品描述", "商品详情", "是否上下架"}, new String[]{
                     "id", "sn", "brand", "name",
                     "complementGoodsIdList == null || complementGoodsIdList == '' ? '否':'是'", "clientShow.msg", "educationalShow.msg", "musicGroupShow.msg",
-                    "courseViewType == null?'':courseViewType == '0'?'系统收费':courseViewType == '0,1'?'系统收费\\课程收费':courseViewType == '0,2'?'系统收费\\\\云教练收费':courseViewType == '1,2'?'课程收费\\云教练收费':courseViewType == '0,1,2'?'系统收费\\课程收费\\云教练收费':''",
+                    "courseViewType == null?'':courseViewType == '0'?'系统收费':courseViewType == '0,1'?'系统收费,课程收费':courseViewType == '0,2'?'系统收费,云教练收费':courseViewType == '1,2'?'课程收费,云教练收费':courseViewType == '0,1,2'?'系统收费,课程收费,云教练收费':''",
                     "replacementShow.msg", "stockWarning.msg",
                     "type.desc", "goodsCategoryName", "specification", "stockCount", "taxStockCount", "stockType.msg", "marketPrice",
                     "discountPrice", "groupPurchasePrice", "brief", "desc", "status.msg"}, rows);