fix 题库模块

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

@@ -3,9 +3,7 @@ package com.zhongzheng.controller.goods;
 import java.util.List;
 import java.util.Arrays;
 
-import com.zhongzheng.modules.goods.bo.GoodsAddBo;
-import com.zhongzheng.modules.goods.bo.GoodsEditBo;
-import com.zhongzheng.modules.goods.bo.GoodsQueryBo;
+import com.zhongzheng.modules.goods.bo.*;
 import com.zhongzheng.modules.goods.domain.Goods;
 import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
@@ -79,9 +77,9 @@ public class GoodsController extends BaseController {
     }
 
     /**
-     * 新增商品
+     * 新增课程商品
      */
-    @ApiOperation("新增商品")
+    @ApiOperation("新增课程商品")
     @PreAuthorize("@ss.hasPermi('system:goods:add')")
     @Log(title = "商品", businessType = BusinessType.INSERT)
     @PostMapping()
@@ -110,4 +108,27 @@ public class GoodsController extends BaseController {
     public AjaxResult<Void> remove(@PathVariable Long[] goodsIds) {
         return toAjax(iGoodsService.deleteWithValidByIds(Arrays.asList(goodsIds), true) ? 1 : 0);
     }*/
+
+    /**
+     * 新增题库商品
+     */
+    @ApiOperation("新增题库商品")
+    @PreAuthorize("@ss.hasPermi('system:goods:add')")
+    @Log(title = "商品", businessType = BusinessType.INSERT)
+    @PostMapping("/bank")
+    public AjaxResult<Void> addBank(@RequestBody GoodsBankAddBo bo) {
+        return toAjax(iGoodsService.insertBankByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改商品
+     */
+    @ApiOperation("修改题库商品")
+    @PreAuthorize("@ss.hasPermi('system:goods:edit')")
+    @Log(title = "题库商品", businessType = BusinessType.UPDATE)
+    @PostMapping("/bank/edit")
+    public AjaxResult<Void> editBank(@RequestBody GoodsBankEditBo bo) {
+        return toAjax(iGoodsService.updateBankByEditBo(bo) ? 1 : 0);
+    }
+
 }

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

@@ -0,0 +1,39 @@
+package com.zhongzheng.modules.goods.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 商品附加产品添加对象 goods_attached
+ *
+ * @author  hjl
+ * @date 2021-10-28
+ */
+@Data
+@ApiModel("商品附加产品添加对象")
+public class GoodsAttachedAddBo {
+
+    /** 商品id */
+    @ApiModelProperty("商品id")
+    private Long goodsId;
+    /** 主ID */
+    @ApiModelProperty("主ID")
+    private Long majorId;
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Integer sort;
+    /** 1模块卷 2章卷 3试卷 */
+    @ApiModelProperty("1模块卷 2章卷 3试卷")
+    private Integer type;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+}

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

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.goods.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 商品附加产品编辑对象 goods_attached
+ *
+ * @author  hjl
+ * @date 2021-10-28
+ */
+@Data
+@ApiModel("商品附加产品编辑对象")
+public class GoodsAttachedEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 商品id */
+    @ApiModelProperty("商品id")
+    private Long goodsId;
+
+    /** 主ID */
+    @ApiModelProperty("主ID")
+    private Long majorId;
+
+
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Integer sort;
+
+    /** 1模块卷 2章卷 3试卷 */
+    @ApiModelProperty("1模块卷 2章卷 3试卷")
+    private Integer type;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+}

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

@@ -0,0 +1,51 @@
+package com.zhongzheng.modules.goods.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 商品附加产品分页查询对象 goods_attached
+ *
+ * @author  hjl
+ * @date 2021-10-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("商品附加产品分页查询对象")
+public class GoodsAttachedQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 商品id */
+	@ApiModelProperty("商品id")
+	private Long goodsId;
+	/** 主ID */
+	@ApiModelProperty("主ID")
+	private Long majorId;
+	/** 排序 */
+	@ApiModelProperty("排序")
+	private Integer sort;
+	/** 1模块卷 2章卷 3试卷 */
+	@ApiModelProperty("1模块卷 2章卷 3试卷")
+	private Integer type;
+}

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

