商品

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

@@ -0,0 +1,112 @@
+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.service.IGoodsService;
+import com.zhongzheng.modules.goods.vo.GoodsVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 商品Controller
+ *
+ * @author hjl
+ * @date 2021-10-12
+ */
+@Api(value = "商品控制器", tags = {"商品管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/goods")
+public class GoodsController extends BaseController {
+
+    private final IGoodsService iGoodsService;
+
+    /**
+     * 查询商品列表
+     */
+    @ApiOperation("查询商品列表")
+    @PreAuthorize("@ss.hasPermi('system:goods:list')")
+    @GetMapping("/list")
+    public TableDataInfo<GoodsVo> list(GoodsQueryBo bo) {
+        startPage();
+        List<GoodsVo> list = iGoodsService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出商品列表
+     */
+    /*@ApiOperation("导出商品列表")
+    @PreAuthorize("@ss.hasPermi('system:goods:export')")
+    @Log(title = "商品", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<GoodsVo> export(GoodsQueryBo bo) {
+        List<GoodsVo> list = iGoodsService.queryList(bo);
+        ExcelUtil<GoodsVo> util = new ExcelUtil<GoodsVo>(GoodsVo.class);
+        return util.exportExcel(list, "商品");
+    }*/
+
+    /**
+     * 获取商品详细信息
+     */
+    @ApiOperation("获取商品详细信息")
+    @PreAuthorize("@ss.hasPermi('system:goods:query')")
+    @GetMapping("/{goodsId}")
+    public AjaxResult<GoodsVo> getInfo(@PathVariable("goodsId" ) Long goodsId) {
+        return AjaxResult.success(iGoodsService.queryById(goodsId));
+    }
+
+    /**
+     * 新增商品
+     */
+    @ApiOperation("新增商品")
+    @PreAuthorize("@ss.hasPermi('system:goods:add')")
+    @Log(title = "商品", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody GoodsAddBo bo) {
+        return toAjax(iGoodsService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改商品
+     */
+    @ApiOperation("修改商品")
+    @PreAuthorize("@ss.hasPermi('system:goods:edit')")
+    @Log(title = "商品", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody GoodsEditBo bo) {
+        return toAjax(iGoodsService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除商品
+     */
+   /* @ApiOperation("删除商品")
+    @PreAuthorize("@ss.hasPermi('system:goods:remove')")
+    @Log(title = "商品" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{goodsIds}")
+    public AjaxResult<Void> remove(@PathVariable Long[] goodsIds) {
+        return toAjax(iGoodsService.deleteWithValidByIds(Arrays.asList(goodsIds), true) ? 1 : 0);
+    }*/
+}

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

@@ -0,0 +1,103 @@
+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;
+
+
+import java.math.BigDecimal;
+
+/**
+ * 商品添加对象 goods
+ *
+ * @author hjl
+ * @date 2021-10-12
+ */
+@Data
+@ApiModel("商品添加对象")
+public class GoodsAddBo {
+
+    /** 年份 */
+    @ApiModelProperty("年份")
+    private Long year;
+    /** 供应方（服务）1祥粤自营 2中正合作 */
+    @ApiModelProperty("供应方（服务）1祥粤自营 2中正合作")
+    private Long supplier;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    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;
+}

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

@@ -0,0 +1,129 @@
+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;
+
+import java.math.BigDecimal;
+
+/**
+ * 商品编辑对象 goods
+ *
+ * @author hjl
+ * @date 2021-10-12
+ */
+@Data
+@ApiModel("商品编辑对象")
+public class GoodsEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long goodsId;
+
+    /** 年份 */
+    @ApiModelProperty("年份")
+    private Long year;
+
+    /** 供应方（服务）1祥粤自营 2中正合作 */
+    @ApiModelProperty("供应方（服务）1祥粤自营 2中正合作")
+    private Long supplier;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    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;
+
+}

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

@@ -0,0 +1,115 @@
+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 java.math.BigDecimal;
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 商品分页查询对象 goods
+ *
+ * @author hjl
+ * @date 2021-10-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("商品分页查询对象")
+public class GoodsQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 年份 */
+	@ApiModelProperty("年份")
+	private Long year;
+	/** 供应方（服务）1祥粤自营 2中正合作 */
+	@ApiModelProperty("供应方（服务）1祥粤自营 2中正合作")
+	private Long supplier;
+	/** $column.columnComment */
+	@ApiModelProperty("$column.columnComment")
+	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;
+	/** 状态 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;
+}

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

@@ -0,0 +1,85 @@
+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
+ *
+ * @author hjl
+ * @date 2021-10-12
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("goods")
+public class Goods implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "goods_id")
+    private Long goodsId;
+    /** 年份 */
+    private Long year;
+    /** 供应方（服务）1祥粤自营 2中正合作 */
+    private Long supplier;
+    /** $column.columnComment */
+    private Long goodsType;
+    /** 教育类型id */
+    private Long educationTypeId;
+    /** 业务层次id */
+    private Long businessId;
+    /** 所属院校 */
+    private Long schoolId;
+    /** 所属专业 */
+    private Long majorId;
+    /** 商品名称 */
+    private String goodsName;
+    /** 标准价格 */
+    private BigDecimal standPrice;
+    /** 最低价格 */
+    private BigDecimal lowestPrice;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 状态 1有效 0无效 */
+    private Integer status;
+    /** 有效期开始 */
+    private Long validityStartTime;
+    /** 有效期结束 */
+    private Long validityEndTime;
+    /** 学习有效期开始 */
+    private Long studyStartTime;
+    /** 学习有效期结束 */
+    private Long studyEndTime;
+    /** 证书ID，多个,拼接 */
+    private String certificateIds;
+    /** 描述 */
+    private String introduce;
+    /** 适合对象 */
+    private String suitableObject;
+    /** 购买须知 */
+    private String buyNote;
+    /** PC详情 */
+    private String pcDetailHtml;
+    /** 手机详情 */
+    private String mobileDetailHtml;
+    /** 1上架 0未上架 */
+    private Integer goodsStatus;
+    /** 封面地址 */
+    private String coverUrl;
+    /** 学时 */
+    private Integer classHours;
+    /** 标准价格详情json */
+    private String standPriceJson;
+}

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

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

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

@@ -0,0 +1,52 @@
+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.domain.Goods;
+import com.zhongzheng.modules.goods.vo.GoodsVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 商品Service接口
+ *
+ * @author hjl
+ * @date 2021-10-12
+ */
+public interface IGoodsService extends IService<Goods> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	GoodsVo queryById(Long goodsId);
+
+	/**
+	 * 查询列表
+	 */
+	List<GoodsVo> queryList(GoodsQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入商品
+	 * @param bo 商品新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(GoodsAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改商品
+	 * @param bo 商品编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(GoodsEditBo 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/GoodsServiceImpl.java

@@ -0,0 +1,123 @@
+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.GoodsAddBo;
+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.mapper.GoodsMapper;
+import com.zhongzheng.modules.goods.service.IGoodsService;
+import com.zhongzheng.modules.goods.vo.GoodsVo;
+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-12
+ */
+@Service
+public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements IGoodsService {
+
+    @Override
+    public GoodsVo queryById(Long goodsId){
+        Goods db = this.baseMapper.selectById(goodsId);
+        return BeanUtil.toBean(db, GoodsVo.class);
+    }
+
+    @Override
+    public List<GoodsVo> queryList(GoodsQueryBo bo) {
+        LambdaQueryWrapper<Goods> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getYear() != null, Goods::getYear, bo.getYear());
+        lqw.eq(bo.getSupplier() != null, Goods::getSupplier, bo.getSupplier());
+        lqw.eq(bo.getGoodsType() != null, Goods::getGoodsType, bo.getGoodsType());
+        lqw.eq(bo.getEducationTypeId() != null, Goods::getEducationTypeId, bo.getEducationTypeId());
+        lqw.eq(bo.getBusinessId() != null, Goods::getBusinessId, bo.getBusinessId());
+        lqw.eq(bo.getSchoolId() != null, Goods::getSchoolId, bo.getSchoolId());
+        lqw.eq(bo.getMajorId() != null, Goods::getMajorId, bo.getMajorId());
+        lqw.like(StrUtil.isNotBlank(bo.getGoodsName()), Goods::getGoodsName, bo.getGoodsName());
+        lqw.eq(bo.getStandPrice() != null, Goods::getStandPrice, bo.getStandPrice());
+        lqw.eq(bo.getLowestPrice() != null, Goods::getLowestPrice, bo.getLowestPrice());
+        lqw.eq(bo.getStatus() != null, Goods::getStatus, bo.getStatus());
+        lqw.eq(bo.getValidityStartTime() != null, Goods::getValidityStartTime, bo.getValidityStartTime());
+        lqw.eq(bo.getValidityEndTime() != null, Goods::getValidityEndTime, bo.getValidityEndTime());
+        lqw.eq(bo.getStudyStartTime() != null, Goods::getStudyStartTime, bo.getStudyStartTime());
+        lqw.eq(bo.getStudyEndTime() != null, Goods::getStudyEndTime, bo.getStudyEndTime());
+        lqw.eq(StrUtil.isNotBlank(bo.getCertificateIds()), Goods::getCertificateIds, bo.getCertificateIds());
+        lqw.eq(StrUtil.isNotBlank(bo.getIntroduce()), Goods::getIntroduce, bo.getIntroduce());
+        lqw.eq(StrUtil.isNotBlank(bo.getSuitableObject()), Goods::getSuitableObject, bo.getSuitableObject());
+        lqw.eq(StrUtil.isNotBlank(bo.getBuyNote()), Goods::getBuyNote, bo.getBuyNote());
+        lqw.eq(StrUtil.isNotBlank(bo.getPcDetailHtml()), Goods::getPcDetailHtml, bo.getPcDetailHtml());
+        lqw.eq(StrUtil.isNotBlank(bo.getMobileDetailHtml()), Goods::getMobileDetailHtml, bo.getMobileDetailHtml());
+        lqw.eq(bo.getGoodsStatus() != null, Goods::getGoodsStatus, bo.getGoodsStatus());
+        lqw.eq(StrUtil.isNotBlank(bo.getCoverUrl()), Goods::getCoverUrl, bo.getCoverUrl());
+        lqw.eq(bo.getClassHours() != null, Goods::getClassHours, bo.getClassHours());
+        lqw.eq(StrUtil.isNotBlank(bo.getStandPriceJson()), Goods::getStandPriceJson, bo.getStandPriceJson());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<GoodsVo> entity2Vo(Collection<Goods> collection) {
+        List<GoodsVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, GoodsVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<Goods> page = (Page<Goods>)collection;
+            Page<GoodsVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(GoodsAddBo bo) {
+        Goods add = BeanUtil.toBean(bo, Goods.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(GoodsEditBo bo) {
+        Goods update = BeanUtil.toBean(bo, Goods.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(Goods 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/vo/GoodsVo.java

@@ -0,0 +1,128 @@
+package com.zhongzheng.modules.goods.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.math.BigDecimal;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 商品视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2021-10-12
+ */
+@Data
+@ApiModel("商品视图对象")
+public class GoodsVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long goodsId;
+
+	/** 年份 */
+	@Excel(name = "年份")
+	@ApiModelProperty("年份")
+	private Long year;
+	/** 供应方（服务）1祥粤自营 2中正合作 */
+	@Excel(name = "供应方" , readConverterExp = "服=务")
+	@ApiModelProperty("供应方（服务）1祥粤自营 2中正合作")
+	private Long supplier;
+	/** $column.columnComment */
+	@Excel(name = "供应方" , readConverterExp = "$column.readConverterExp()")
+	@ApiModelProperty("$column.columnComment")
+	private Long goodsType;
+	/** 教育类型id */
+	@Excel(name = "教育类型id")
+	@ApiModelProperty("教育类型id")
+	private Long educationTypeId;
+	/** 业务层次id */
+	@Excel(name = "业务层次id")
+	@ApiModelProperty("业务层次id")
+	private Long businessId;
+	/** 所属院校 */
+	@Excel(name = "所属院校")
+	@ApiModelProperty("所属院校")
+	private Long schoolId;
+	/** 所属专业 */
+	@Excel(name = "所属专业")
+	@ApiModelProperty("所属专业")
+	private Long majorId;
+	/** 商品名称 */
+	@Excel(name = "商品名称")
+	@ApiModelProperty("商品名称")
+	private String goodsName;
+	/** 标准价格 */
+	@Excel(name = "标准价格")
+	@ApiModelProperty("标准价格")
+	private BigDecimal standPrice;
+	/** 最低价格 */
+	@Excel(name = "最低价格")
+	@ApiModelProperty("最低价格")
+	private BigDecimal lowestPrice;
+	/** 状态 1有效 0无效 */
+	@Excel(name = "状态 1有效 0无效")
+	@ApiModelProperty("状态 1有效 0无效")
+	private Integer status;
+	/** 有效期开始 */
+	@Excel(name = "有效期开始")
+	@ApiModelProperty("有效期开始")
+	private Long validityStartTime;
+	/** 有效期结束 */
+	@Excel(name = "有效期结束")
+	@ApiModelProperty("有效期结束")
+	private Long validityEndTime;
+	/** 学习有效期开始 */
+	@Excel(name = "学习有效期开始")
+	@ApiModelProperty("学习有效期开始")
+	private Long studyStartTime;
+	/** 学习有效期结束 */
+	@Excel(name = "学习有效期结束")
+	@ApiModelProperty("学习有效期结束")
+	private Long studyEndTime;
+	/** 证书ID，多个,拼接 */
+	@Excel(name = "证书ID，多个,拼接")
+	@ApiModelProperty("证书ID，多个,拼接")
+	private String certificateIds;
+	/** 描述 */
+	@Excel(name = "描述")
+	@ApiModelProperty("描述")
+	private String introduce;
+	/** 适合对象 */
+	@Excel(name = "适合对象")
+	@ApiModelProperty("适合对象")
+	private String suitableObject;
+	/** 购买须知 */
+	@Excel(name = "购买须知")
+	@ApiModelProperty("购买须知")
+	private String buyNote;
+	/** PC详情 */
+	@Excel(name = "PC详情")
+	@ApiModelProperty("PC详情")
+	private String pcDetailHtml;
+	/** 手机详情 */
+	@Excel(name = "手机详情")
+	@ApiModelProperty("手机详情")
+	private String mobileDetailHtml;
+	/** 1上架 0未上架 */
+	@Excel(name = "1上架 0未上架")
+	@ApiModelProperty("1上架 0未上架")
+	private Integer goodsStatus;
+	/** 封面地址 */
+	@Excel(name = "封面地址")
+	@ApiModelProperty("封面地址")
+	private String coverUrl;
+	/** 学时 */
+	@Excel(name = "学时")
+	@ApiModelProperty("学时")
+	private Integer classHours;
+	/** 标准价格详情json */
+	@Excel(name = "标准价格详情json")
+	@ApiModelProperty("标准价格详情json")
+	private String standPriceJson;
+}

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

@@ -0,0 +1,39 @@
+<?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.GoodsMapper">
+
+    <resultMap type="com.zhongzheng.modules.goods.domain.Goods" id="GoodsResult">
+        <result property="goodsId" column="goods_id"/>
+        <result property="year" column="year"/>
+        <result property="supplier" column="supplier"/>
+        <result property="goodsType" column="goods_type"/>
+        <result property="educationTypeId" column="education_type_id"/>
+        <result property="businessId" column="business_id"/>
+        <result property="schoolId" column="school_id"/>
+        <result property="majorId" column="major_id"/>
+        <result property="goodsName" column="goods_name"/>
+        <result property="standPrice" column="stand_price"/>
+        <result property="lowestPrice" column="lowest_price"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+        <result property="validityStartTime" column="validity_start_time"/>
+        <result property="validityEndTime" column="validity_end_time"/>
+        <result property="studyStartTime" column="study_start_time"/>
+        <result property="studyEndTime" column="study_end_time"/>
+        <result property="certificateIds" column="certificate_ids"/>
+        <result property="introduce" column="introduce"/>
+        <result property="suitableObject" column="suitable_object"/>
+        <result property="buyNote" column="buy_note"/>
+        <result property="pcDetailHtml" column="pc_detail_html"/>
+        <result property="mobileDetailHtml" column="mobile_detail_html"/>
+        <result property="goodsStatus" column="goods_status"/>
+        <result property="coverUrl" column="cover_url"/>
+        <result property="classHours" column="class_hours"/>
+        <result property="standPriceJson" column="stand_price_json"/>
+    </resultMap>
+
+
+</mapper>