目录列表

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

@@ -8,6 +8,7 @@ import java.util.Date;
 
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 商品添加对象 goods
@@ -106,4 +107,6 @@ public class GoodsAddBo {
     /** 项目id */
     @ApiModelProperty("项目id")
     private Integer projectId;
+    @ApiModelProperty("课程列表")
+    private List<GoodsCourseAddBo> courseList;
 }

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

@@ -24,4 +24,7 @@ public class GoodsCourseAddBo {
     /** 课程ID */
     @ApiModelProperty("课程ID")
     private Long courseId;
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Integer sort;
 }

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

@@ -29,4 +29,8 @@ public class GoodsCourseEditBo {
     @ApiModelProperty("课程ID")
     private Long courseId;
 
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Integer sort;
+
 }

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

@@ -7,6 +7,7 @@ import lombok.Data;
 import java.util.Date;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 商品编辑对象 goods
@@ -130,5 +131,8 @@ public class GoodsEditBo {
     @ApiModelProperty("项目id")
     private Integer projectId;
 
+    @ApiModelProperty("课程列表")
+    private List<GoodsCourseAddBo> courseList;
+
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/GoodsCourse.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.goods.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -30,4 +31,6 @@ private static final long serialVersionUID=1L;
     private Long goodsId;
     /** 课程ID */
     private Long courseId;
+    /** 排序 */
+    private Integer sort;
 }

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

@@ -4,12 +4,17 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.modules.course.bo.CourseChapterSectionListAddBo;
+import com.zhongzheng.modules.course.domain.CourseChapterSection;
 import com.zhongzheng.modules.course.mapper.CourseChapterMapper;
 import com.zhongzheng.modules.goods.bo.GoodsAddBo;
+import com.zhongzheng.modules.goods.bo.GoodsCourseAddBo;
 import com.zhongzheng.modules.goods.bo.GoodsEditBo;
 import com.zhongzheng.modules.goods.bo.GoodsQueryBo;
 import com.zhongzheng.modules.goods.domain.Goods;
+import com.zhongzheng.modules.goods.domain.GoodsCourse;
 import com.zhongzheng.modules.goods.mapper.GoodsMapper;
+import com.zhongzheng.modules.goods.service.IGoodsCourseService;
 import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,9 +23,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.stream.Collectors;
 
@@ -36,6 +43,9 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     @Autowired
     private GoodsMapper goodsMapper;
 
+    @Autowired
+    private IGoodsCourseService iGoodsCourseService;
+
     @Override
     public GoodsVo queryById(Long goodsId){
         Goods db = this.baseMapper.selectById(goodsId);
@@ -99,20 +109,48 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByAddBo(GoodsAddBo bo) {
         Goods add = BeanUtil.toBean(bo, Goods.class);
         add.setCode(ServletUtils.getEncoded("SP"));
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
+        boolean result = this.save(add);
+        if(bo.getCourseList()!=null){
+            Collection<GoodsCourse> coll = new HashSet<>();
+            for(int i=0;i<bo.getCourseList().size();i++){
+                GoodsCourseAddBo item = bo.getCourseList().get(i);
+                GoodsCourse addItem = new GoodsCourse();
+                addItem.setGoodsId(add.getGoodsId());
+                addItem.setCourseId(item.getCourseId());
+                addItem.setSort(item.getSort());
+                coll.add(addItem);
+            }
+            iGoodsCourseService.saveBatch(coll);
+        }
+        return result;
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByEditBo(GoodsEditBo bo) {
         Goods update = BeanUtil.toBean(bo, Goods.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
+        if(bo.getCourseList()!=null){
+            iGoodsCourseService.remove(new LambdaQueryWrapper<GoodsCourse>().eq(GoodsCourse::getGoodsId, bo.getGoodsId()));
+            Collection<GoodsCourse> coll = new HashSet<>();
+            for(int i=0;i<bo.getCourseList().size();i++){
+                GoodsCourseAddBo item = bo.getCourseList().get(i);
+                GoodsCourse addItem = new GoodsCourse();
+                addItem.setGoodsId(update.getGoodsId());
+                addItem.setCourseId(item.getCourseId());
+                addItem.setSort(item.getSort());
+                coll.add(addItem);
+            }
+            iGoodsCourseService.saveBatch(coll);
+        }
         return this.updateById(update);
     }
 

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

@@ -32,4 +32,7 @@ public class GoodsCourseVo {
 	@Excel(name = "课程ID")
 	@ApiModelProperty("课程ID")
 	private Long courseId;
+	/** 排序 */
+	@ApiModelProperty("排序")
+	private Integer sort;
 }

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

@@ -151,4 +151,5 @@ public class GoodsVo {
 	private String schoolName;
 	@ApiModelProperty("专业名称")
 	private String categoryName;
+
 }

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsCourseMapper.xml

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id" column="id"/>
         <result property="goodsId" column="goods_id"/>
         <result property="courseId" column="course_id"/>
+        <result property="sort" column="sort"/>
     </resultMap>