@@ -0,0 +1,109 @@
+package com.zhongzheng.modules.goods.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 商品添加对象 goods
+ *
+ * @author hjl
+ * @date 2021-10-12
+ */
+@Data
+@ApiModel("商品添加对象")
+public class GoodsBankAddBo {
+
+    /** 年份 */
+    @ApiModelProperty("年份")
+    private Long year;
+    /** 供应方（服务） */
+    @ApiModelProperty("供应方（服务）")
+    private Long supplyId;
+    /**商品类型 1视频2题库 3面授 4服务 5组合 */
+    @ApiModelProperty("商品类型 1视频2题库 3面授 4服务 5组合")
+    private Long goodsType;
+    /** 教育类型id */
+    @ApiModelProperty("教育类型id")
+    private Long educationTypeId;
+    /** 业务层次id */
+    @ApiModelProperty("业务层次id")
+    private Long businessId;
+    /** 所属院校 */
+    @ApiModelProperty("所属院校")
+    private Long schoolId;
+    /** 所属专业 */
+    @ApiModelProperty("所属专业")
+    private Long majorId;
+    /** 商品名称 */
+    @ApiModelProperty("商品名称")
+    private String goodsName;
+    /** 标准价格 */
+    @ApiModelProperty("标准价格")
+    private BigDecimal standPrice;
+    /** 最低价格 */
+    @ApiModelProperty("最低价格")
+    private BigDecimal lowestPrice;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+    /** 状态 1有效 0无效 */
+    @ApiModelProperty("状态 1有效 0无效")
+    private Integer status;
+    /** 有效期开始 */
+    @ApiModelProperty("有效期开始")
+    private Long validityStartTime;
+    /** 有效期结束 */
+    @ApiModelProperty("有效期结束")
+    private Long validityEndTime;
+    /** 学习有效期开始 */
+    @ApiModelProperty("学习有效期开始")
+    private Long studyStartTime;
+    /** 学习有效期结束 */
+    @ApiModelProperty("学习有效期结束")
+    private Long studyEndTime;
+    /** 证书ID，多个,拼接 */
+    @ApiModelProperty("证书ID，多个,拼接")
+    private String certificateIds;
+    /** 描述 */
+    @ApiModelProperty("描述")
+    private String introduce;
+    /** 适合对象 */
+    @ApiModelProperty("适合对象")
+    private String suitableObject;
+    /** 购买须知 */
+    @ApiModelProperty("购买须知")
+    private String buyNote;
+    /** PC详情 */
+    @ApiModelProperty("PC详情")
+    private String pcDetailHtml;
+    /** 手机详情 */
+    @ApiModelProperty("手机详情")
+    private String mobileDetailHtml;
+    /** 1上架 0未上架 */
+    @ApiModelProperty("1上架 0未上架")
+    private Integer goodsStatus;
+    /** 封面地址 */
+    @ApiModelProperty("封面地址")
+    private String coverUrl;
+    /** 学时 */
+    @ApiModelProperty("学时")
+    private Integer classHours;
+    /** 标准价格详情json */
+    @ApiModelProperty("标准价格详情json")
+    private String standPriceJson;
+    /** 编码 */
+    @ApiModelProperty("编码")
+    private String code;
+    /** 项目id */
+    @ApiModelProperty("项目id")
+    private Integer projectId;
+    @ApiModelProperty("题库列表")
+    private List<GoodsAttachedAddBo> bankList;
+}

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

