fix 试听配置

zhongzheng-admin/src/main/java/com/zhongzheng/controller/goods/GoodsController.java

@@ -145,14 +145,5 @@ public class GoodsController extends BaseController {
         return AjaxResult.success(list);
     }
 
-    /**
-     * 课程试听关系列表
-     */
-    @ApiOperation("课程试听列表")
-    @PreAuthorize("@ss.hasPermi('system:business:list')")
-    @GetMapping("/audition/list")
-    public AjaxResult<List<GoodsAuditionConfigVo>> auditionList(GoodsAuditionConfigQueryBo bo) {
-        List<GoodsAuditionConfigVo> list = iGoodsAuditionConfigService.queryList(bo);
-        return AjaxResult.success(list);
-    }
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsAddBo.java

@@ -109,7 +109,7 @@ public class GoodsAddBo {
     private Integer projectId;
     @ApiModelProperty("课程列表")
     private List<GoodsCourseAddBo> courseList;
-    @ApiModelProperty("试听列表")
+    @ApiModelProperty("试听配置列表")
     private List<GoodsAuditionConfigAddBo> auditionList;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -18,6 +18,7 @@ import com.zhongzheng.modules.goods.service.IGoodsAttachedService;
 import com.zhongzheng.modules.goods.service.IGoodsAuditionConfigService;
 import com.zhongzheng.modules.goods.service.IGoodsCourseService;
 import com.zhongzheng.modules.goods.service.IGoodsService;
+import com.zhongzheng.modules.goods.vo.GoodsAuditionConfigVo;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -27,10 +28,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.Page;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -57,7 +55,11 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     @Override
     public GoodsVo queryById(Long goodsId){
         Goods db = this.baseMapper.selectById(goodsId);
-        return BeanUtil.toBean(db, GoodsVo.class);
+        GoodsVo goodsVo = BeanUtil.toBean(db, GoodsVo.class);
+        if(db.getGoodsAuditionConfig()!=null){
+            goodsVo.setAuditionList(JSON.parseArray(db.getGoodsAuditionConfig(), GoodsAuditionConfigVo.class));
+        }
+        return goodsVo;
     }
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsVo.java

@@ -3,11 +3,13 @@ package com.zhongzheng.modules.goods.vo;
 import com.zhongzheng.common.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.math.BigDecimal;
+
+import com.zhongzheng.modules.goods.bo.GoodsAuditionConfigAddBo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -164,4 +166,7 @@ public class GoodsVo {
 	@Excel(name = "播放设置")
 	@ApiModelProperty("播放设置")
 	private String goodsPlayConfig;
+
+	@ApiModelProperty("试听配置列表")
+	private List<GoodsAuditionConfigVo> auditionList;
 }