fix 讲义列表

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

@@ -184,4 +184,6 @@ public class GoodsAddBo {
     /** 显示排序字段 */
     @ApiModelProperty("显示排序字段")
     private Long showSort;
+    @ApiModelProperty("讲义列表")
+    private List<GoodsHandoutsAddBo> handoutsList;
 }

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

@@ -218,4 +218,6 @@ public class GoodsEditBo {
     /** 显示排序字段 */
     @ApiModelProperty("显示排序字段")
     private Long showSort;
+    @ApiModelProperty("讲义列表")
+    private List<GoodsHandoutsAddBo> handoutsList;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsHandoutsAddBo.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_handouts
+ *
+ * @author hjl
+ * @date 2023-02-10
+ */
+@Data
+@ApiModel("商品讲义添加对象")
+public class GoodsHandoutsAddBo {
+
+    /** 商品ID */
+    @ApiModelProperty("商品ID")
+    private Long goodsId;
+    /** 讲义ID */
+    @ApiModelProperty("讲义ID")
+    private Long handoutsId;
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Long sort;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+    /** 状态 1正常 0关闭 */
+    @ApiModelProperty("状态 1正常 0关闭")
+    private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsHandoutsEditBo.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_handouts
+ *
+ * @author hjl
+ * @date 2023-02-10
+ */
+@Data
+@ApiModel("商品讲义编辑对象")
+public class GoodsHandoutsEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 商品ID */
+    @ApiModelProperty("商品ID")
+    private Long goodsId;
+
+    /** 讲义ID */
+    @ApiModelProperty("讲义ID")
+    private Long handoutsId;
+
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Long sort;
+
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+    /** 状态 1正常 0关闭 */
+    @ApiModelProperty("状态 1正常 0关闭")
+    private Integer status;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsHandoutsQueryBo.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_handouts
+ *
+ * @author hjl
+ * @date 2023-02-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("商品讲义分页查询对象")
+public class GoodsHandoutsQueryBo 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 handoutsId;
+	/** 排序 */
+	@ApiModelProperty("排序")
+	private Long sort;
+	/** 状态 1正常 0关闭 */
+	@ApiModelProperty("状态 1正常 0关闭")
+	private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/GoodsHandouts.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_handouts
+ *
+ * @author hjl
+ * @date 2023-02-10
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("goods_handouts")
+public class GoodsHandouts implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 商品ID */
+    private Long goodsId;
+    /** 讲义ID */
+    private Long handoutsId;
+    /** 排序 */
+    private Long sort;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 状态 1正常 0关闭 */
+    private Integer status;
+}

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.goods.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.goods.domain.GoodsHandouts;
+
+/**
+ * 商品讲义Mapper接口
+ *
+ * @author hjl
+ * @date 2023-02-10
+ */
+public interface GoodsHandoutsMapper extends BaseMapper<GoodsHandouts> {
+
+}

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

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.goods.service;
+
+import com.zhongzheng.modules.goods.bo.GoodsHandoutsAddBo;
+import com.zhongzheng.modules.goods.bo.GoodsHandoutsEditBo;
+import com.zhongzheng.modules.goods.bo.GoodsHandoutsQueryBo;
+import com.zhongzheng.modules.goods.domain.GoodsHandouts;
+import com.zhongzheng.modules.goods.vo.GoodsHandoutsVo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 商品讲义Service接口
+ *
+ * @author hjl
+ * @date 2023-02-10
+ */
+public interface IGoodsHandoutsService extends IService<GoodsHandouts> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	GoodsHandoutsVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<GoodsHandoutsVo> queryList(GoodsHandoutsQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入商品讲义
+	 * @param bo 商品讲义新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(GoodsHandoutsAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改商品讲义
+	 * @param bo 商品讲义编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(GoodsHandoutsEditBo 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/impl/GoodsHandoutsServiceImpl.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.GoodsHandoutsAddBo;
+import com.zhongzheng.modules.goods.bo.GoodsHandoutsEditBo;
+import com.zhongzheng.modules.goods.bo.GoodsHandoutsQueryBo;
+import com.zhongzheng.modules.goods.domain.GoodsHandouts;
+import com.zhongzheng.modules.goods.mapper.GoodsHandoutsMapper;
+import com.zhongzheng.modules.goods.service.IGoodsHandoutsService;
+import com.zhongzheng.modules.goods.vo.GoodsHandoutsVo;
+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 2023-02-10
+ */
+@Service
+public class GoodsHandoutsServiceImpl extends ServiceImpl<GoodsHandoutsMapper, GoodsHandouts> implements IGoodsHandoutsService {
+
+    @Override
+    public GoodsHandoutsVo queryById(Long id){
+        GoodsHandouts db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, GoodsHandoutsVo.class);
+    }
+
+    @Override
+    public List<GoodsHandoutsVo> queryList(GoodsHandoutsQueryBo bo) {
+        LambdaQueryWrapper<GoodsHandouts> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getGoodsId() != null, GoodsHandouts::getGoodsId, bo.getGoodsId());
+        lqw.eq(bo.getHandoutsId() != null, GoodsHandouts::getHandoutsId, bo.getHandoutsId());
+        lqw.eq(bo.getSort() != null, GoodsHandouts::getSort, bo.getSort());
+        lqw.eq(bo.getStatus() != null, GoodsHandouts::getStatus, bo.getStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<GoodsHandoutsVo> entity2Vo(Collection<GoodsHandouts> collection) {
+        List<GoodsHandoutsVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, GoodsHandoutsVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<GoodsHandouts> page = (Page<GoodsHandouts>)collection;
+            Page<GoodsHandoutsVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(GoodsHandoutsAddBo bo) {
+        GoodsHandouts add = BeanUtil.toBean(bo, GoodsHandouts.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(GoodsHandoutsEditBo bo) {
+        GoodsHandouts update = BeanUtil.toBean(bo, GoodsHandouts.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(GoodsHandouts 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

@@ -252,6 +252,9 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     @Autowired
     private ISysGoodsCopyRecordService iGoodsCopyRecordService;
 
+    @Autowired
+    private IGoodsHandoutsService iGoodsHandoutsService;
+
     @Value("${oldStudySys.educationalInspector}")
     private String INFORM_PATH;
 
@@ -546,6 +549,19 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
             }
             iGoodsCourseService.saveBatch(coll);
         }
+        //讲义列表
+        if (bo.getHandoutsList() != null) {
+            Collection<GoodsHandouts> coll = new HashSet<>();
+            for (int i = 0; i < bo.getHandoutsList().size(); i++) {
+                GoodsHandoutsAddBo item = bo.getHandoutsList().get(i);
+                GoodsHandouts addItem = new GoodsHandouts();
+                addItem.setGoodsId(add.getGoodsId());
+                addItem.setHandoutsId(item.getHandoutsId());
+                addItem.setSort(item.getSort());
+                coll.add(addItem);
+            }
+            iGoodsHandoutsService.saveBatch(coll);
+        }
         //模块章列表
         if (bo.getMenuList() != null && bo.getMenuList().size() > 0) {
             CourseMenuListAddBo menuListAddBo = new CourseMenuListAddBo();
@@ -611,6 +627,20 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
             }
             iGoodsCourseService.saveBatch(coll);
         }
+        //讲义列表
+        if (bo.getHandoutsList() != null) {
+            iGoodsHandoutsService.remove(new LambdaQueryWrapper<GoodsHandouts>().eq(GoodsHandouts::getGoodsId, bo.getGoodsId()));
+            Collection<GoodsHandouts> coll = new HashSet<>();
+            for (int i = 0; i < bo.getHandoutsList().size(); i++) {
+                GoodsHandoutsAddBo item = bo.getHandoutsList().get(i);
+                GoodsHandouts addItem = new GoodsHandouts();
+                addItem.setGoodsId(update.getGoodsId());
+                addItem.setHandoutsId(item.getHandoutsId());
+                addItem.setSort(item.getSort());
+                coll.add(addItem);
+            }
+            iGoodsHandoutsService.saveBatch(coll);
+        }
         //购买须知
         if (Validator.isEmpty(bo.getBuyNote())) {
             LambdaUpdateWrapper<Goods> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsHandoutsVo.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 2023-02-10
+ */
+@Data
+@ApiModel("商品讲义视图对象")
+public class GoodsHandoutsVo {
+	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 handoutsId;
+	/** 排序 */
+	@Excel(name = "排序")
+	@ApiModelProperty("排序")
+	private Long sort;
+	/** 状态 1正常 0关闭 */
+	@Excel(name = "状态 1正常 0关闭")
+	@ApiModelProperty("状态 1正常 0关闭")
+	private Integer status;
+}

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsHandoutsMapper.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.GoodsHandoutsMapper">
+
+    <resultMap type="com.zhongzheng.modules.goods.domain.GoodsHandouts" id="GoodsHandoutsResult">
+        <result property="id" column="id"/>
+        <result property="goodsId" column="goods_id"/>
+        <result property="handoutsId" column="handouts_id"/>
+        <result property="sort" column="sort"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+    </resultMap>
+
+
+</mapper>