@@ -0,0 +1,136 @@
+package com.zhongzheng.modules.goods.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 商品编辑对象 goods
+ *
+ * @author hjl
+ * @date 2021-10-12
+ */
+@Data
+@ApiModel("商品编辑对象")
+public class GoodsBankEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long goodsId;
+
+    /** 年份 */
+    @ApiModelProperty("年份")
+    private Long year;
+
+    /** 供应方（服务） */
+    @ApiModelProperty("供应方（服务）")
+    private Long supplyId;
+
+    /** 商品类型 1视频2题库 3面授 4服务 5组合 */
+    @ApiModelProperty("商品类型 1视频2题库 3面授 4服务 5组合")
+    private Long goodsType;
+
+    /** 教育类型id */
+    @ApiModelProperty("教育类型id")
+    private Long educationTypeId;
+
+    /** 业务层次id */
+    @ApiModelProperty("业务层次id")
+    private Long businessId;
+
+    /** 所属院校 */
+    @ApiModelProperty("所属院校")
+    private Long schoolId;
+
+    /** 所属专业 */
+    @ApiModelProperty("所属专业")
+    private Long majorId;
+
+    /** 商品名称 */
+    @ApiModelProperty("商品名称")
+    private String goodsName;
+
+    /** 标准价格 */
+    @ApiModelProperty("标准价格")
+    private BigDecimal standPrice;
+
+    /** 最低价格 */
+    @ApiModelProperty("最低价格")
+    private BigDecimal lowestPrice;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+    /** 状态 1有效 0无效 */
+    @ApiModelProperty("状态 1有效 0无效")
+    private Integer status;
+
+    /** 有效期开始 */
+    @ApiModelProperty("有效期开始")
+    private Long validityStartTime;
+
+    /** 有效期结束 */
+    @ApiModelProperty("有效期结束")
+    private Long validityEndTime;
+
+    /** 学习有效期开始 */
+    @ApiModelProperty("学习有效期开始")
+    private Long studyStartTime;
+
+    /** 学习有效期结束 */
+    @ApiModelProperty("学习有效期结束")
+    private Long studyEndTime;
+
+    /** 证书ID，多个,拼接 */
+    @ApiModelProperty("证书ID，多个,拼接")
+    private String certificateIds;
+
+    /** 描述 */
+    @ApiModelProperty("描述")
+    private String introduce;
+
+    /** 适合对象 */
+    @ApiModelProperty("适合对象")
+    private String suitableObject;
+
+    /** 购买须知 */
+    @ApiModelProperty("购买须知")
+    private String buyNote;
+
+    /** PC详情 */
+    @ApiModelProperty("PC详情")
+    private String pcDetailHtml;
+
+    /** 手机详情 */
+    @ApiModelProperty("手机详情")
+    private String mobileDetailHtml;
+
+    /** 1上架 0未上架 */
+    @ApiModelProperty("1上架 0未上架")
+    private Integer goodsStatus;
+
+    /** 封面地址 */
+    @ApiModelProperty("封面地址")
+    private String coverUrl;
+
+    /** 学时 */
+    @ApiModelProperty("学时")
+    private Integer classHours;
+
+    /** 标准价格详情json */
+    @ApiModelProperty("标准价格详情json")
+    private String standPriceJson;
+
+    /** 项目id */
+    @ApiModelProperty("项目id")
+    private Integer projectId;
+
+    @ApiModelProperty("题库列表")
+    private List<GoodsAttachedEditBo> bankList;
+
+
+}

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

@@ -0,0 +1,43 @@
+package com.zhongzheng.modules.goods.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 商品附加产品对象 goods_attached
+ *
+ * @author  hjl
+ * @date 2021-10-28
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("goods_attached")
+public class GoodsAttached implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 商品id */
+    private Long goodsId;
+    /** 主ID */
+    private Long majorId;
+    /** 排序 */
+    private Integer sort;
+    /** 1模块卷 2章卷 3试卷 */
+    private Integer type;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/mapper/GoodsAttachedMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.goods.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.goods.domain.GoodsAttached;
+
+/**
+ * 商品附加产品Mapper接口
+ *
+ * @author  hjl
+ * @date 2021-10-28
+ */
+public interface GoodsAttachedMapper extends BaseMapper<GoodsAttached> {
+
+}

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

