merge

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

@@ -103,6 +103,19 @@ public class GoodsController extends BaseController {
         return getDataTable(list);
     }
 
+    @ApiOperation("获取商品规格模板列表")
+    @GetMapping("/spec/list/{goodsId}")
+    public AjaxResult<List<GoodsSpecTemplateVo>> getSpecTemplateList(@PathVariable("goodsId") Long goodsId) {
+        List<GoodsSpecTemplateVo> list = iGoodsService.getSpecTemplateList(goodsId);
+        return AjaxResult.success(list);
+    }
+
+    @ApiOperation("修改商品默认规格模板")
+    @PostMapping("/update/spec")
+    public AjaxResult<Void> updateSpecTemplate(@RequestBody GoodsSpecTempEditBo bo) {
+        return toAjax(iGoodsService.updateSpecTemplate(bo) ? 1 : 0);
+    }
+
     /**
      * 导出商品列表
      */

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

@@ -0,0 +1,112 @@
+package com.zhongzheng.controller.goods;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.goods.bo.GoodsSpecAttributeAddBo;
+import com.zhongzheng.modules.goods.bo.GoodsSpecAttributeEditBo;
+import com.zhongzheng.modules.goods.bo.GoodsSpecAttributeQueryBo;
+import com.zhongzheng.modules.goods.service.IGoodsSpecAttributeService;
+import com.zhongzheng.modules.goods.vo.GoodsSpecAttributeVo;
+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 ruoyi
+ * @date 2022-09-29
+ */
+@Api(value = "【请填写功能名称】控制器", tags = {"【请填写功能名称】管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/attribute")
+public class GoodsSpecAttributeController extends BaseController {
+
+    private final IGoodsSpecAttributeService iGoodsSpecAttributeService;
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @ApiOperation("查询【请填写功能名称】列表")
+    @PreAuthorize("@ss.hasPermi('system:attribute:list')")
+    @GetMapping("/list")
+    public TableDataInfo<GoodsSpecAttributeVo> list(GoodsSpecAttributeQueryBo bo) {
+        startPage();
+        List<GoodsSpecAttributeVo> list = iGoodsSpecAttributeService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    @ApiOperation("导出【请填写功能名称】列表")
+    @PreAuthorize("@ss.hasPermi('system:attribute:export')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<GoodsSpecAttributeVo> export(GoodsSpecAttributeQueryBo bo) {
+        List<GoodsSpecAttributeVo> list = iGoodsSpecAttributeService.queryList(bo);
+        ExcelUtil<GoodsSpecAttributeVo> util = new ExcelUtil<GoodsSpecAttributeVo>(GoodsSpecAttributeVo.class);
+        return util.exportExcel(list, "【请填写功能名称】");
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @ApiOperation("获取【请填写功能名称】详细信息")
+    @PreAuthorize("@ss.hasPermi('system:attribute:query')")
+    @GetMapping("/{specAttributeId}")
+    public AjaxResult<GoodsSpecAttributeVo> getInfo(@PathVariable("specAttributeId" ) Long specAttributeId) {
+        return AjaxResult.success(iGoodsSpecAttributeService.queryById(specAttributeId));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @ApiOperation("新增【请填写功能名称】")
+    @PreAuthorize("@ss.hasPermi('system:attribute:add')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody GoodsSpecAttributeAddBo bo) {
+        return toAjax(iGoodsSpecAttributeService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @ApiOperation("修改【请填写功能名称】")
+    @PreAuthorize("@ss.hasPermi('system:attribute:edit')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public AjaxResult<Void> edit(@RequestBody GoodsSpecAttributeEditBo bo) {
+        return toAjax(iGoodsSpecAttributeService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     */
+    @ApiOperation("删除【请填写功能名称】")
+    @PreAuthorize("@ss.hasPermi('system:attribute:remove')")
+    @Log(title = "【请填写功能名称】" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{specAttributeIds}")
+    public AjaxResult<Void> remove(@PathVariable Long[] specAttributeIds) {
+        return toAjax(iGoodsSpecAttributeService.deleteWithValidByIds(Arrays.asList(specAttributeIds), true) ? 1 : 0);
+    }
+}

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

@@ -0,0 +1,108 @@
+package com.zhongzheng.controller.goods;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.goods.bo.GoodsSpecAttributeRelationAddBo;
+import com.zhongzheng.modules.goods.bo.GoodsSpecAttributeRelationEditBo;
+import com.zhongzheng.modules.goods.bo.GoodsSpecAttributeRelationQueryBo;
+import com.zhongzheng.modules.goods.service.IGoodsSpecAttributeRelationService;
+import com.zhongzheng.modules.goods.vo.GoodsSpecAttributeRelationVo;
+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 ruoyi
+ * @date 2022-09-29
+ */
+@Api(value = "规格属性关联控制器", tags = {"规格属性关联管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/relation")
+public class GoodsSpecAttributeRelationController extends BaseController {
+
+    private final IGoodsSpecAttributeRelationService iGoodsSpecAttributeRelationService;
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @ApiOperation("查询【请填写功能名称】列表")
+    @PreAuthorize("@ss.hasPermi('system:relation:list')")
+    @GetMapping("/list")
+    public TableDataInfo<GoodsSpecAttributeRelationVo> list(GoodsSpecAttributeRelationQueryBo bo) {
+        startPage();
+        List<GoodsSpecAttributeRelationVo> list = iGoodsSpecAttributeRelationService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    @ApiOperation("导出【请填写功能名称】列表")
+    @PreAuthorize("@ss.hasPermi('system:relation:export')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<GoodsSpecAttributeRelationVo> export(GoodsSpecAttributeRelationQueryBo bo) {
+        List<GoodsSpecAttributeRelationVo> list = iGoodsSpecAttributeRelationService.queryList(bo);
+        ExcelUtil<GoodsSpecAttributeRelationVo> util = new ExcelUtil<GoodsSpecAttributeRelationVo>(GoodsSpecAttributeRelationVo.class);
+        return util.exportExcel(list, "【请填写功能名称】");
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @ApiOperation("获取【请填写功能名称】详细信息")
+    @PreAuthorize("@ss.hasPermi('system:relation:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<GoodsSpecAttributeRelationVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iGoodsSpecAttributeRelationService.queryById(id));
+    }
+
+    /**
+     * 新增规格属性关联
+     */
+    @ApiOperation("新增规格属性关联")
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody GoodsSpecAttributeRelationAddBo bo) {
+        return toAjax(iGoodsSpecAttributeRelationService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改规格属性关联
+     */
+    @ApiOperation("修改规格属性关联")
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody GoodsSpecAttributeRelationEditBo bo) {
+        return toAjax(iGoodsSpecAttributeRelationService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     */
+    @ApiOperation("删除【请填写功能名称】")
+    @PreAuthorize("@ss.hasPermi('system:relation:remove')")
+    @Log(title = "【请填写功能名称】" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(iGoodsSpecAttributeRelationService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

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

@@ -0,0 +1,115 @@
+package com.zhongzheng.controller.goods;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.goods.bo.GoodsSpecAddBo;
+import com.zhongzheng.modules.goods.bo.GoodsSpecEditBo;
+import com.zhongzheng.modules.goods.bo.GoodsSpecQueryBo;
+import com.zhongzheng.modules.goods.service.IGoodsSpecService;
+import com.zhongzheng.modules.goods.vo.GoodsSpecAttrDetailVo;
+import com.zhongzheng.modules.goods.vo.GoodsSpecVo;
+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 ruoyi
+ * @date 2022-09-29
+ */
+@Api(value = "【请填写功能名称】控制器", tags = {"【请填写功能名称】管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/spec")
+public class GoodsSpecController extends BaseController {
+
+    private final IGoodsSpecService iGoodsSpecService;
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @ApiOperation("查询【请填写功能名称】列表")
+    @PreAuthorize("@ss.hasPermi('system:spec:list')")
+    @GetMapping("/list")
+    public TableDataInfo<GoodsSpecVo> list(GoodsSpecQueryBo bo) {
+        startPage();
+        List<GoodsSpecVo> list = iGoodsSpecService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    @ApiOperation("导出【请填写功能名称】列表")
+    @PreAuthorize("@ss.hasPermi('system:spec:export')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<GoodsSpecVo> export(GoodsSpecQueryBo bo) {
+        List<GoodsSpecVo> list = iGoodsSpecService.queryList(bo);
+        ExcelUtil<GoodsSpecVo> util = new ExcelUtil<GoodsSpecVo>(GoodsSpecVo.class);
+        return util.exportExcel(list, "【请填写功能名称】");
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @ApiOperation("获取【请填写功能名称】详细信息")
+    @PreAuthorize("@ss.hasPermi('system:spec:query')")
+    @GetMapping("/{specId}")
+    public AjaxResult<GoodsSpecVo> getInfo(@PathVariable("specId" ) Long specId) {
+        return AjaxResult.success(iGoodsSpecService.queryById(specId));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @ApiOperation("新增【请填写功能名称】")
+    @PreAuthorize("@ss.hasPermi('system:spec:add')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody GoodsSpecAddBo bo) {
+        return toAjax(iGoodsSpecService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @ApiOperation("修改【请填写功能名称】")
+    @PreAuthorize("@ss.hasPermi('system:spec:edit')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public AjaxResult<Void> edit(@RequestBody GoodsSpecEditBo bo) {
+        return toAjax(iGoodsSpecService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     */
+    @ApiOperation("删除【请填写功能名称】")
+    @PreAuthorize("@ss.hasPermi('system:spec:remove')")
+    @Log(title = "【请填写功能名称】" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{specIds}")
+    public AjaxResult<Void> remove(@PathVariable Long[] specIds) {
+        return toAjax(iGoodsSpecService.deleteWithValidByIds(Arrays.asList(specIds), true) ? 1 : 0);
+    }
+}

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

@@ -0,0 +1,121 @@
+package com.zhongzheng.controller.goods;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.goods.bo.GoodsSpecAddBo;
+import com.zhongzheng.modules.goods.bo.GoodsSpecTemplateAddBo;
+import com.zhongzheng.modules.goods.bo.GoodsSpecTemplateEditBo;
+import com.zhongzheng.modules.goods.bo.GoodsSpecTemplateQueryBo;
+import com.zhongzheng.modules.goods.service.IGoodsSpecTemplateService;
+import com.zhongzheng.modules.goods.vo.GoodsSpecAttrDetailVo;
+import com.zhongzheng.modules.goods.vo.GoodsSpecAttrListVo;
+import com.zhongzheng.modules.goods.vo.GoodsSpecAttributeRelationVo;
+import com.zhongzheng.modules.goods.vo.GoodsSpecTemplateVo;
+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 ruoyi
+ * @date 2022-09-29
+ */
+@Api(value = "规格模板控制器", tags = {"规格模板管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/template")
+public class GoodsSpecTemplateController extends BaseController {
+
+    private final IGoodsSpecTemplateService iGoodsSpecTemplateService;
+
+    /**
+     * 查询模板列表
+     */
+    @ApiOperation("查询模板列表")
+    @GetMapping("/list")
+    public TableDataInfo<GoodsSpecTemplateVo> list(GoodsSpecTemplateQueryBo bo) {
+        startPage();
+        List<GoodsSpecTemplateVo> list = iGoodsSpecTemplateService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    @ApiOperation("导出【请填写功能名称】列表")
+    @PreAuthorize("@ss.hasPermi('system:template:export')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<GoodsSpecTemplateVo> export(GoodsSpecTemplateQueryBo bo) {
+        List<GoodsSpecTemplateVo> list = iGoodsSpecTemplateService.queryList(bo);
+        ExcelUtil<GoodsSpecTemplateVo> util = new ExcelUtil<GoodsSpecTemplateVo>(GoodsSpecTemplateVo.class);
+        return util.exportExcel(list, "【请填写功能名称】");
+    }
+
+    /**
+     * 获取规格模板详细信息
+     */
+    @ApiOperation("获取规格模板详细信息")
+    @GetMapping("/detail/{specTemplateId}")
+    public AjaxResult<GoodsSpecTemplateVo> getInfo(@PathVariable("specTemplateId" ) Long specTemplateId) {
+        return AjaxResult.success(iGoodsSpecTemplateService.queryById(specTemplateId));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @ApiOperation("新增【请填写功能名称】")
+    @PreAuthorize("@ss.hasPermi('system:template:add')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody GoodsSpecTemplateAddBo bo) {
+        return toAjax(iGoodsSpecTemplateService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 新增规格模板
+     */
+    @ApiOperation("新增规格模板")
+    @PostMapping("/addSpec")
+    public AjaxResult<List<GoodsSpecAttributeRelationVo>> addSpec(@RequestBody GoodsSpecTemplateAddBo bo) {
+        List<GoodsSpecAttributeRelationVo> vo = iGoodsSpecTemplateService.addSpec(bo);
+        return AjaxResult.success(vo);
+    }
+
+    /**
+     * 修改规格模板
+     */
+    @ApiOperation("修改规格模板")
+    @PostMapping("/edit")
+    public AjaxResult<List<GoodsSpecAttributeRelationVo>> edit(@RequestBody GoodsSpecTemplateEditBo bo) {
+        List<GoodsSpecAttributeRelationVo> vo = iGoodsSpecTemplateService.updateByEditBo(bo);
+        return AjaxResult.success(vo);
+    }
+
+    /**
+     * 删除规格模板
+     */
+    @ApiOperation("删除规格模板")
+    @GetMapping("/del/{specTemplateId}")
+    public AjaxResult<Void> remove(@PathVariable Long specTemplateId) {
+        return toAjax(iGoodsSpecTemplateService.deleteWithValidByIds(specTemplateId,false) ? 1 : 0);
+    }
+}

zhongzheng-api/src/main/java/com/zhongzheng/controller/cmmon/CommonController.java

@@ -21,6 +21,8 @@ import com.zhongzheng.modules.exam.bo.ExamActivityApplyBo;
 import com.zhongzheng.modules.exam.bo.ExamActivityApplyVo;
 import com.zhongzheng.modules.exam.service.IExamActivityService;
 import com.zhongzheng.modules.exam.vo.ExamActivityVo;
+import com.zhongzheng.modules.goods.service.IGoodsSpecTemplateService;
+import com.zhongzheng.modules.goods.vo.GoodsSpecTemplateVo;
 import com.zhongzheng.modules.goods.vo.GoodsUserVo;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
 import com.zhongzheng.modules.order.domain.Printer;
@@ -61,6 +63,8 @@ public class CommonController extends BaseController {
 
     private final ICourseTopicService iCourseTopicService;
 
+    private final IGoodsSpecTemplateService iGoodsSpecTemplateService;
+
     /**
      * 获取商品专题页指定商品信息
      */
@@ -70,6 +74,25 @@ public class CommonController extends BaseController {
         return AjaxResult.success(iCourseTopicService.getGoodsInfo(topicId));
     }
 
+    /**
+     * 获取商品规格模板信息
+     */
+    @ApiOperation("获取商品规格模板信息")
+    @GetMapping("/spec/{specTemplateId}")
+    public AjaxResult<GoodsSpecTemplateVo> getSpecTemplate(@PathVariable("specTemplateId")Long specTemplateId) {
+        return AjaxResult.success(iGoodsSpecTemplateService.queryById(specTemplateId));
+    }
+
+    /**
+     * 获取规格属性值对应的商品信息
+     */
+    @ApiOperation("获取规格属性值对应的商品信息")
+    @GetMapping("/attr/goods")
+    public AjaxResult<GoodsVo> getSpecTemplate(@RequestParam("specTemplateId")Long specTemplateId,@RequestParam("specAttrIds")String specAttrIds) {
+        GoodsVo vo = iGoodsSpecTemplateService.getSpecTemplate(specTemplateId,specAttrIds);
+        return AjaxResult.success(vo);
+    }
+
     /**
      * 获取专题页组合班级商品
      */

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

@@ -24,7 +24,9 @@ import com.zhongzheng.modules.course.vo.CourseSectionVo;
 import com.zhongzheng.modules.goods.bo.*;
 import com.zhongzheng.modules.goods.service.IGoodsAttachedService;
 import com.zhongzheng.modules.goods.service.IGoodsService;
+import com.zhongzheng.modules.goods.service.IGoodsSpecTemplateService;
 import com.zhongzheng.modules.goods.vo.GoodsAttachedVo;
+import com.zhongzheng.modules.goods.vo.GoodsSpecTemplateVo;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
 import com.zhongzheng.modules.grade.bo.UserPeriodQueryBo;
 import com.zhongzheng.modules.grade.service.IUserPeriodService;
@@ -83,6 +85,8 @@ public class GoodsController extends BaseController {
 
     private final IOrderGoodsFreeService iOrderGoodsFreeService;
 
+
+
     /**
      * 获取商品详细信息
      */
@@ -248,4 +252,6 @@ public class GoodsController extends BaseController {
         List<CourseLiveVo> list = iOrderGoodsService.getLiveList(loginUser.getUser().getUserId());
         return getDataTable(list);
     }
+
+
 }

zhongzheng-common/src/main/java/com/zhongzheng/common/core/bo/SysUserEditBo.java

@@ -1,29 +1,17 @@
 package com.zhongzheng.common.core.bo;
 
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.zhongzheng.common.annotation.Excel;
 import com.zhongzheng.common.annotation.Excel.ColumnType;
 import com.zhongzheng.common.annotation.Excel.Type;
-import com.zhongzheng.common.annotation.Excels;
-import com.zhongzheng.common.core.domain.entity.SysDept;
-import com.zhongzheng.common.core.domain.entity.SysRole;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
 
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 用户对象 SysUserEditBo

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityRecommendServiceImpl.java

@@ -20,7 +20,9 @@ import com.zhongzheng.modules.activity.service.IActivityRecommendService;
 import com.zhongzheng.modules.activity.vo.ActivityRecommendGoodsVo;
 import com.zhongzheng.modules.activity.vo.ActivityRecommendVo;
 import com.zhongzheng.modules.goods.domain.Goods;
+import com.zhongzheng.modules.goods.domain.GoodsSpecAttributeRelation;
 import com.zhongzheng.modules.goods.service.IGoodsService;
+import com.zhongzheng.modules.goods.service.IGoodsSpecAttributeRelationService;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +45,8 @@ public class ActivityRecommendServiceImpl extends ServiceImpl<ActivityRecommendM
     private IActivityRecommendGoodsService iActivityRecommendGoodsService;
     @Autowired
     private IGoodsService iGoodsService;
+    @Autowired
+    private IGoodsSpecAttributeRelationService goodsSpecAttributeRelationService;
 
 
     @Override
@@ -111,7 +115,27 @@ public class ActivityRecommendServiceImpl extends ServiceImpl<ActivityRecommendM
 
     @Override
     public List<ActivityRecommendVo> selectList(ActivityRecommendQueryBo bo) {
-        return baseMapper.selectListByBo(bo);
+        List<ActivityRecommendVo> activityRecommendVos = baseMapper.selectListByBo(bo);
+        if (CollectionUtils.isEmpty(activityRecommendVos)){
+            return new ArrayList<>();
+        }
+        for (ActivityRecommendVo recommendVo : activityRecommendVos) {
+            if (CollectionUtils.isNotEmpty(recommendVo.getGoodsList())){
+                recommendVo.getGoodsList().forEach(item -> {
+                    if (ObjectUtils.isNull(item.getSpecTemplateId())){
+                        List<GoodsSpecAttributeRelation> list = goodsSpecAttributeRelationService.list(new LambdaQueryWrapper<GoodsSpecAttributeRelation>()
+                                .eq(GoodsSpecAttributeRelation::getGoodsId, item.getGoodsId())
+                                .orderByAsc(GoodsSpecAttributeRelation::getCreateTime)
+                                .last("LIMIT 1"));
+                        if (CollectionUtils.isNotEmpty(list)){
+                            GoodsSpecAttributeRelation relation = list.stream().findFirst().get();
+                            item.setSpecTemplateId(relation.getSpecTemplateId());
+                        }
+                    }
+                });
+            }
+        }
+        return activityRecommendVos;
     }
 
     @Override
@@ -175,6 +199,21 @@ public class ActivityRecommendServiceImpl extends ServiceImpl<ActivityRecommendM
         if (CollectionUtils.isEmpty(page.getRecords())){
             return result;
         }
+        page.getRecords().forEach(item -> {
+            Goods goods = iGoodsService.getById(item.getGoodsId());
+            if (ObjectUtils.isNotNull(goods.getSpecTemplateId())){
+                item.setSpecTemplateId(goods.getSpecTemplateId());
+            }else {
+                List<GoodsSpecAttributeRelation> list = goodsSpecAttributeRelationService.list(new LambdaQueryWrapper<GoodsSpecAttributeRelation>()
+                        .eq(GoodsSpecAttributeRelation::getGoodsId, item.getGoodsId())
+                        .orderByAsc(GoodsSpecAttributeRelation::getCreateTime)
+                        .last("LIMIT 1"));
+                if (CollectionUtils.isNotEmpty(list)){
+                    GoodsSpecAttributeRelation relation = list.stream().findFirst().get();
+                    item.setSpecTemplateId(relation.getSpecTemplateId());
+                }
+            }
+        });
         result.setTotal(page.getTotal());
         result.setRows(page.getRecords());
         result.setCode(200);

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityRecommendGoodsVo.java

@@ -58,4 +58,6 @@ public class ActivityRecommendGoodsVo {
 	@Excel(name = "封面地址")
 	@ApiModelProperty("封面地址")
 	private String coverUrl;
+	@ApiModelProperty("规格模板ID")
+	private Long specTemplateId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamActivityAddBo.java

@@ -24,6 +24,9 @@ public class ExamActivityAddBo implements Serializable {
     @ApiModelProperty("科目（多个用逗号隔开）")
     private String majors;
 
+    @ApiModelProperty("关联模考ID")
+    private Integer mockApplyId;
+
     /** 活动开始时间 */
     @ApiModelProperty("活动开始时间")
     private Long startTime;

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamActivityUserVo.java

@@ -43,9 +43,16 @@ public class ExamActivityUserVo implements Serializable {
     @ApiModelProperty("用户手机号码")
     @Excel(name = "用户手机号码")
     private String userPhone;
-    /** 报考科目（多个用逗号隔开） */
-    @ApiModelProperty("报考科目（多个用逗号隔开）")
-    @Excel(name = "报考科目（多个用逗号隔开）")
-    private String userMajors;
+
+    @ApiModelProperty("模考ID")
+    private String mockApplyId;
+    @ApiModelProperty("专业ID")
+    private String mockMajorId;
+    @ApiModelProperty("科目IDs")
+    private String mockSubjectIds;
+    @ApiModelProperty("专业名称")
+    private String mockMajorName;
+    @ApiModelProperty("科目名称（多个按逗号隔开）")
+    private String mockSubjectNames;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/domain/ExamActivityUser.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -39,8 +40,12 @@ private static final long serialVersionUID=1L;
     private String userIdCard;
     /** 用户手机号码 */
     private String userPhone;
-    /** 报考科目（多个用逗号隔开） */
-    private String userMajors;
+    /** 模考ID */
+    private String mockApplyId;
+    /** 模考专业ID */
+    private String mockMajorId;
+    /** 模考科目IDS */
+    private String mockSubjectIds;
     /** 1有效 0无效 */
     private Integer status;
     /** 创建时间 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamActivityServiceImpl.java

@@ -2,10 +2,15 @@ package com.zhongzheng.modules.exam.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.SecurityUtils;
+import com.zhongzheng.modules.course.domain.CourseSubject;
+import com.zhongzheng.modules.course.domain.Major;
+import com.zhongzheng.modules.course.service.ICourseSubjectService;
+import com.zhongzheng.modules.course.service.IMajorService;
 import com.zhongzheng.modules.exam.bo.*;
 import com.zhongzheng.modules.exam.domain.ExamActivity;
 import com.zhongzheng.modules.exam.domain.ExamActivityGoods;
@@ -25,6 +30,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -45,6 +51,10 @@ public class ExamActivityServiceImpl extends ServiceImpl<ExamActivityMapper, Exa
     private IGoodsService iGoodsService;
     @Autowired
     private IWxLoginService wxLoginService;
+    @Autowired
+    private IMajorService majorService;
+    @Autowired
+    private ICourseSubjectService courseSubjectService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -95,7 +105,22 @@ public class ExamActivityServiceImpl extends ServiceImpl<ExamActivityMapper, Exa
 
     @Override
     public List<ExamActivityUserVo> getActivityUserList(Long activityId) {
-        return baseMapper.getActivityUserList(activityId);
+        List<ExamActivityUserVo> activityUserList = baseMapper.getActivityUserList(activityId);
+        if (CollectionUtils.isEmpty(activityUserList)){
+            return new ArrayList<>();
+        }
+        activityUserList.forEach(item -> {
+            if (ObjectUtils.isNotNull(item.getMockMajorId())){
+                Major major = majorService.getById(item.getMockMajorId());
+                item.setMockMajorName(major.getCategoryName());
+            }
+            if (ObjectUtils.isNotNull(item.getMockSubjectIds())){
+                List<CourseSubject> subjects = courseSubjectService.listByIds(Arrays.stream(item.getMockSubjectIds().split(",")).collect(Collectors.toList()));
+                String names = subjects.stream().map(CourseSubject::getSubjectName).collect(Collectors.joining());
+                item.setMockSubjectNames(names);
+            }
+        });
+        return activityUserList;
     }
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/vo/ExamActivityVo.java

@@ -24,6 +24,15 @@ public class ExamActivityVo implements Serializable {
     @ApiModelProperty("活动名称")
     private String name;
 
+    @ApiModelProperty("关联模考ID")
+    private Integer mockApplyId;
+
+    @ApiModelProperty("关联模考名称")
+    private String mockApplyName;
+
+    @ApiModelProperty("关联模考编码")
+    private String mockApplyCode;
+
     /** 科目（多个用逗号隔开） */
     @ApiModelProperty("科目（多个用逗号隔开）")
     private String majors;

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

@@ -75,6 +75,8 @@ GoodsQueryBo extends BaseEntity {
 	/** 商品名称 */
 	@ApiModelProperty("商品名称")
 	private String goodsName;
+	@ApiModelProperty("商品编码")
+	private String code;
 	/** 标准价格 */
 	@ApiModelProperty("标准价格")
 	private BigDecimal standPrice;

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

@@ -0,0 +1,47 @@
+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.util.List;
+
+
+/**
+ * 【请填写功能名称】添加对象 goods_spec
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+@Data
+@ApiModel("【请填写功能名称】添加对象")
+public class GoodsSpecAddBo {
+
+    /** 规格ID */
+    @ApiModelProperty("规格ID")
+    private Long specId;
+    /** 规格模板ID */
+    @ApiModelProperty("规格模板ID")
+    private Long specTemplateId;
+    /** 模板名称 */
+    @ApiModelProperty("模板名称")
+    private String name;
+    /** 编码 */
+    @ApiModelProperty("编码")
+    private String code;
+    /** 排序值 */
+    @ApiModelProperty("排序值")
+    private Integer sort;
+    /** 1有效 0无效 */
+    @ApiModelProperty("1有效 0无效")
+    private Integer status;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+    @ApiModelProperty("规格属性集合")
+    private List<GoodsSpecAttributeAddBo> specAttrList;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsSpecAttributeAddBo.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;
+import java.util.List;
+
+
+/**
+ * 【请填写功能名称】添加对象 goods_spec_attribute
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+@Data
+@ApiModel("【请填写功能名称】添加对象")
+public class GoodsSpecAttributeAddBo {
+
+    /** 规格属性ID */
+    @ApiModelProperty("规格属性ID")
+    private Long specAttributeId;
+    /** 规格ID */
+    @ApiModelProperty("规格ID")
+    private Long specId;
+    /** 模板名称 */
+    @ApiModelProperty("模板名称")
+    private String name;
+    /** 编码 */
+    @ApiModelProperty("编码")
+    private String code;
+    /** 排序值 */
+    @ApiModelProperty("排序值")
+    private Integer sort;
+    /** 1有效 0无效 */
+    @ApiModelProperty("1有效 0无效")
+    private Integer status;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+}

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

@@ -0,0 +1,49 @@
+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_spec_attribute
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+@Data
+@ApiModel("【请填写功能名称】编辑对象")
+public class GoodsSpecAttributeEditBo {
+
+    /** 规格属性ID */
+    @ApiModelProperty("规格属性ID")
+    private Long specAttributeId;
+
+    /** 规格ID */
+    @ApiModelProperty("规格ID")
+    private Long specId;
+
+    /** 模板名称 */
+    @ApiModelProperty("模板名称")
+    private String name;
+
+    /** 编码 */
+    @ApiModelProperty("编码")
+    private String code;
+
+    /** 排序值 */
+    @ApiModelProperty("排序值")
+    private Integer sort;
+
+    /** 1有效 0无效 */
+    @ApiModelProperty("1有效 0无效")
+    private Integer status;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+
+}

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

@@ -0,0 +1,54 @@
+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_spec_attribute
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("【请填写功能名称】分页查询对象")
+public class GoodsSpecAttributeQueryBo 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 specId;
+	/** 模板名称 */
+	@ApiModelProperty("模板名称")
+	private String name;
+	/** 编码 */
+	@ApiModelProperty("编码")
+	private String code;
+	/** 排序值 */
+	@ApiModelProperty("排序值")
+	private Integer sort;
+	/** 1有效 0无效 */
+	@ApiModelProperty("1有效 0无效")
+	private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsSpecAttributeRelationAddBo.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_spec_attribute_relation
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+@Data
+@ApiModel("【请填写功能名称】添加对象")
+public class GoodsSpecAttributeRelationAddBo {
+
+    /** 规格属性ID集合 */
+    @ApiModelProperty("规格属性ID集合")
+    private String specAttributeIds;
+    /** 商品ID */
+    @ApiModelProperty("商品ID")
+    private Long goodsId;
+    /** 规格模板ID */
+    @ApiModelProperty("规格模板ID")
+    private Long specTemplateId;
+    /** 1有效 0无效 */
+    @ApiModelProperty("1有效 0无效")
+    private Integer status;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsSpecAttributeRelationEditBo.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_spec_attribute_relation
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+@Data
+@ApiModel("【请填写功能名称】编辑对象")
+public class GoodsSpecAttributeRelationEditBo {
+
+    /** 主键 */
+    @ApiModelProperty("主键")
+    private Long id;
+
+    /** 规格属性ID集合 */
+    @ApiModelProperty("规格属性ID集合")
+    private String specAttributeIds;
+
+    /** 商品ID */
+    @ApiModelProperty("商品ID")
+    private Long goodsId;
+
+    /** 规格模板ID */
+    @ApiModelProperty("规格模板ID")
+    private Long specTemplateId;
+
+    /** 1有效 0无效 */
+    @ApiModelProperty("1有效 0无效")
+    private Integer status;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsSpecAttributeRelationQueryBo.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_spec_attribute_relation
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("【请填写功能名称】分页查询对象")
+public class GoodsSpecAttributeRelationQueryBo 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 String specAttributeIds;
+	/** 商品ID */
+	@ApiModelProperty("商品ID")
+	private Long goodsId;
+	/** 规格模板ID */
+	@ApiModelProperty("规格模板ID")
+	private Long specTemplateId;
+	/** 1有效 0无效 */
+	@ApiModelProperty("1有效 0无效")
+	private Integer status;
+}

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

@@ -0,0 +1,49 @@
+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_spec
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+@Data
+@ApiModel("【请填写功能名称】编辑对象")
+public class GoodsSpecEditBo {
+
+    /** 规格ID */
+    @ApiModelProperty("规格ID")
+    private Long specId;
+
+    /** 规格模板ID */
+    @ApiModelProperty("规格模板ID")
+    private Long specTemplateId;
+
+    /** 模板名称 */
+    @ApiModelProperty("模板名称")
+    private String name;
+
+    /** 编码 */
+    @ApiModelProperty("编码")
+    private String code;
+
+    /** 排序值 */
+    @ApiModelProperty("排序值")
+    private Integer sort;
+
+    /** 1有效 0无效 */
+    @ApiModelProperty("1有效 0无效")
+    private Integer status;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+
+}

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

@@ -0,0 +1,54 @@
+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_spec
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("【请填写功能名称】分页查询对象")
+public class GoodsSpecQueryBo 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 specTemplateId;
+	/** 模板名称 */
+	@ApiModelProperty("模板名称")
+	private String name;
+	/** 编码 */
+	@ApiModelProperty("编码")
+	private String code;
+	/** 排序值 */
+	@ApiModelProperty("排序值")
+	private Integer sort;
+	/** 1有效 0无效 */
+	@ApiModelProperty("1有效 0无效")
+	private Integer status;
+}

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

@@ -0,0 +1,24 @@
+package com.zhongzheng.modules.goods.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 【请填写功能名称】编辑对象 goods_spec
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+@Data
+@ApiModel("【请填写功能名称】编辑对象")
+public class GoodsSpecTempEditBo {
+    /** 规格模板ID */
+    @ApiModelProperty("规格模板ID")
+    private Long specTemplateId;
+
+    /** 商品ID */
+    @ApiModelProperty("商品ID")
+    private Long goodsId;
+}

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

@@ -0,0 +1,51 @@
+package com.zhongzheng.modules.goods.bo;
+
+import com.zhongzheng.modules.goods.domain.GoodsSpecAttributeRelation;
+import com.zhongzheng.modules.goods.vo.GoodsSpecAttributeRelationVo;
+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.util.List;
+
+
+/**
+ * 【请填写功能名称】添加对象 goods_spec_template
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+@Data
+@ApiModel("【请填写功能名称】添加对象")
+public class GoodsSpecTemplateAddBo {
+
+    /** 规格模板ID */
+    @ApiModelProperty("规格模板ID")
+    private Long specTemplateId;
+    /** 编码 */
+    @ApiModelProperty("编码")
+    private String code;
+    /** 教育类型id */
+    @ApiModelProperty("教育类型id")
+    private Long educationTypeId;
+    /** 业务层次id */
+    @ApiModelProperty("业务层次id")
+    private Long businessId;
+    /** 模板名称 */
+    @ApiModelProperty("模板名称")
+    private String name;
+    /** 1有效 0无效 */
+    @ApiModelProperty("1有效 0无效")
+    private Integer status;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+    @ApiModelProperty("模板规格集合")
+    private List<GoodsSpecAddBo> specList;
+    @ApiModelProperty("模板商品集合")
+    private List<GoodsSpecAttributeRelationVo> attributeRelationList;
+}

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

@@ -0,0 +1,50 @@
+package com.zhongzheng.modules.goods.bo;
+
+import com.zhongzheng.modules.goods.vo.GoodsSpecAttributeRelationVo;
+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.util.List;
+
+
+/**
+ * 【请填写功能名称】编辑对象 goods_spec_template
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+@Data
+@ApiModel("【请填写功能名称】编辑对象")
+public class GoodsSpecTemplateEditBo {
+
+    /** 规格模板ID */
+    @ApiModelProperty("规格模板ID")
+    private Long specTemplateId;
+    /** 编码 */
+    @ApiModelProperty("编码")
+    private String code;
+    /** 教育类型id */
+    @ApiModelProperty("教育类型id")
+    private Long educationTypeId;
+    /** 业务层次id */
+    @ApiModelProperty("业务层次id")
+    private Long businessId;
+    /** 模板名称 */
+    @ApiModelProperty("模板名称")
+    private String name;
+    /** 1有效 0无效 */
+    @ApiModelProperty("1有效 0无效")
+    private Integer status;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+    @ApiModelProperty("模板规格集合")
+    private List<GoodsSpecAddBo> specList;
+    @ApiModelProperty("模板商品集合")
+    private List<GoodsSpecAttributeRelationVo> attributeRelationList;
+}

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

@@ -0,0 +1,54 @@
+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_spec_template
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("【请填写功能名称】分页查询对象")
+public class GoodsSpecTemplateQueryBo 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 String code;
+	/** 教育类型id */
+	@ApiModelProperty("教育类型id")
+	private Long educationTypeId;
+	/** 业务层次id */
+	@ApiModelProperty("业务层次id")
+	private Long businessId;
+	/** 模板名称 */
+	@ApiModelProperty("模板名称")
+	private String name;
+	/** 1有效 0无效 */
+	@ApiModelProperty("1有效 0无效")
+	private Integer status;
+}

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

@@ -139,4 +139,6 @@ private static final long serialVersionUID=1L;
     private Long certificateTpId;
     /** 商品划线价格 */
     private BigDecimal linePrice;
+    /** 默认规格模板ID */
+    private Long specTemplateId;
 }

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

@@ -0,0 +1,45 @@
+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_spec
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("goods_spec")
+public class GoodsSpec implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** 规格ID */
+    @TableId(value = "spec_id")
+    private Long specId;
+    /** 规格模板ID */
+    private Long specTemplateId;
+    /** 模板名称 */
+    private String name;
+    /** 编码 */
+    private String code;
+    /** 排序值 */
+    private Integer sort;
+    /** 1有效 0无效 */
+    private Integer status;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+}

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

@@ -0,0 +1,45 @@
+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_spec_attribute
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("goods_spec_attribute")
+public class GoodsSpecAttribute implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** 规格属性ID */
+    @TableId(value = "spec_attribute_id")
+    private Long specAttributeId;
+    /** 规格ID */
+    private Long specId;
+    /** 模板名称 */
+    private String name;
+    /** 编码 */
+    private String code;
+    /** 排序值 */
+    private Integer sort;
+    /** 1有效 0无效 */
+    private Integer status;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/GoodsSpecAttributeRelation.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_spec_attribute_relation
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("goods_spec_attribute_relation")
+public class GoodsSpecAttributeRelation implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** 主键 */
+    @TableId(value = "id")
+    private Long id;
+    /** 规格属性ID集合 */
+    private String specAttributeIds;
+    /** 商品ID */
+    private Long goodsId;
+    /** 规格模板ID */
+    private Long specTemplateId;
+    /** 1有效 0无效 */
+    private Integer status;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+}

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

@@ -0,0 +1,45 @@
+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_spec_template
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("goods_spec_template")
+public class GoodsSpecTemplate implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** 规格模板ID */
+    @TableId(value = "spec_template_id")
+    private Long specTemplateId;
+    /** 编码 */
+    private String code;
+    /** 教育类型id */
+    private Long educationTypeId;
+    /** 业务层次id */
+    private Long businessId;
+    /** 模板名称 */
+    private String name;
+    /** 1有效 0无效 */
+    private Integer status;
+    /** 创建时间 */
+    @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/GoodsSpecAttributeMapper.java

@@ -0,0 +1,15 @@
+package com.zhongzheng.modules.goods.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.goods.domain.GoodsSpecAttribute;
+
+/**
+ * 【请填写功能名称】Mapper接口
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+public interface GoodsSpecAttributeMapper extends BaseMapper<GoodsSpecAttribute> {
+
+}

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

@@ -0,0 +1,15 @@
+package com.zhongzheng.modules.goods.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.goods.domain.GoodsSpecAttributeRelation;
+
+/**
+ * 【请填写功能名称】Mapper接口
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+public interface GoodsSpecAttributeRelationMapper extends BaseMapper<GoodsSpecAttributeRelation> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.goods.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.goods.domain.GoodsSpec;
+
+/**
+ * 【请填写功能名称】Mapper接口
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+public interface GoodsSpecMapper extends BaseMapper<GoodsSpec> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.goods.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.goods.domain.GoodsSpecTemplate;
+
+/**
+ * 【请填写功能名称】Mapper接口
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+public interface GoodsSpecTemplateMapper extends BaseMapper<GoodsSpecTemplate> {
+
+}

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

@@ -7,6 +7,7 @@ import com.zhongzheng.modules.exam.bo.ExamNumberGoodsQueryBo;
 import com.zhongzheng.modules.exam.vo.ExamNumberGoodsVo;
 import com.zhongzheng.modules.goods.bo.*;
 import com.zhongzheng.modules.goods.domain.Goods;
+import com.zhongzheng.modules.goods.vo.GoodsSpecTemplateVo;
 import com.zhongzheng.modules.goods.vo.GoodsJzsVo;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
 
@@ -83,5 +84,9 @@ public interface IGoodsService extends IService<Goods> {
 
 	List<CourseModuleFreeExamVo> moduleFreeExamList(Long goodsId);
 
+	List<GoodsSpecTemplateVo> getSpecTemplateList(Long goodsId);
+
+	boolean updateSpecTemplate(GoodsSpecTempEditBo bo);
+
 	List<GoodsJzsVo> selectRjJzsList(GoodsQueryBo bo);
 }

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

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.goods.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.goods.bo.GoodsSpecAttributeRelationAddBo;
+import com.zhongzheng.modules.goods.bo.GoodsSpecAttributeRelationEditBo;
+import com.zhongzheng.modules.goods.bo.GoodsSpecAttributeRelationQueryBo;
+import com.zhongzheng.modules.goods.domain.GoodsSpecAttributeRelation;
+import com.zhongzheng.modules.goods.vo.GoodsSpecAttributeRelationVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 【请填写功能名称】Service接口
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+public interface IGoodsSpecAttributeRelationService extends IService<GoodsSpecAttributeRelation> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	GoodsSpecAttributeRelationVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<GoodsSpecAttributeRelationVo> queryList(GoodsSpecAttributeRelationQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入【请填写功能名称】
+	 * @param bo 【请填写功能名称】新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(GoodsSpecAttributeRelationAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改【请填写功能名称】
+	 * @param bo 【请填写功能名称】编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(GoodsSpecAttributeRelationEditBo 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/IGoodsSpecAttributeService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.goods.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.goods.bo.GoodsSpecAttributeAddBo;
+import com.zhongzheng.modules.goods.bo.GoodsSpecAttributeEditBo;
+import com.zhongzheng.modules.goods.bo.GoodsSpecAttributeQueryBo;
+import com.zhongzheng.modules.goods.domain.GoodsSpecAttribute;
+import com.zhongzheng.modules.goods.vo.GoodsSpecAttributeVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 【请填写功能名称】Service接口
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+public interface IGoodsSpecAttributeService extends IService<GoodsSpecAttribute> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	GoodsSpecAttributeVo queryById(Long specAttributeId);
+
+	/**
+	 * 查询列表
+	 */
+	List<GoodsSpecAttributeVo> queryList(GoodsSpecAttributeQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入【请填写功能名称】
+	 * @param bo 【请填写功能名称】新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(GoodsSpecAttributeAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改【请填写功能名称】
+	 * @param bo 【请填写功能名称】编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(GoodsSpecAttributeEditBo 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/IGoodsSpecService.java

@@ -0,0 +1,53 @@
+package com.zhongzheng.modules.goods.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.goods.bo.GoodsSpecAddBo;
+import com.zhongzheng.modules.goods.bo.GoodsSpecEditBo;
+import com.zhongzheng.modules.goods.bo.GoodsSpecQueryBo;
+import com.zhongzheng.modules.goods.domain.GoodsSpec;
+import com.zhongzheng.modules.goods.vo.GoodsSpecAttrDetailVo;
+import com.zhongzheng.modules.goods.vo.GoodsSpecVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 【请填写功能名称】Service接口
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+public interface IGoodsSpecService extends IService<GoodsSpec> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	GoodsSpecVo queryById(Long specId);
+
+	/**
+	 * 查询列表
+	 */
+	List<GoodsSpecVo> queryList(GoodsSpecQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入【请填写功能名称】
+	 * @param bo 【请填写功能名称】新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(GoodsSpecAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改【请填写功能名称】
+	 * @param bo 【请填写功能名称】编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(GoodsSpecEditBo 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/IGoodsSpecTemplateService.java

@@ -0,0 +1,57 @@
+package com.zhongzheng.modules.goods.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.goods.bo.GoodsSpecAddBo;
+import com.zhongzheng.modules.goods.bo.GoodsSpecTemplateAddBo;
+import com.zhongzheng.modules.goods.bo.GoodsSpecTemplateEditBo;
+import com.zhongzheng.modules.goods.bo.GoodsSpecTemplateQueryBo;
+import com.zhongzheng.modules.goods.domain.GoodsSpecTemplate;
+import com.zhongzheng.modules.goods.vo.*;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 【请填写功能名称】Service接口
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+public interface IGoodsSpecTemplateService extends IService<GoodsSpecTemplate> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	GoodsSpecTemplateVo queryById(Long specTemplateId);
+
+	/**
+	 * 查询列表
+	 */
+	List<GoodsSpecTemplateVo> queryList(GoodsSpecTemplateQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入【请填写功能名称】
+	 * @param bo 【请填写功能名称】新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(GoodsSpecTemplateAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改【请填写功能名称】
+	 * @param bo 【请填写功能名称】编辑业务对象
+	 * @return
+	 */
+	List<GoodsSpecAttributeRelationVo> updateByEditBo(GoodsSpecTemplateEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Long id, Boolean isValid);
+
+	List<GoodsSpecAttributeRelationVo> addSpec(GoodsSpecTemplateAddBo bo);
+
+	GoodsVo getSpecTemplate(Long specTemplateId, String specAttrIds);
+}

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

@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.zhongzheng.common.annotation.DataScope;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
@@ -21,14 +22,9 @@ import com.zhongzheng.modules.course.vo.*;
 import com.zhongzheng.modules.exam.bo.ExamNumberGoodsQueryBo;
 import com.zhongzheng.modules.exam.vo.ExamNumberGoodsVo;
 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.domain.*;
 import com.zhongzheng.modules.goods.mapper.GoodsMapper;
-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.service.*;
 import com.zhongzheng.modules.goods.vo.*;
 import com.zhongzheng.modules.grade.vo.ClassGradeVo;
 import com.zhongzheng.modules.order.domain.OrderGoods;
@@ -86,6 +82,10 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 
     @Autowired
     private ICourseSectionWatchPerService iCourseSectionWatchPerService;
+    @Autowired
+    private IGoodsSpecTemplateService goodsSpecTemplateService;
+    @Autowired
+    private IGoodsSpecAttributeRelationService goodsSpecAttributeRelationService;
 
     @Autowired
     private ICourseEducationTypeService iCourseEducationTypeService;
@@ -187,7 +187,22 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 
     @Override
     public GoodsVo selectDetail(Long goodsId) {
-        return baseMapper.selectDetail(goodsId);
+        GoodsVo goodsVo = baseMapper.selectDetail(goodsId);
+        if (ObjectUtils.isNotNull(goodsVo) && ObjectUtils.isNull(goodsVo.getSpecTemplateId())){
+            //没有绑定规格模板
+            //查询是否有绑定的模板
+            List<GoodsSpecAttributeRelation> list = goodsSpecAttributeRelationService
+                    .list(new LambdaQueryWrapper<GoodsSpecAttributeRelation>()
+                    .eq(GoodsSpecAttributeRelation::getStatus, 1)
+                    .eq(GoodsSpecAttributeRelation::getGoodsId, goodsId)
+                    .orderByDesc(GoodsSpecAttributeRelation::getCreateTime)
+                    .last("LIMIT 1"));
+            if (CollectionUtils.isNotEmpty(list)){
+                GoodsSpecAttributeRelation relation = list.stream().findFirst().get();
+                goodsVo.setSpecTemplateId(relation.getSpecTemplateId());
+            }
+        }
+        return goodsVo;
     }
 
     @Override
@@ -667,4 +682,42 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         return jzsVoList;
     }
 
+    /**
+     * 获取商品规格模板列表
+     * @author change
+     * @date 2022/10/9 16:38
+     * @param goodsId
+     * @return java.util.List<com.zhongzheng.modules.goods.vo.GoodsSpecTemplateVo>
+     */
+    @Override
+    public List<GoodsSpecTemplateVo> getSpecTemplateList(Long goodsId) {
+        List<GoodsSpecAttributeRelation> relationList = goodsSpecAttributeRelationService
+                .list(new LambdaQueryWrapper<GoodsSpecAttributeRelation>()
+                .eq(GoodsSpecAttributeRelation::getGoodsId, goodsId)
+                .eq(GoodsSpecAttributeRelation::getStatus, 1));
+        if (CollectionUtils.isEmpty(relationList)){
+            return new ArrayList<>();
+        }
+        Set<Long> specTemplateIds = relationList.stream().filter(x -> ObjectUtils.isNotNull(x.getSpecTemplateId()))
+                .map(GoodsSpecAttributeRelation::getSpecTemplateId).collect(Collectors.toSet());
+
+        List<GoodsSpecTemplate> templates = goodsSpecTemplateService
+                .list(new LambdaQueryWrapper<GoodsSpecTemplate>()
+                .in(GoodsSpecTemplate::getSpecTemplateId, specTemplateIds));
+        if (CollectionUtils.isEmpty(templates)){
+            return new ArrayList<>();
+        }
+        return templates.stream().map(x -> BeanUtil.toBean(x,GoodsSpecTemplateVo.class)).collect(Collectors.toList());
+    }
+
+    @Override
+    public boolean updateSpecTemplate(GoodsSpecTempEditBo bo) {
+        Goods goods = getById(bo.getGoodsId());
+        if (ObjectUtils.isNull(goods)){
+            throw new CustomException("商品信息获取失败");
+        }
+        goods.setSpecTemplateId(bo.getSpecTemplateId());
+        return updateById(goods);
+    }
+
 }

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

@@ -0,0 +1,109 @@
+package com.zhongzheng.modules.goods.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.zhongzheng.common.exception.CustomException;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.goods.bo.GoodsSpecAttributeRelationAddBo;
+import com.zhongzheng.modules.goods.bo.GoodsSpecAttributeRelationEditBo;
+import com.zhongzheng.modules.goods.bo.GoodsSpecAttributeRelationQueryBo;
+import com.zhongzheng.modules.goods.domain.GoodsSpecAttributeRelation;
+import com.zhongzheng.modules.goods.mapper.GoodsSpecAttributeRelationMapper;
+import com.zhongzheng.modules.goods.service.IGoodsSpecAttributeRelationService;
+import com.zhongzheng.modules.goods.vo.GoodsSpecAttributeRelationVo;
+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 ruoyi
+ * @date 2022-09-29
+ */
+@Service
+public class GoodsSpecAttributeRelationServiceImpl extends ServiceImpl<GoodsSpecAttributeRelationMapper, GoodsSpecAttributeRelation> implements IGoodsSpecAttributeRelationService {
+
+    @Override
+    public GoodsSpecAttributeRelationVo queryById(Long id){
+        GoodsSpecAttributeRelation db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, GoodsSpecAttributeRelationVo.class);
+    }
+
+    @Override
+    public List<GoodsSpecAttributeRelationVo> queryList(GoodsSpecAttributeRelationQueryBo bo) {
+        LambdaQueryWrapper<GoodsSpecAttributeRelation> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StrUtil.isNotBlank(bo.getSpecAttributeIds()), GoodsSpecAttributeRelation::getSpecAttributeIds, bo.getSpecAttributeIds());
+        lqw.eq(bo.getGoodsId() != null, GoodsSpecAttributeRelation::getGoodsId, bo.getGoodsId());
+        lqw.eq(bo.getSpecTemplateId() != null, GoodsSpecAttributeRelation::getSpecTemplateId, bo.getSpecTemplateId());
+        lqw.eq(bo.getStatus() != null, GoodsSpecAttributeRelation::getStatus, bo.getStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<GoodsSpecAttributeRelationVo> entity2Vo(Collection<GoodsSpecAttributeRelation> collection) {
+        List<GoodsSpecAttributeRelationVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, GoodsSpecAttributeRelationVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<GoodsSpecAttributeRelation> page = (Page<GoodsSpecAttributeRelation>)collection;
+            Page<GoodsSpecAttributeRelationVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(GoodsSpecAttributeRelationAddBo bo) {
+        GoodsSpecAttributeRelation add = BeanUtil.toBean(bo, GoodsSpecAttributeRelation.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(GoodsSpecAttributeRelationEditBo bo) {
+        GoodsSpecAttributeRelation relation = getOne(new LambdaQueryWrapper<GoodsSpecAttributeRelation>()
+                .eq(GoodsSpecAttributeRelation::getSpecAttributeIds, bo.getSpecAttributeIds())
+                .eq(GoodsSpecAttributeRelation::getSpecTemplateId, bo.getSpecTemplateId()));
+        if (ObjectUtils.isNull(relation)){
+            throw new CustomException("规格属性关联信息获取失败");
+        }
+        relation.setGoodsId(bo.getGoodsId());
+        relation.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(relation);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(GoodsSpecAttributeRelation 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/GoodsSpecAttributeServiceImpl.java

@@ -0,0 +1,103 @@
+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.GoodsSpecAttributeAddBo;
+import com.zhongzheng.modules.goods.bo.GoodsSpecAttributeEditBo;
+import com.zhongzheng.modules.goods.bo.GoodsSpecAttributeQueryBo;
+import com.zhongzheng.modules.goods.domain.GoodsSpecAttribute;
+import com.zhongzheng.modules.goods.mapper.GoodsSpecAttributeMapper;
+import com.zhongzheng.modules.goods.service.IGoodsSpecAttributeService;
+import com.zhongzheng.modules.goods.vo.GoodsSpecAttributeVo;
+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 ruoyi
+ * @date 2022-09-29
+ */
+@Service
+public class GoodsSpecAttributeServiceImpl extends ServiceImpl<GoodsSpecAttributeMapper, GoodsSpecAttribute> implements IGoodsSpecAttributeService {
+
+    @Override
+    public GoodsSpecAttributeVo queryById(Long specAttributeId){
+        GoodsSpecAttribute db = this.baseMapper.selectById(specAttributeId);
+        return BeanUtil.toBean(db, GoodsSpecAttributeVo.class);
+    }
+
+    @Override
+    public List<GoodsSpecAttributeVo> queryList(GoodsSpecAttributeQueryBo bo) {
+        LambdaQueryWrapper<GoodsSpecAttribute> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getSpecId() != null, GoodsSpecAttribute::getSpecId, bo.getSpecId());
+        lqw.like(StrUtil.isNotBlank(bo.getName()), GoodsSpecAttribute::getName, bo.getName());
+        lqw.eq(StrUtil.isNotBlank(bo.getCode()), GoodsSpecAttribute::getCode, bo.getCode());
+        lqw.eq(bo.getSort() != null, GoodsSpecAttribute::getSort, bo.getSort());
+        lqw.eq(bo.getStatus() != null, GoodsSpecAttribute::getStatus, bo.getStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<GoodsSpecAttributeVo> entity2Vo(Collection<GoodsSpecAttribute> collection) {
+        List<GoodsSpecAttributeVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, GoodsSpecAttributeVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<GoodsSpecAttribute> page = (Page<GoodsSpecAttribute>)collection;
+            Page<GoodsSpecAttributeVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(GoodsSpecAttributeAddBo bo) {
+        GoodsSpecAttribute add = BeanUtil.toBean(bo, GoodsSpecAttribute.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(GoodsSpecAttributeEditBo bo) {
+        GoodsSpecAttribute update = BeanUtil.toBean(bo, GoodsSpecAttribute.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(GoodsSpecAttribute 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/GoodsSpecServiceImpl.java

@@ -0,0 +1,114 @@
+package com.zhongzheng.modules.goods.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.goods.bo.GoodsSpecAddBo;
+import com.zhongzheng.modules.goods.bo.GoodsSpecAttributeAddBo;
+import com.zhongzheng.modules.goods.bo.GoodsSpecEditBo;
+import com.zhongzheng.modules.goods.bo.GoodsSpecQueryBo;
+import com.zhongzheng.modules.goods.domain.GoodsSpec;
+import com.zhongzheng.modules.goods.domain.GoodsSpecAttribute;
+import com.zhongzheng.modules.goods.mapper.GoodsSpecMapper;
+import com.zhongzheng.modules.goods.service.IGoodsSpecService;
+import com.zhongzheng.modules.goods.vo.GoodsSpecAttrDetailVo;
+import com.zhongzheng.modules.goods.vo.GoodsSpecVo;
+import org.springframework.beans.factory.annotation.Autowired;
+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.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 【请填写功能名称】Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+@Service
+public class GoodsSpecServiceImpl extends ServiceImpl<GoodsSpecMapper, GoodsSpec> implements IGoodsSpecService {
+
+    @Autowired
+    private GoodsSpecAttributeServiceImpl goodsSpecAttributeServiceImpl;
+
+    @Override
+    public GoodsSpecVo queryById(Long specId){
+        GoodsSpec db = this.baseMapper.selectById(specId);
+        return BeanUtil.toBean(db, GoodsSpecVo.class);
+    }
+
+    @Override
+    public List<GoodsSpecVo> queryList(GoodsSpecQueryBo bo) {
+        LambdaQueryWrapper<GoodsSpec> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getSpecTemplateId() != null, GoodsSpec::getSpecTemplateId, bo.getSpecTemplateId());
+        lqw.like(StrUtil.isNotBlank(bo.getName()), GoodsSpec::getName, bo.getName());
+        lqw.eq(StrUtil.isNotBlank(bo.getCode()), GoodsSpec::getCode, bo.getCode());
+        lqw.eq(bo.getSort() != null, GoodsSpec::getSort, bo.getSort());
+        lqw.eq(bo.getStatus() != null, GoodsSpec::getStatus, bo.getStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<GoodsSpecVo> entity2Vo(Collection<GoodsSpec> collection) {
+        List<GoodsSpecVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, GoodsSpecVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<GoodsSpec> page = (Page<GoodsSpec>)collection;
+            Page<GoodsSpecVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(GoodsSpecAddBo bo) {
+        GoodsSpec add = BeanUtil.toBean(bo, GoodsSpec.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(GoodsSpecEditBo bo) {
+        GoodsSpec update = BeanUtil.toBean(bo, GoodsSpec.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(GoodsSpec 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/GoodsSpecTemplateServiceImpl.java

@@ -0,0 +1,424 @@
+package com.zhongzheng.modules.goods.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
+import com.zhongzheng.common.exception.CustomException;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.course.domain.CourseBusiness;
+import com.zhongzheng.modules.course.domain.CourseEducationType;
+import com.zhongzheng.modules.course.domain.CourseSubject;
+import com.zhongzheng.modules.course.service.ICourseBusinessService;
+import com.zhongzheng.modules.course.service.ICourseEducationTypeService;
+import com.zhongzheng.modules.course.service.ICourseSubjectService;
+import com.zhongzheng.modules.goods.bo.*;
+import com.zhongzheng.modules.goods.domain.*;
+import com.zhongzheng.modules.goods.mapper.GoodsSpecTemplateMapper;
+import com.zhongzheng.modules.goods.service.*;
+import com.zhongzheng.modules.goods.vo.*;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 【请填写功能名称】Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+@Service
+public class GoodsSpecTemplateServiceImpl extends ServiceImpl<GoodsSpecTemplateMapper, GoodsSpecTemplate> implements IGoodsSpecTemplateService {
+
+    @Autowired
+    private IGoodsSpecAttributeService goodsSpecAttributeService;
+    @Autowired
+    public IGoodsSpecService goodsSpecService;
+    @Autowired
+    public IGoodsSpecAttributeRelationService goodsSpecAttributeRelationService;
+    @Autowired
+    public IGoodsService goodsService;
+    @Autowired
+    public ICourseSubjectService courseSubjectService;
+    @Autowired
+    public ICourseEducationTypeService courseEducationTypeService;
+    @Autowired
+    public ICourseBusinessService courseBusinessService;
+
+    @Override
+    public GoodsSpecTemplateVo queryById(Long specTemplateId){
+        GoodsSpecTemplate db = this.baseMapper.selectById(specTemplateId);
+        GoodsSpecTemplateVo vo = BeanUtil.toBean(db, GoodsSpecTemplateVo.class);
+        List<GoodsSpec> specList = goodsSpecService.list(new LambdaQueryWrapper<GoodsSpec>()
+                .eq(GoodsSpec::getSpecTemplateId, specTemplateId)
+                .orderByAsc(GoodsSpec::getSort));
+        if (CollectionUtils.isNotEmpty(specList)){
+            List<GoodsSpecVo> specVos = specList.stream().map(item -> {
+                GoodsSpecVo goodsSpecVo = BeanUtil.toBean(item, GoodsSpecVo.class);
+                List<GoodsSpecAttribute> attrList = goodsSpecAttributeService.list(new LambdaQueryWrapper<GoodsSpecAttribute>()
+                        .eq(GoodsSpecAttribute::getSpecId, item.getSpecId())
+                        .orderByAsc(GoodsSpecAttribute::getSort));
+                if (CollectionUtils.isNotEmpty(attrList)) {
+                    List<GoodsSpecAttributeVo> attrVos = attrList.stream().map(x -> BeanUtil.toBean(x, GoodsSpecAttributeVo.class)).collect(Collectors.toList());
+                    goodsSpecVo.setSpecAttrList(attrVos);
+                }
+                return goodsSpecVo;
+            }).collect(Collectors.toList());
+            vo.setSpecList(specVos);
+        }
+        return vo;
+    }
+
+    @Override
+    public List<GoodsSpecTemplateVo> queryList(GoodsSpecTemplateQueryBo bo) {
+        LambdaQueryWrapper<GoodsSpecTemplate> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StrUtil.isNotBlank(bo.getCode()), GoodsSpecTemplate::getCode, bo.getCode());
+        lqw.eq(bo.getEducationTypeId() != null, GoodsSpecTemplate::getEducationTypeId, bo.getEducationTypeId());
+        lqw.eq(bo.getBusinessId() != null, GoodsSpecTemplate::getBusinessId, bo.getBusinessId());
+        lqw.like(StrUtil.isNotBlank(bo.getName()), GoodsSpecTemplate::getName, bo.getName());
+        lqw.eq(bo.getStatus() != null, GoodsSpecTemplate::getStatus, bo.getStatus());
+        List<GoodsSpecTemplateVo> vos = entity2Vo(this.list(lqw));
+        if (CollectionUtils.isNotEmpty(vos)){
+            vos.forEach(item -> {
+                CourseEducationType type = courseEducationTypeService.getById(item.getEducationTypeId());
+                if (ObjectUtils.isNotNull(type)){
+                    item.setEducationName(type.getEducationName());
+                }
+                CourseBusiness business = courseBusinessService.getById(item.getBusinessId());
+                if (ObjectUtils.isNotNull(business)){
+                    item.setBusinessName(business.getAliasName());
+                }
+                int count = goodsSpecService.count(new LambdaQueryWrapper<GoodsSpec>()
+                        .eq(GoodsSpec::getSpecTemplateId, item.getSpecTemplateId()));
+                item.setSpecNumber(count);
+            });
+        }
+        return vos;
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<GoodsSpecTemplateVo> entity2Vo(Collection<GoodsSpecTemplate> collection) {
+        List<GoodsSpecTemplateVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, GoodsSpecTemplateVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<GoodsSpecTemplate> page = (Page<GoodsSpecTemplate>)collection;
+            Page<GoodsSpecTemplateVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(GoodsSpecTemplateAddBo bo) {
+        GoodsSpecTemplate add = BeanUtil.toBean(bo, GoodsSpecTemplate.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public List<GoodsSpecAttributeRelationVo> updateByEditBo(GoodsSpecTemplateEditBo bo) {
+        GoodsSpecTemplate goodsSpecTemplate = new GoodsSpecTemplate();
+        BeanUtil.copyProperties(bo,goodsSpecTemplate);
+        goodsSpecTemplate.setUpdateTime(DateUtils.getNowTime());
+        updateById(goodsSpecTemplate);
+        List<GoodsSpecAddBo> specList = bo.getSpecList();
+        List<GoodsSpec> list = goodsSpecService.list(new LambdaQueryWrapper<GoodsSpec>()
+                .eq(GoodsSpec::getSpecTemplateId, bo.getSpecTemplateId()));
+        if (CollectionUtils.isEmpty(specList) || specList.stream().anyMatch(x -> ObjectUtils.isNull(x.getSpecId()))){
+            deleteSpecAttr(bo);
+        }else if (CollectionUtils.isNotEmpty(list)){
+            List<Long> collect = list.stream().map(GoodsSpec::getSpecId).collect(Collectors.toList());
+            List<Long> collect1 = specList.stream().filter(x -> ObjectUtils.isNotNull(x.getSpecId())).map(GoodsSpecAddBo::getSpecId).collect(Collectors.toList());
+            if (collect.size() != collect1.size()){
+                //与数据库的规格数量不一样.删除以后重新添加
+                deleteSpecAttr(bo);
+            }else {
+                //只删除或者修改了规格值
+                updateSpecAttr(bo);
+            }
+        }else {
+            deleteSpecAttr(bo);
+        }
+        specAttrRelList = new ArrayList<>();
+        //组装规格属性列表
+        createSpec(specList,specList.get(0).getSpecAttrList(),0,new ArrayList<>(),goodsSpecTemplate.getSpecTemplateId());
+        return specAttrRelList;
+    }
+
+    private void updateSpecAttr(GoodsSpecTemplateEditBo bo){
+        List<GoodsSpecAddBo> specList = bo.getSpecList();
+        List<Long> attrIds = new ArrayList<>();
+        specList.forEach(item -> {
+            if (CollectionUtils.isNotEmpty(item.getSpecAttrList())){
+                List<Long> collect = item.getSpecAttrList().stream().filter(x -> ObjectUtils.isNotNull(x.getSpecAttributeId())).map(GoodsSpecAttributeAddBo::getSpecAttributeId).collect(Collectors.toList());
+                attrIds.addAll(collect);
+            }
+        });
+        List<Long> specIds = specList.stream().map(GoodsSpecAddBo::getSpecId).collect(Collectors.toList());
+        List<GoodsSpecAttribute> list = goodsSpecAttributeService.list(new LambdaQueryWrapper<GoodsSpecAttribute>()
+                .in(GoodsSpecAttribute::getSpecId, specIds)
+                .notIn(GoodsSpecAttribute::getSpecAttributeId, attrIds));
+        if (CollectionUtils.isNotEmpty(list)){
+            list.forEach(item -> {
+                goodsSpecAttributeRelationService.remove(new LambdaQueryWrapper<GoodsSpecAttributeRelation>()
+                .eq(GoodsSpecAttributeRelation::getSpecTemplateId,bo.getSpecTemplateId())
+                .like(GoodsSpecAttributeRelation::getSpecAttributeIds,item.getSpecAttributeId()));
+            });
+            goodsSpecAttributeService.removeByIds(list.stream().map(GoodsSpecAttribute::getSpecAttributeId).collect(Collectors.toList()));
+        }
+        Integer sort = 1;
+        for (GoodsSpecAddBo spec : specList) {
+            GoodsSpec goodsSpec = new GoodsSpec();
+            BeanUtil.copyProperties(spec,goodsSpec);
+            goodsSpec.setSpecTemplateId(bo.getSpecTemplateId());
+            goodsSpec.setUpdateTime(DateUtils.getNowTime());
+            goodsSpec.setSort(sort);
+            goodsSpecService.updateById(goodsSpec);
+            spec.setSpecId(goodsSpec.getSpecId());
+            if (CollectionUtils.isNotEmpty(spec.getSpecAttrList())){
+                Integer attrSort = 1;
+                for (GoodsSpecAttributeAddBo item : spec.getSpecAttrList()) {
+                    GoodsSpecAttribute goodsSpecAttribute = new GoodsSpecAttribute();
+                    BeanUtil.copyProperties(item, goodsSpecAttribute);
+                    if (ObjectUtils.isNull(goodsSpecAttribute.getCreateTime())){
+                        goodsSpecAttribute.setCreateTime(DateUtils.getNowTime());
+                    }
+                    goodsSpecAttribute.setUpdateTime(DateUtils.getNowTime());
+                    goodsSpecAttribute.setSpecId(goodsSpec.getSpecId());
+                    if (ObjectUtils.isNull(item.getSort())){
+                        goodsSpecAttribute.setSort(attrSort);
+                    }
+                    goodsSpecAttributeService.saveOrUpdate(goodsSpecAttribute);
+                    item.setSpecAttributeId(goodsSpecAttribute.getSpecAttributeId());
+                    attrSort ++;
+                }
+            }
+            sort ++;
+        }
+    }
+
+    private void deleteSpecAttr(GoodsSpecTemplateEditBo bo){
+        List<GoodsSpecAddBo> specList = bo.getSpecList();
+        //有新增的规格
+        List<GoodsSpec> list = goodsSpecService.list(new LambdaQueryWrapper<GoodsSpec>()
+                .eq(GoodsSpec::getSpecTemplateId, bo.getSpecTemplateId()));
+        if (CollectionUtils.isNotEmpty(list)){
+            List<Long> collect = list.stream().map(x -> x.getSpecId()).collect(Collectors.toList());
+            //清除规格属性
+            goodsSpecAttributeService.remove(new LambdaQueryWrapper<GoodsSpecAttribute>()
+                    .in(GoodsSpecAttribute::getSpecId,collect));
+            //清除属性绑定的商品信息
+            goodsSpecAttributeRelationService.remove(new LambdaQueryWrapper<GoodsSpecAttributeRelation>()
+                    .eq(GoodsSpecAttributeRelation::getSpecTemplateId,bo.getSpecTemplateId()));
+            //清除规格
+            goodsSpecService.remove(new LambdaQueryWrapper<GoodsSpec>().eq(GoodsSpec::getSpecTemplateId,bo.getSpecTemplateId()));
+        }
+        if (CollectionUtils.isNotEmpty(specList)){
+            //重新添加规格
+            Integer sort = 1;
+            for (GoodsSpecAddBo spec : specList) {
+                GoodsSpec goodsSpec = new GoodsSpec();
+                BeanUtil.copyProperties(spec,goodsSpec);
+                goodsSpec.setSpecTemplateId(bo.getSpecTemplateId());
+                goodsSpec.setCreateTime(DateUtils.getNowTime());
+                goodsSpec.setUpdateTime(DateUtils.getNowTime());
+                goodsSpec.setSort(sort);
+                goodsSpecService.save(goodsSpec);
+                spec.setSpecId(goodsSpec.getSpecId());
+                if (CollectionUtils.isNotEmpty(spec.getSpecAttrList())){
+                    Integer attrSortId = 1;
+                    for (GoodsSpecAttributeAddBo item : spec.getSpecAttrList()) {
+                        GoodsSpecAttribute goodsSpecAttribute = new GoodsSpecAttribute();
+                        BeanUtil.copyProperties(item, goodsSpecAttribute);
+                        goodsSpecAttribute.setCreateTime(DateUtils.getNowTime());
+                        goodsSpecAttribute.setUpdateTime(DateUtils.getNowTime());
+                        goodsSpecAttribute.setSpecId(goodsSpec.getSpecId());
+                        if (ObjectUtils.isNull(item.getSort())){
+                            goodsSpecAttribute.setSort(attrSortId);
+                        }
+                        goodsSpecAttributeService.save(goodsSpecAttribute);
+                        item.setSpecAttributeId(goodsSpecAttribute.getSpecAttributeId());
+                        attrSortId ++;
+                    }
+                }
+                sort ++;
+            }
+        }
+    };
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(GoodsSpecTemplate entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Long id, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        GoodsSpecTemplate template = getById(id);
+        if (Objects.isNull(template)){
+            throw new CustomException("模板信息获取失败");
+        }
+        //删除规格模板关联的信息
+        List<GoodsSpec> list = goodsSpecService.list(new LambdaQueryWrapper<GoodsSpec>()
+                .eq(GoodsSpec::getSpecTemplateId, id));
+        if (CollectionUtils.isNotEmpty(list)){
+            List<Long> specIds = list.stream().map(GoodsSpec::getSpecId).collect(Collectors.toList());
+            goodsSpecAttributeService.remove(new LambdaQueryWrapper<GoodsSpecAttribute>()
+            .in(GoodsSpecAttribute::getSpecId,specIds));
+            goodsSpecService.remove(new LambdaQueryWrapper<GoodsSpec>()
+            .eq(GoodsSpec::getSpecTemplateId,id));
+        }
+        goodsSpecAttributeRelationService.remove(new LambdaQueryWrapper<GoodsSpecAttributeRelation>()
+        .eq(GoodsSpecAttributeRelation::getSpecTemplateId,id));
+        return removeById(template);
+    }
+
+    public List<GoodsSpecAttributeRelationVo> specAttrRelList;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public List<GoodsSpecAttributeRelationVo> addSpec(GoodsSpecTemplateAddBo addBo) {
+        //新增模板
+        GoodsSpecTemplate goodsSpecTemplate = new GoodsSpecTemplate();
+        BeanUtil.copyProperties(addBo,goodsSpecTemplate);
+        goodsSpecTemplate.setCreateTime(DateUtils.getNowTime());
+        goodsSpecTemplate.setUpdateTime(DateUtils.getNowTime());
+        save(goodsSpecTemplate);
+        addBo.setSpecTemplateId(goodsSpecTemplate.getSpecTemplateId());
+        List<GoodsSpecAddBo> bos = addBo.getSpecList();
+        Integer sort = 1;//排序值
+        //新增规格和规格值
+        for (GoodsSpecAddBo bo : bos) {
+            GoodsSpec goodsSpec = new GoodsSpec();
+            BeanUtil.copyProperties(bo,goodsSpec);
+            goodsSpec.setSpecTemplateId(goodsSpecTemplate.getSpecTemplateId());
+            goodsSpec.setCreateTime(DateUtils.getNowTime());
+            goodsSpec.setUpdateTime(DateUtils.getNowTime());
+            goodsSpec.setSort(sort);
+            goodsSpecService.save(goodsSpec);
+            bo.setSpecId(goodsSpec.getSpecId());
+            Integer attrSort = 1;//排序值
+            if (CollectionUtils.isNotEmpty(bo.getSpecAttrList())){
+                for (GoodsSpecAttributeAddBo item : bo.getSpecAttrList()) {
+                    GoodsSpecAttribute goodsSpecAttribute = new GoodsSpecAttribute();
+                    BeanUtil.copyProperties(item, goodsSpecAttribute);
+                    goodsSpecAttribute.setCreateTime(DateUtils.getNowTime());
+                    goodsSpecAttribute.setUpdateTime(DateUtils.getNowTime());
+                    goodsSpecAttribute.setSpecId(goodsSpec.getSpecId());
+                    if (ObjectUtils.isNull(item.getSort())){
+                        item.setSort(attrSort);
+                    }
+                    goodsSpecAttributeService.save(goodsSpecAttribute);
+                    item.setSpecAttributeId(goodsSpecAttribute.getSpecAttributeId());
+                    attrSort ++;
+                }
+            }
+            sort ++;
+        }
+        specAttrRelList = new ArrayList<>();
+        //组装规格属性列表
+        createSpec(bos,bos.get(0).getSpecAttrList(),0,new ArrayList<>(),goodsSpecTemplate.getSpecTemplateId());
+        return specAttrRelList;
+    }
+
+    private void createSpec(List<GoodsSpecAddBo> bos, List<GoodsSpecAttributeAddBo> specAttrList, int index, List<GoodsSpecAttrListVo> vos,Long specTemplateId) {
+        for (int k = 0; k < specAttrList.size(); k++) {
+            List<GoodsSpecAttrListVo> attrListVos = copyList(vos);
+            if (index < bos.size() - 1){
+                GoodsSpecAttrListVo vo = new GoodsSpecAttrListVo();
+                vo.setKey(specAttrList.get(k).getSpecAttributeId());
+                vo.setValue(specAttrList.get(k).getName());
+                attrListVos.add(vo);
+                createSpec(bos,bos.get(index + 1).getSpecAttrList(),index + 1,attrListVos,specTemplateId);
+            }else {
+                GoodsSpecAttrListVo vo = new GoodsSpecAttrListVo();
+                vo.setKey(specAttrList.get(k).getSpecAttributeId());
+                vo.setValue(specAttrList.get(k).getName());
+                attrListVos.add(vo);
+                GoodsSpecAttributeRelationVo relationVo = new GoodsSpecAttributeRelationVo();
+                relationVo.setAttrListVos(attrListVos);
+                //模板信息
+                GoodsSpecTemplate specTemplate = getById(specTemplateId);
+                relationVo.setSpecTemplateId(specTemplate.getSpecTemplateId());
+                relationVo.setEducationTypeId(specTemplate.getEducationTypeId());
+                relationVo.setBusinessId(specTemplate.getBusinessId());
+                List<Long> attrIds = attrListVos.stream().map(GoodsSpecAttrListVo::getKey).collect(Collectors.toList());
+                //添加商品信息
+               GoodsSpecAttributeRelation attributeRelations = goodsSpecAttributeRelationService
+                        .getOne(new LambdaQueryWrapper<GoodsSpecAttributeRelation>()
+                        .eq(GoodsSpecAttributeRelation::getSpecTemplateId, specTemplateId)
+                        .eq(GoodsSpecAttributeRelation::getSpecAttributeIds,StringUtils.join(attrIds,",")));
+               if (ObjectUtils.isNotNull(attributeRelations) && ObjectUtils.isNotNull(attributeRelations.getGoodsId())){
+                   Goods goods = goodsService.getById(attributeRelations.getGoodsId());
+                   relationVo.setGoodsName(goods.getGoodsName());
+                   relationVo.setGoodsType(goods.getGoodsType());
+                   relationVo.setGoodsStatus(goods.getGoodsStatus());
+                   relationVo.setCode(goods.getCode());
+                   relationVo.setGoodsId(goods.getGoodsId());
+                   relationVo.setServiceTimeNum(goods.getServiceTimeNum());
+                   relationVo.setServiceTimeType(goods.getServiceTimeType());
+                   relationVo.setStandPrice(goods.getStandPrice());
+                   relationVo.setValidityStartTime(goods.getValidityStartTime());
+                   relationVo.setValidityEndTime(goods.getValidityEndTime());
+                   if (StrUtil.isNotBlank(goods.getSubjectIds())) {
+                       relationVo.setSubjectIds(goods.getSubjectIds());
+                       List<String> ids = Arrays.stream(goods.getSubjectIds().split(",")).collect(Collectors.toList());
+                       //科目名称
+                       List<CourseSubject> subjectList = courseSubjectService.list(new LambdaQueryWrapper<CourseSubject>()
+                               .in(CourseSubject::getId, ids));
+                       List<String> names = subjectList.stream().map(CourseSubject::getSubjectName).collect(Collectors.toList());
+                       relationVo.setSubjectNames(StringUtils.join(names, ","));
+                   }
+               }
+                specAttrRelList.add(relationVo);
+            }
+        }
+    }
+
+    private List<GoodsSpecAttrListVo> copyList(List<GoodsSpecAttrListVo> list){
+        if (CollectionUtils.isEmpty(list)){
+            return new ArrayList<>();
+        }
+        return list.stream().map(x -> BeanUtil.toBean(x,GoodsSpecAttrListVo.class)).collect(Collectors.toList());
+    }
+
+
+    @Override
+    public GoodsVo getSpecTemplate(Long specTemplateId, String specAttrIds) {
+        GoodsSpecAttributeRelation relation = goodsSpecAttributeRelationService.getOne(new LambdaQueryWrapper<GoodsSpecAttributeRelation>()
+                .eq(GoodsSpecAttributeRelation::getSpecTemplateId, specTemplateId)
+                .eq(GoodsSpecAttributeRelation::getSpecAttributeIds, specAttrIds));
+        if (ObjectUtils.isNull(relation) || ObjectUtils.isNull(relation.getGoodsId())){
+            throw new CustomException("该规格属性下没有设置商品！请检查");
+        }
+        Goods goods = goodsService.getById(relation.getGoodsId());
+        return BeanUtil.toBean(goods,GoodsVo.class);
+    }
+
+}

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

@@ -0,0 +1,43 @@
+package com.zhongzheng.modules.goods.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 规格属性详情VO
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+@Data
+@ApiModel("规格属性详情VO")
+public class GoodsSpecAttrDetailVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 规格属性ID */
+	@ApiModelProperty("规格属性ID")
+	private Long specAttributeId;
+
+	/** 规格ID */
+	@ApiModelProperty("规格ID")
+	private Long specId;
+	/** 值名称 */
+	@ApiModelProperty("值名称")
+	private String name;
+	/** 编码 */
+	@ApiModelProperty("编码")
+	private String code;
+	/** 排序值 */
+	@ApiModelProperty("排序值")
+	private Integer sort;
+	/** 1有效 0无效 */
+	@ApiModelProperty("1有效 0无效")
+	private Integer status;
+	@ApiModelProperty("子规格属性值集合")
+	private List<GoodsSpecAttrDetailVo> childrenSpecAttr;
+}

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

@@ -0,0 +1,25 @@
+package com.zhongzheng.modules.goods.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 【请填写功能名称】视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+@Data
+@ApiModel("【请填写功能名称】视图对象")
+public class GoodsSpecAttrListVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 规格属性ID */
+	@ApiModelProperty("规格属性ID")
+	private Long key;
+
+	@ApiModelProperty("规格属性名称")
+	private String value;
+}

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

@@ -0,0 +1,75 @@
+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.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 【请填写功能名称】视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+@Data
+@ApiModel("【请填写功能名称】视图对象")
+public class GoodsSpecAttributeRelationVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 主键 */
+	@ApiModelProperty("主键")
+	private Long id;
+
+	/** 规格属性ID集合 */
+	@Excel(name = "规格属性ID集合")
+	@ApiModelProperty("规格属性ID集合")
+	private String specAttributeIds;
+	/** 商品ID */
+	@Excel(name = "商品ID")
+	@ApiModelProperty("商品ID")
+	private Long goodsId;
+	/** 规格模板ID */
+	@Excel(name = "规格模板ID")
+	@ApiModelProperty("规格模板ID")
+	private Long specTemplateId;
+	@ApiModelProperty("规格模板ID")
+	private Long educationTypeId;
+	@ApiModelProperty("规格模板ID")
+	private Long businessId;
+	/** 1有效 0无效 */
+	@Excel(name = "1有效 0无效")
+	@ApiModelProperty("1有效 0无效")
+	private Integer status;
+
+	@ApiModelProperty("商品名称")
+	private String goodsName;
+	@ApiModelProperty("1上架 0未上架")
+	private Integer goodsStatus;
+	@ApiModelProperty("编码")
+	private String code;
+	@ApiModelProperty("商品类型 1视频2题库 3补考 4前培 ")
+	private Integer goodsType;
+	@ApiModelProperty("科目ID，拼接")
+	private String subjectIds;
+	@ApiModelProperty("科目名称拼接")
+	private String subjectNames;
+	@ApiModelProperty("标准价格")
+	private BigDecimal standPrice;
+	@ApiModelProperty("有效期开始")
+	private Long validityStartTime;
+	@ApiModelProperty("有效期结束")
+	private Long validityEndTime;
+	@ApiModelProperty("服务期类型 1年 2月 3日 4区间")
+	private Integer serviceTimeType;
+	@ApiModelProperty("服务期数值")
+	private Long serviceTimeNum;
+
+	@ApiModelProperty("属性值")
+	private List<GoodsSpecAttrListVo> attrListVos;
+}

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

@@ -0,0 +1,47 @@
+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 ruoyi
+ * @date 2022-09-29
+ */
+@Data
+@ApiModel("【请填写功能名称】视图对象")
+public class GoodsSpecAttributeVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 规格属性ID */
+	@ApiModelProperty("规格属性ID")
+	private Long specAttributeId;
+
+	/** 规格ID */
+	@Excel(name = "规格ID")
+	@ApiModelProperty("规格ID")
+	private Long specId;
+	/** 模板名称 */
+	@Excel(name = "模板名称")
+	@ApiModelProperty("模板名称")
+	private String name;
+	/** 编码 */
+	@Excel(name = "编码")
+	@ApiModelProperty("编码")
+	private String code;
+	/** 排序值 */
+	@Excel(name = "排序值")
+	@ApiModelProperty("排序值")
+	private Integer sort;
+	/** 1有效 0无效 */
+	@Excel(name = "1有效 0无效")
+	@ApiModelProperty("1有效 0无效")
+	private Integer status;
+}

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

@@ -0,0 +1,56 @@
+package com.zhongzheng.modules.goods.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zhongzheng.modules.goods.bo.GoodsSpecAddBo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 【请填写功能名称】视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+@Data
+@ApiModel("【请填写功能名称】视图对象")
+public class GoodsSpecTemplateVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 规格模板ID */
+	@ApiModelProperty("规格模板ID")
+	private Long specTemplateId;
+
+	/** 编码 */
+	@Excel(name = "编码")
+	@ApiModelProperty("编码")
+	private String code;
+	/** 教育类型id */
+	@Excel(name = "教育类型id")
+	@ApiModelProperty("教育类型id")
+	private Long educationTypeId;
+	@ApiModelProperty("教育类型名称")
+	private String educationName;
+	@ApiModelProperty("业务层次名称")
+	private String businessName;
+	@ApiModelProperty("商品规格数量")
+	private Integer specNumber;
+	/** 业务层次id */
+	@Excel(name = "业务层次id")
+	@ApiModelProperty("业务层次id")
+	private Long businessId;
+	/** 模板名称 */
+	@Excel(name = "模板名称")
+	@ApiModelProperty("模板名称")
+	private String name;
+	/** 1有效 0无效 */
+	@Excel(name = "1有效 0无效")
+	@ApiModelProperty("1有效 0无效")
+	private Integer status;
+	@ApiModelProperty("模板规格集合")
+	private List<GoodsSpecVo> specList;
+}

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

@@ -0,0 +1,50 @@
+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;
+import java.util.List;
+
+
+/**
+ * 【请填写功能名称】视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+@Data
+@ApiModel("【请填写功能名称】视图对象")
+public class GoodsSpecVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 规格ID */
+	@ApiModelProperty("规格ID")
+	private Long specId;
+
+	/** 规格模板ID */
+	@Excel(name = "规格模板ID")
+	@ApiModelProperty("规格模板ID")
+	private Long specTemplateId;
+	/** 模板名称 */
+	@Excel(name = "模板名称")
+	@ApiModelProperty("模板名称")
+	private String name;
+	/** 编码 */
+	@Excel(name = "编码")
+	@ApiModelProperty("编码")
+	private String code;
+	/** 排序值 */
+	@Excel(name = "排序值")
+	@ApiModelProperty("排序值")
+	private Integer sort;
+	/** 1有效 0无效 */
+	@Excel(name = "1有效 0无效")
+	@ApiModelProperty("1有效 0无效")
+	private Integer status;
+
+	@ApiModelProperty("规格属性值集合")
+	private List<GoodsSpecAttributeVo> specAttrList;
+}

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

@@ -317,4 +317,9 @@ public class GoodsVo {
 	/** 排序字段 */
 	@ApiModelProperty("排序字段")
 	private Integer sort;
+	@ApiModelProperty("商品规格模板数量")
+	private Integer specTemplateNumber;
+	@ApiModelProperty("默认规格模板ID")
+	private Long specTemplateId;
+
 }

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityRecommendMapper.xml

@@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="sort" column="sort"/>
         <result property="year" column="year"/>
         <result property="coverUrl" column="cover_url"/>
+        <result property="specTemplateId" column="spec_template_id"/>
     </resultMap>
 
     <select id="findGoodsList" resultMap="GoodsListResult">
@@ -54,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             rg.sort,
             g.code,
             g.year,
+            g.spec_template_id,
             g.cover_url
         FROM
             activity_recommend_goods rg

zhongzheng-system/src/main/resources/mapper/modules/exam/ExamActivityMapper.xml

@@ -7,9 +7,13 @@
     <select id="getActivityList" parameterType="com.zhongzheng.modules.exam.bo.ExamActivityQueryBo"
             resultType="com.zhongzheng.modules.exam.vo.ExamActivityVo">
         SELECT ea.*,
-               (SELECT su.user_name FROM sys_user su WHERE su.user_id = ea.creator_id) as creatorName
+               (SELECT su.user_name FROM sys_user su WHERE su.user_id = ea.creator_id) as creatorName,
+               ma.apply_name as mockApplyName,
+               ma.apply_id as mockApplyId,
+               ma.code as mockApplyCode
         FROM exam_activity ea
-        WHERE ea.`status` = 1
+        LEFT JOIN mock_apply ma ON ea.mock_apply_id = ma.apply_id
+        WHERE ea.`status` = 1 AND ma.`status` = 1
         <if test="name != null and name != ''">
             AND (ea.name like concat('%', #{name}, '%'))
         </if>

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

@@ -91,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="goodsPlayConfig" column="goods_play_config"/>
         <result property="goodsExamConfig" column="goods_exam_config"/>
         <result property="sectionMaxNum" column="section_max_num"/>
+        <result property="specTemplateId" column="spec_template_id"/>
 
         <result property="supplyName" column="supply_name"/>
         <result property="educationName" column="education_name"/>
@@ -127,6 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="chapterNum" column="chapter_num"/>
         <result property="examNum" column="exam_num"/>
         <result property="linePrice" column="line_price"/>
+        <result property="specTemplateNumber" column="spec_template_number"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.exam.vo.ExamNumberGoodsVo" id="ExamNumberGoodsVoResult">
@@ -154,6 +156,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         s.school_name,
         m.category_name,
         (SELECT GROUP_CONCAT(subject_name)  from course_subject where FIND_IN_SET(id,g.subject_ids)) subject_names,
+        (SELECT COUNT(*) FROM goods_spec_attribute_relation gar WHERE gar.goods_id = g.goods_id AND gar.`status` = 1 GROUP BY gar.spec_template_id) spec_template_number,
         ot.type AS template_type,
         (SELECT gs.goods_name FROM goods gs where 1=1 and g.make_goods_id = gs.goods_id) as make_goods_name,
         (SELECT gs.code FROM goods gs where 1=1 and g.make_goods_id = gs.goods_id) as make_goods_code
@@ -228,6 +231,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="goodsType != null and goodsType != ''">
             AND g.goods_type = #{goodsType}
         </if>
+        <if test="code != null and code != ''">
+            AND g.code = #{code}
+        </if>
         <if test="makeGoodsId != null and makeGoodsId != ''">
             AND g.make_goods_id = #{makeGoodsId}
         </if>