@@ -0,0 +1,54 @@
+package com.zhongzheng.modules.goods.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.goods.bo.GoodsAttachedAddBo;
+import com.zhongzheng.modules.goods.bo.GoodsAttachedEditBo;
+import com.zhongzheng.modules.goods.bo.GoodsAttachedQueryBo;
+import com.zhongzheng.modules.goods.domain.GoodsAttached;
+import com.zhongzheng.modules.goods.vo.GoodsAttachedVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 商品附加产品Service接口
+ *
+ * @author  hjl
+ * @date 2021-10-28
+ */
+public interface IGoodsAttachedService extends IService<GoodsAttached> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	GoodsAttachedVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<GoodsAttachedVo> queryList(GoodsAttachedQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入商品附加产品
+	 * @param bo 商品附加产品新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(GoodsAttachedAddBo bo);
+
+
+
+	/**
+	 * 根据编辑业务对象修改商品附加产品
+	 * @param bo 商品附加产品编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(GoodsAttachedEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -1,9 +1,7 @@
 package com.zhongzheng.modules.goods.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.modules.goods.bo.GoodsAddBo;
-import com.zhongzheng.modules.goods.bo.GoodsEditBo;
-import com.zhongzheng.modules.goods.bo.GoodsQueryBo;
+import com.zhongzheng.modules.goods.bo.*;
 import com.zhongzheng.modules.goods.domain.Goods;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
 
@@ -38,6 +36,8 @@ public interface IGoodsService extends IService<Goods> {
 	 */
 	Boolean insertByAddBo(GoodsAddBo bo);
 
+	Boolean insertBankByAddBo(GoodsBankAddBo bo);
+
 	/**
 	 * 根据编辑业务对象修改商品
 	 * @param bo 商品编辑业务对象
@@ -45,6 +45,8 @@ public interface IGoodsService extends IService<Goods> {
 	 */
 	Boolean updateByEditBo(GoodsEditBo bo);
 
+	Boolean updateBankByEditBo(GoodsBankEditBo bo);
+
 	/**
 	 * 校验并删除数据
 	 * @param ids 主键集合

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

@@ -0,0 +1,102 @@
+package com.zhongzheng.modules.goods.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.goods.bo.GoodsAttachedAddBo;
+import com.zhongzheng.modules.goods.bo.GoodsAttachedEditBo;
+import com.zhongzheng.modules.goods.bo.GoodsAttachedQueryBo;
+import com.zhongzheng.modules.goods.domain.GoodsAttached;
+import com.zhongzheng.modules.goods.mapper.GoodsAttachedMapper;
+import com.zhongzheng.modules.goods.service.IGoodsAttachedService;
+import com.zhongzheng.modules.goods.vo.GoodsAttachedVo;
+import org.springframework.stereotype.Service;
+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 java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 商品附加产品Service业务层处理
+ *
+ * @author  hjl
+ * @date 2021-10-28
+ */
+@Service
+public class GoodsAttachedServiceImpl extends ServiceImpl<GoodsAttachedMapper, GoodsAttached> implements IGoodsAttachedService {
+
+    @Override
+    public GoodsAttachedVo queryById(Long id){
+        GoodsAttached db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, GoodsAttachedVo.class);
+    }
+
+    @Override
+    public List<GoodsAttachedVo> queryList(GoodsAttachedQueryBo bo) {
+        LambdaQueryWrapper<GoodsAttached> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getGoodsId() != null, GoodsAttached::getGoodsId, bo.getGoodsId());
+        lqw.eq(bo.getMajorId() != null, GoodsAttached::getMajorId, bo.getMajorId());
+        lqw.eq(bo.getSort() != null, GoodsAttached::getSort, bo.getSort());
+        lqw.eq(bo.getType() != null, GoodsAttached::getType, bo.getType());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<GoodsAttachedVo> entity2Vo(Collection<GoodsAttached> collection) {
+        List<GoodsAttachedVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, GoodsAttachedVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<GoodsAttached> page = (Page<GoodsAttached>)collection;
+            Page<GoodsAttachedVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(GoodsAttachedAddBo bo) {
+        GoodsAttached add = BeanUtil.toBean(bo, GoodsAttached.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(GoodsAttachedEditBo bo) {
+        GoodsAttached update = BeanUtil.toBean(bo, GoodsAttached.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(GoodsAttached entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

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

@@ -7,13 +7,12 @@ 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.bo.*;
 import com.zhongzheng.modules.goods.domain.Goods;
+import com.zhongzheng.modules.goods.domain.GoodsAttached;
 import com.zhongzheng.modules.goods.domain.GoodsCourse;
 import com.zhongzheng.modules.goods.mapper.GoodsMapper;
+import com.zhongzheng.modules.goods.service.IGoodsAttachedService;
 import com.zhongzheng.modules.goods.service.IGoodsCourseService;
 import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
@@ -46,6 +45,9 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     @Autowired
     private IGoodsCourseService iGoodsCourseService;
 
+    @Autowired
+    private IGoodsAttachedService iGoodsAttachedService;
+
     @Override
     public GoodsVo queryById(Long goodsId){
         Goods db = this.baseMapper.selectById(goodsId);
@@ -132,6 +134,28 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         return result;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertBankByAddBo(GoodsBankAddBo bo) {
+        Goods add = BeanUtil.toBean(bo, Goods.class);
+        add.setCode(ServletUtils.getEncoded("SP"));
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        boolean result = this.save(add);
+        if(bo.getBankList()!=null){
+            Collection<GoodsAttached> coll = new HashSet<>();
+            for(int i=0;i<bo.getBankList().size();i++){
+                GoodsAttachedAddBo item = bo.getBankList().get(i);
+                GoodsAttached addItem = BeanUtil.toBean(item, GoodsAttached.class);
+                addItem.setGoodsId(add.getGoodsId());
+                coll.add(addItem);
+            }
+            iGoodsAttachedService.saveBatch(coll);
+        }
+        return result;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean updateByEditBo(GoodsEditBo bo) {
@@ -154,6 +178,26 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         return this.updateById(update);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateBankByEditBo(GoodsBankEditBo bo) {
+        Goods update = BeanUtil.toBean(bo, Goods.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        if(bo.getBankList()!=null&&bo.getBankList().size()>0){
+            iGoodsAttachedService.remove(new LambdaQueryWrapper<GoodsAttached>().eq(GoodsAttached::getGoodsId, bo.getGoodsId()));
+            Collection<GoodsAttached> coll = new HashSet<>();
+            for(int i=0;i<bo.getBankList().size();i++){
+                GoodsAttachedEditBo item = bo.getBankList().get(i);
+                GoodsAttached addItem = BeanUtil.toBean(item, GoodsAttached.class);
+                addItem.setGoodsId(update.getGoodsId());
+                coll.add(addItem);
+            }
+            iGoodsAttachedService.saveBatch(coll);
+        }
+        return this.updateById(update);
+    }
+
     /**
      * 保存前的数据校验
      *

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

@@ -0,0 +1,43 @@
+package com.zhongzheng.modules.goods.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 商品附加产品视图对象 mall_package
+ *
+ * @author  hjl
+ * @date 2021-10-28
+ */
+@Data
+@ApiModel("商品附加产品视图对象")
+public class GoodsAttachedVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 商品id */
+	@Excel(name = "商品id")
+	@ApiModelProperty("商品id")
+	private Long goodsId;
+	/** 主ID */
+	@Excel(name = "主ID")
+	@ApiModelProperty("主ID")
+	private Long majorId;
+	/** 排序 */
+	@Excel(name = "排序")
+	@ApiModelProperty("排序")
+	private Integer sort;
+	/** 1模块卷 2章卷 3试卷 */
+	@Excel(name = "1模块卷 2章卷 3试卷")
+	@ApiModelProperty("1模块卷 2章卷 3试卷")
+	private Integer type;
+}

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.modules.goods.mapper.GoodsAttachedMapper">
+
+    <resultMap type="com.zhongzheng.modules.goods.domain.GoodsAttached" id="GoodsAttachedResult">
+        <result property="id" column="id"/>
+        <result property="goodsId" column="goods_id"/>
+        <result property="majorId" column="major_id"/>
+        <result property="sort" column="sort"/>
+        <result property="type" column="type"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>