submit

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityTempController.java → zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityTemplateController.java

@@ -4,11 +4,11 @@ import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempQueryBo;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityTempService;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTempVo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateAddBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateQueryBo;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityTemplateService;
+import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplateVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -28,18 +28,18 @@ import java.util.List;
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/distribution/temp")
-public class DistributionActivityTempController extends BaseController {
+public class DistributionActivityTemplateController extends BaseController {
 
-    private final IDistributionActivityTempService iDistributionActivityTempService;
+    private final IDistributionActivityTemplateService iDistributionActivityTemplateService;
 
     /**
      * 查询【请填写功能名称】列表
      */
     @ApiOperation("查询分销活动模板列表")
     @GetMapping("/list")
-    public TableDataInfo<DistributionActivityTempVo> list(DistributionActivityTempQueryBo bo) {
+    public TableDataInfo<DistributionActivityTemplateVo> list(DistributionActivityTemplateQueryBo bo) {
         startPage();
-        List<DistributionActivityTempVo> list = iDistributionActivityTempService.queryList(bo);
+        List<DistributionActivityTemplateVo> list = iDistributionActivityTemplateService.queryList(bo);
         return getDataTable(list);
     }
 
@@ -48,9 +48,9 @@ public class DistributionActivityTempController extends BaseController {
      */
     @ApiOperation("导出【请填写功能名称】列表")
     @GetMapping("/export")
-    public AjaxResult<DistributionActivityTempVo> export(DistributionActivityTempQueryBo bo) {
-        List<DistributionActivityTempVo> list = iDistributionActivityTempService.queryList(bo);
-        ExcelUtil<DistributionActivityTempVo> util = new ExcelUtil<DistributionActivityTempVo>(DistributionActivityTempVo.class);
+    public AjaxResult<DistributionActivityTemplateVo> export(DistributionActivityTemplateQueryBo bo) {
+        List<DistributionActivityTemplateVo> list = iDistributionActivityTemplateService.queryList(bo);
+        ExcelUtil<DistributionActivityTemplateVo> util = new ExcelUtil<DistributionActivityTemplateVo>(DistributionActivityTemplateVo.class);
         return util.exportExcel(list, "【请填写功能名称】");
     }
 
@@ -59,8 +59,8 @@ public class DistributionActivityTempController extends BaseController {
      */
     @ApiOperation("获取分销活动模板详细信息")
     @GetMapping("/{id}")
-    public AjaxResult<DistributionActivityTempVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iDistributionActivityTempService.queryById(id));
+    public AjaxResult<DistributionActivityTemplateVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iDistributionActivityTemplateService.queryById(id));
     }
 
     /**
@@ -68,8 +68,8 @@ public class DistributionActivityTempController extends BaseController {
      */
     @ApiOperation("新增分销活动模板")
     @PostMapping("/save")
-    public AjaxResult<Void> add(@RequestBody DistributionActivityTempAddBo bo) {
-        return toAjax(iDistributionActivityTempService.insertByAddBo(bo) ? 1 : 0);
+    public AjaxResult<Void> add(@RequestBody DistributionActivityTemplateAddBo bo) {
+        return toAjax(iDistributionActivityTemplateService.insertByAddBo(bo) ? 1 : 0);
     }
 
     /**
@@ -77,8 +77,8 @@ public class DistributionActivityTempController extends BaseController {
      */
     @ApiOperation("修改分销活动模板")
     @PutMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody DistributionActivityTempEditBo bo) {
-        return toAjax(iDistributionActivityTempService.updateByEditBo(bo) ? 1 : 0);
+    public AjaxResult<Void> edit(@RequestBody DistributionActivityTemplateEditBo bo) {
+        return toAjax(iDistributionActivityTemplateService.updateByEditBo(bo) ? 1 : 0);
     }
 
     /**
@@ -87,6 +87,6 @@ public class DistributionActivityTempController extends BaseController {
     @ApiOperation("删除【请填写功能名称】")
     @DeleteMapping("/{ids}")
     public AjaxResult<Void> remove(@PathVariable Long[] ids) {
-        return toAjax(iDistributionActivityTempService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+        return toAjax(iDistributionActivityTemplateService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
     }
 }

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityTempGoodsController.java → zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityTemplateGoodsController.java

@@ -6,11 +6,11 @@ import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempGoodsAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempGoodsEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempGoodsQueryBo;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityTempGoodsService;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTempGoodsVo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateGoodsAddBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateGoodsEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateGoodsQueryBo;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityTemplateGoodsService;
+import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplateGoodsVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -31,9 +31,9 @@ import java.util.List;
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/goods")
-public class DistributionActivityTempGoodsController extends BaseController {
+public class DistributionActivityTemplateGoodsController extends BaseController {
 
-    private final IDistributionActivityTempGoodsService iDistributionActivityTempGoodsService;
+    private final IDistributionActivityTemplateGoodsService iDistributionActivityTemplateGoodsService;
 
     /**
      * 查询【请填写功能名称】列表
@@ -41,9 +41,9 @@ public class DistributionActivityTempGoodsController extends BaseController {
     @ApiOperation("查询【请填写功能名称】列表")
     @PreAuthorize("@ss.hasPermi('system:goods:list')")
     @GetMapping("/list")
-    public TableDataInfo<DistributionActivityTempGoodsVo> list(DistributionActivityTempGoodsQueryBo bo) {
+    public TableDataInfo<DistributionActivityTemplateGoodsVo> list(DistributionActivityTemplateGoodsQueryBo bo) {
         startPage();
-        List<DistributionActivityTempGoodsVo> list = iDistributionActivityTempGoodsService.queryList(bo);
+        List<DistributionActivityTemplateGoodsVo> list = iDistributionActivityTemplateGoodsService.queryList(bo);
         return getDataTable(list);
     }
 
@@ -54,9 +54,9 @@ public class DistributionActivityTempGoodsController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:goods:export')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult<DistributionActivityTempGoodsVo> export(DistributionActivityTempGoodsQueryBo bo) {
-        List<DistributionActivityTempGoodsVo> list = iDistributionActivityTempGoodsService.queryList(bo);
-        ExcelUtil<DistributionActivityTempGoodsVo> util = new ExcelUtil<DistributionActivityTempGoodsVo>(DistributionActivityTempGoodsVo.class);
+    public AjaxResult<DistributionActivityTemplateGoodsVo> export(DistributionActivityTemplateGoodsQueryBo bo) {
+        List<DistributionActivityTemplateGoodsVo> list = iDistributionActivityTemplateGoodsService.queryList(bo);
+        ExcelUtil<DistributionActivityTemplateGoodsVo> util = new ExcelUtil<DistributionActivityTemplateGoodsVo>(DistributionActivityTemplateGoodsVo.class);
         return util.exportExcel(list, "【请填写功能名称】");
     }
 
@@ -66,8 +66,8 @@ public class DistributionActivityTempGoodsController extends BaseController {
     @ApiOperation("获取【请填写功能名称】详细信息")
     @PreAuthorize("@ss.hasPermi('system:goods:query')")
     @GetMapping("/{id}")
-    public AjaxResult<DistributionActivityTempGoodsVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iDistributionActivityTempGoodsService.queryById(id));
+    public AjaxResult<DistributionActivityTemplateGoodsVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iDistributionActivityTemplateGoodsService.queryById(id));
     }
 
     /**
@@ -77,8 +77,8 @@ public class DistributionActivityTempGoodsController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:goods:add')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
     @PostMapping()
-    public AjaxResult<Void> add(@RequestBody DistributionActivityTempGoodsAddBo bo) {
-        return toAjax(iDistributionActivityTempGoodsService.insertByAddBo(bo) ? 1 : 0);
+    public AjaxResult<Void> add(@RequestBody DistributionActivityTemplateGoodsAddBo bo) {
+        return toAjax(iDistributionActivityTemplateGoodsService.insertByAddBo(bo) ? 1 : 0);
     }
 
     /**
@@ -88,8 +88,8 @@ public class DistributionActivityTempGoodsController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:goods:edit')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
     @PutMapping()
-    public AjaxResult<Void> edit(@RequestBody DistributionActivityTempGoodsEditBo bo) {
-        return toAjax(iDistributionActivityTempGoodsService.updateByEditBo(bo) ? 1 : 0);
+    public AjaxResult<Void> edit(@RequestBody DistributionActivityTemplateGoodsEditBo bo) {
+        return toAjax(iDistributionActivityTemplateGoodsService.updateByEditBo(bo) ? 1 : 0);
     }
 
     /**
@@ -100,6 +100,6 @@ public class DistributionActivityTempGoodsController extends BaseController {
     @Log(title = "【请填写功能名称】" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult<Void> remove(@PathVariable Long[] ids) {
-        return toAjax(iDistributionActivityTempGoodsService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+        return toAjax(iDistributionActivityTemplateGoodsService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
     }
 }

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityTempPosterController.java → zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityTemplatePosterController.java

@@ -6,11 +6,11 @@ import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempPosterAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempPosterEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempPosterQueryBo;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityTempPosterService;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTempPosterVo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplatePosterAddBo;
+import com.zhongzheng.modules.distribution.bo.distributionActivityTemplatePosterEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplatePosterQueryBo;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityTemplatePosterService;
+import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplatePosterVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -31,9 +31,9 @@ import java.util.List;
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/distribution/poster")
-public class DistributionActivityTempPosterController extends BaseController {
+public class DistributionActivityTemplatePosterController extends BaseController {
 
-    private final IDistributionActivityTempPosterService iDistributionActivityTempPosterService;
+    private final IDistributionActivityTemplatePosterService iDistributionActivityTemplatePosterService;
 
     /**
      * 查询【请填写功能名称】列表
@@ -41,9 +41,9 @@ public class DistributionActivityTempPosterController extends BaseController {
     @ApiOperation("查询【请填写功能名称】列表")
     @PreAuthorize("@ss.hasPermi('system:poster:list')")
     @GetMapping("/list")
-    public TableDataInfo<DistributionActivityTempPosterVo> list(DistributionActivityTempPosterQueryBo bo) {
+    public TableDataInfo<DistributionActivityTemplatePosterVo> list(DistributionActivityTemplatePosterQueryBo bo) {
         startPage();
-        List<DistributionActivityTempPosterVo> list = iDistributionActivityTempPosterService.queryList(bo);
+        List<DistributionActivityTemplatePosterVo> list = iDistributionActivityTemplatePosterService.queryList(bo);
         return getDataTable(list);
     }
 
@@ -54,9 +54,9 @@ public class DistributionActivityTempPosterController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:poster:export')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult<DistributionActivityTempPosterVo> export(DistributionActivityTempPosterQueryBo bo) {
-        List<DistributionActivityTempPosterVo> list = iDistributionActivityTempPosterService.queryList(bo);
-        ExcelUtil<DistributionActivityTempPosterVo> util = new ExcelUtil<DistributionActivityTempPosterVo>(DistributionActivityTempPosterVo.class);
+    public AjaxResult<DistributionActivityTemplatePosterVo> export(DistributionActivityTemplatePosterQueryBo bo) {
+        List<DistributionActivityTemplatePosterVo> list = iDistributionActivityTemplatePosterService.queryList(bo);
+        ExcelUtil<DistributionActivityTemplatePosterVo> util = new ExcelUtil<DistributionActivityTemplatePosterVo>(DistributionActivityTemplatePosterVo.class);
         return util.exportExcel(list, "【请填写功能名称】");
     }
 
@@ -66,8 +66,8 @@ public class DistributionActivityTempPosterController extends BaseController {
     @ApiOperation("获取海报模板详细信息")
     @PreAuthorize("@ss.hasPermi('system:poster:query')")
     @GetMapping("/{posterTempId}")
-    public AjaxResult<DistributionActivityTempPosterVo> getInfo(@PathVariable("posterTempId" ) Long posterTempId) {
-        return AjaxResult.success(iDistributionActivityTempPosterService.queryById(posterTempId));
+    public AjaxResult<DistributionActivityTemplatePosterVo> getInfo(@PathVariable("posterTempId" ) Long posterTempId) {
+        return AjaxResult.success(iDistributionActivityTemplatePosterService.queryById(posterTempId));
     }
 
     /**
@@ -75,8 +75,8 @@ public class DistributionActivityTempPosterController extends BaseController {
      */
     @ApiOperation("新增海报模板")
     @PostMapping("/save")
-    public AjaxResult<Void> add(@RequestBody DistributionActivityTempPosterAddBo bo) {
-        return toAjax(iDistributionActivityTempPosterService.insertByAddBo(bo) ? 1 : 0);
+    public AjaxResult<Void> add(@RequestBody DistributionActivityTemplatePosterAddBo bo) {
+        return toAjax(iDistributionActivityTemplatePosterService.insertByAddBo(bo) ? 1 : 0);
     }
 
     /**
@@ -84,8 +84,8 @@ public class DistributionActivityTempPosterController extends BaseController {
      */
     @ApiOperation("修改海报模板")
     @PutMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody DistributionActivityTempPosterEditBo bo) {
-        return toAjax(iDistributionActivityTempPosterService.updateByEditBo(bo) ? 1 : 0);
+    public AjaxResult<Void> edit(@RequestBody distributionActivityTemplatePosterEditBo bo) {
+        return toAjax(iDistributionActivityTemplatePosterService.updateByEditBo(bo) ? 1 : 0);
     }
 
     /**
@@ -96,6 +96,6 @@ public class DistributionActivityTempPosterController extends BaseController {
     @Log(title = "【请填写功能名称】" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{posterTempIds}")
     public AjaxResult<Void> remove(@PathVariable Long[] posterTempIds) {
-        return toAjax(iDistributionActivityTempPosterService.deleteWithValidByIds(Arrays.asList(posterTempIds), true) ? 1 : 0);
+        return toAjax(iDistributionActivityTemplatePosterService.deleteWithValidByIds(Arrays.asList(posterTempIds), true) ? 1 : 0);
     }
 }

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityTempRelationController.java → zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityTemplateRelationController.java

@@ -6,11 +6,11 @@ import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempRelationAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempRelationEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempRelationQueryBo;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityTempRelationService;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTempRelationVo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateRelationAddBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateRelationEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateRelationQueryBo;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityTemplateRelationService;
+import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplateRelationVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -31,9 +31,9 @@ import java.util.List;
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/relation")
-public class DistributionActivityTempRelationController extends BaseController {
+public class DistributionActivityTemplateRelationController extends BaseController {
 
-    private final IDistributionActivityTempRelationService iDistributionActivityTempRelationService;
+    private final IDistributionActivityTemplateRelationService iDistributionActivityTemplateRelationService;
 
     /**
      * 查询【请填写功能名称】列表
@@ -41,9 +41,9 @@ public class DistributionActivityTempRelationController extends BaseController {
     @ApiOperation("查询【请填写功能名称】列表")
     @PreAuthorize("@ss.hasPermi('system:relation:list')")
     @GetMapping("/list")
-    public TableDataInfo<DistributionActivityTempRelationVo> list(DistributionActivityTempRelationQueryBo bo) {
+    public TableDataInfo<DistributionActivityTemplateRelationVo> list(DistributionActivityTemplateRelationQueryBo bo) {
         startPage();
-        List<DistributionActivityTempRelationVo> list = iDistributionActivityTempRelationService.queryList(bo);
+        List<DistributionActivityTemplateRelationVo> list = iDistributionActivityTemplateRelationService.queryList(bo);
         return getDataTable(list);
     }
 
@@ -54,9 +54,9 @@ public class DistributionActivityTempRelationController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:relation:export')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult<DistributionActivityTempRelationVo> export(DistributionActivityTempRelationQueryBo bo) {
-        List<DistributionActivityTempRelationVo> list = iDistributionActivityTempRelationService.queryList(bo);
-        ExcelUtil<DistributionActivityTempRelationVo> util = new ExcelUtil<DistributionActivityTempRelationVo>(DistributionActivityTempRelationVo.class);
+    public AjaxResult<DistributionActivityTemplateRelationVo> export(DistributionActivityTemplateRelationQueryBo bo) {
+        List<DistributionActivityTemplateRelationVo> list = iDistributionActivityTemplateRelationService.queryList(bo);
+        ExcelUtil<DistributionActivityTemplateRelationVo> util = new ExcelUtil<DistributionActivityTemplateRelationVo>(DistributionActivityTemplateRelationVo.class);
         return util.exportExcel(list, "【请填写功能名称】");
     }
 
@@ -66,8 +66,8 @@ public class DistributionActivityTempRelationController extends BaseController {
     @ApiOperation("获取【请填写功能名称】详细信息")
     @PreAuthorize("@ss.hasPermi('system:relation:query')")
     @GetMapping("/{id}")
-    public AjaxResult<DistributionActivityTempRelationVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iDistributionActivityTempRelationService.queryById(id));
+    public AjaxResult<DistributionActivityTemplateRelationVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iDistributionActivityTemplateRelationService.queryById(id));
     }
 
     /**
@@ -77,8 +77,8 @@ public class DistributionActivityTempRelationController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:relation:add')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
     @PostMapping()
-    public AjaxResult<Void> add(@RequestBody DistributionActivityTempRelationAddBo bo) {
-        return toAjax(iDistributionActivityTempRelationService.insertByAddBo(bo) ? 1 : 0);
+    public AjaxResult<Void> add(@RequestBody DistributionActivityTemplateRelationAddBo bo) {
+        return toAjax(iDistributionActivityTemplateRelationService.insertByAddBo(bo) ? 1 : 0);
     }
 
     /**
@@ -88,8 +88,8 @@ public class DistributionActivityTempRelationController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:relation:edit')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
     @PutMapping()
-    public AjaxResult<Void> edit(@RequestBody DistributionActivityTempRelationEditBo bo) {
-        return toAjax(iDistributionActivityTempRelationService.updateByEditBo(bo) ? 1 : 0);
+    public AjaxResult<Void> edit(@RequestBody DistributionActivityTemplateRelationEditBo bo) {
+        return toAjax(iDistributionActivityTemplateRelationService.updateByEditBo(bo) ? 1 : 0);
     }
 
     /**
@@ -100,6 +100,6 @@ public class DistributionActivityTempRelationController extends BaseController {
     @Log(title = "【请填写功能名称】" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult<Void> remove(@PathVariable Long[] ids) {
-        return toAjax(iDistributionActivityTempRelationService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+        return toAjax(iDistributionActivityTemplateRelationService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
     }
 }

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/system/SuperSysLoginController.java

@@ -2,35 +2,29 @@ package com.zhongzheng.controller.system;
 
 import com.zhongzheng.common.constant.Constants;
 import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.domain.entity.SysUser;
 import com.zhongzheng.common.core.domain.entity.TopSysUser;
-import com.zhongzheng.common.core.domain.entity.SysMenu;
 import com.zhongzheng.common.core.domain.model.LoginBody;
-import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.core.domain.model.TopLoginUser;
-import com.zhongzheng.common.exception.CustomException;
-import com.zhongzheng.common.exception.user.UserPasswordNotMatchException;
-import com.zhongzheng.common.utils.MessageUtils;
 import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.framework.manager.AsyncManager;
-import com.zhongzheng.framework.manager.factory.AsyncFactory;
 import com.zhongzheng.framework.web.service.TokenService;
 import com.zhongzheng.framework.web.service.TopSysLoginService;
+import com.zhongzheng.framework.web.service.TopSysPermissionService;
 import com.zhongzheng.framework.web.service.TopTokenService;
-import com.zhongzheng.framework.web.service.SysPermissionService;
-import com.zhongzheng.modules.system.service.ISysMenuService;
-import com.zhongzheng.modules.system.service.ISysUserService;
+import com.zhongzheng.modules.top.domain.TopSysMenu;
+import com.zhongzheng.modules.top.service.ITopSysMenuService;
+import com.zhongzheng.modules.top.service.ITopSysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * 登录验证
@@ -45,10 +39,10 @@ public class SuperSysLoginController
     private TopSysLoginService loginService;
 
     @Autowired
-    private ISysMenuService menuService;
+    private ITopSysMenuService menuService;
 
     @Autowired
-    private SysPermissionService permissionService;
+    private TopSysPermissionService permissionService;
 
     @Autowired
     private TopTokenService topTokenService;
@@ -59,7 +53,7 @@ public class SuperSysLoginController
     private TokenService tokenService;
 
     @Autowired
-    private ISysUserService userService;
+    private ITopSysUserService userService;
     /**
      * 登录方法
      *
@@ -89,17 +83,18 @@ public class SuperSysLoginController
     {
         TopLoginUser loginUser = topTokenService.getLoginUser(ServletUtils.getRequest());
         TopSysUser user = loginUser.getUser();
+
         // 角色集合
-        Set<String> roles = new HashSet<String>();
-        roles.add("admin");
+        Set<String> roles = permissionService.getRolePermission(user);
         // 权限集合
-        Set<String> permissions = new HashSet<String>();
-        permissions.add("*:*:*");
+        Set<String> permissions = permissionService.getMenuPermission(user);
         Map<String,Object> map = new HashMap<>();
         map.put("user", user);
         map.put("roles", roles);
         map.put("permissions", permissions);
+
         return AjaxResult.success(map);
+
     }
 
     /**
@@ -114,7 +109,7 @@ public class SuperSysLoginController
         TopLoginUser loginUser = topTokenService.getLoginUser(ServletUtils.getRequest());
         // 用户信息
         TopSysUser user = loginUser.getUser();
-        List<SysMenu> menus = menuService.selectMenuTreeByUserId(user.getUserId());
+        List<TopSysMenu> menus = menuService.selectMenuTreeByUserId(user.getUserId());
         return AjaxResult.success(menuService.buildMenus(menus));
     }
 
@@ -128,9 +123,9 @@ public class SuperSysLoginController
     public AjaxResult getChildToken()
     {
         //普通系统用户
-        SysUser user = userService.selectUserByUserName("admin");
-        LoginUser loginUser = new LoginUser(user, permissionService.getMenuPermission(user));
-        String token = tokenService.createToken(loginUser);
+        TopSysUser user = userService.selectUserByUserName("admin");
+        TopLoginUser loginUser = new TopLoginUser(user, permissionService.getMenuPermission(user));
+        String token = tokenService.createTopToken(loginUser);
         AjaxResult ajax = AjaxResult.success();
         ajax.put(Constants.TOKEN, token);
         return ajax;

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/top/TopSysDictDataController.java

@@ -0,0 +1,102 @@
+package com.zhongzheng.controller.top;
+
+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.modules.top.bo.TopSysDictDataAddBo;
+import com.zhongzheng.modules.top.bo.TopSysDictDataEditBo;
+import com.zhongzheng.modules.top.bo.TopSysDictDataQueryBo;
+import com.zhongzheng.modules.top.service.ITopSysDictDataService;
+import com.zhongzheng.modules.top.vo.TopSysDictDataVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 【请填写功能名称】Controller
+ * 
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+@Api(value = "【请填写功能名称】控制器", tags = {"【请填写功能名称】管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/top/dict/data")
+public class TopSysDictDataController extends BaseController {
+
+    private final ITopSysDictDataService iTopSysDictDataService;
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @ApiOperation("查询【请填写功能名称】列表")
+    @GetMapping("/list")
+    public AjaxResult<List<TopSysDictDataVo>> list(TopSysDictDataQueryBo bo) {
+        List<TopSysDictDataVo> list = iTopSysDictDataService.queryList(bo);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    @ApiOperation("导出【请填写功能名称】列表")
+    @PreAuthorize("@ss.hasPermi('system:data:export')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<TopSysDictDataVo> export(TopSysDictDataQueryBo bo) {
+        List<TopSysDictDataVo> list = iTopSysDictDataService.queryList(bo);
+        ExcelUtil<TopSysDictDataVo> util = new ExcelUtil<TopSysDictDataVo>(TopSysDictDataVo.class);
+        return util.exportExcel(list, "【请填写功能名称】");
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @ApiOperation("获取【请填写功能名称】详细信息")
+    @PreAuthorize("@ss.hasPermi('system:data:query')")
+    @GetMapping("/{dictCode}")
+    public AjaxResult<TopSysDictDataVo> getInfo(@PathVariable("dictCode" ) Long dictCode) {
+        return AjaxResult.success(iTopSysDictDataService.queryById(dictCode));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @ApiOperation("新增【请填写功能名称】")
+    @PreAuthorize("@ss.hasPermi('system:data:add')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody TopSysDictDataAddBo bo) {
+        return toAjax(iTopSysDictDataService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @ApiOperation("修改【请填写功能名称】")
+    @PreAuthorize("@ss.hasPermi('system:data:edit')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public AjaxResult<Void> edit(@RequestBody TopSysDictDataEditBo bo) {
+        return toAjax(iTopSysDictDataService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     */
+    @ApiOperation("删除【请填写功能名称】")
+    @PreAuthorize("@ss.hasPermi('system:data:remove')")
+    @Log(title = "【请填写功能名称】" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{dictCodes}")
+    public AjaxResult<Void> remove(@PathVariable Long[] dictCodes) {
+        return toAjax(iTopSysDictDataService.deleteWithValidByIds(Arrays.asList(dictCodes), true) ? 1 : 0);
+    }
+}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/top/TopSysDictTypeController.java

@@ -0,0 +1,105 @@
+package com.zhongzheng.controller.top;
+
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.modules.top.bo.TopSysDictTypeAddBo;
+import com.zhongzheng.modules.top.bo.TopSysDictTypeEditBo;
+import com.zhongzheng.modules.top.bo.TopSysDictTypeQueryBo;
+import com.zhongzheng.modules.top.service.ITopSysDictTypeService;
+import com.zhongzheng.modules.top.vo.TopSysDictTypeVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 【请填写功能名称】Controller
+ * 
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+@Api(value = "【请填写功能名称】控制器", tags = {"【请填写功能名称】管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/top/type")
+public class TopSysDictTypeController extends BaseController {
+
+    private final ITopSysDictTypeService iTopSysDictTypeService;
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @ApiOperation("查询【请填写功能名称】列表")
+    @PreAuthorize("@ss.hasPermi('system:type:list')")
+    @GetMapping("/list")
+    public TableDataInfo<TopSysDictTypeVo> list(TopSysDictTypeQueryBo bo) {
+        startPage();
+        List<TopSysDictTypeVo> list = iTopSysDictTypeService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    @ApiOperation("导出【请填写功能名称】列表")
+    @PreAuthorize("@ss.hasPermi('system:type:export')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<TopSysDictTypeVo> export(TopSysDictTypeQueryBo bo) {
+        List<TopSysDictTypeVo> list = iTopSysDictTypeService.queryList(bo);
+        ExcelUtil<TopSysDictTypeVo> util = new ExcelUtil<TopSysDictTypeVo>(TopSysDictTypeVo.class);
+        return util.exportExcel(list, "【请填写功能名称】");
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @ApiOperation("获取【请填写功能名称】详细信息")
+    @PreAuthorize("@ss.hasPermi('system:type:query')")
+    @GetMapping("/{dictId}")
+    public AjaxResult<TopSysDictTypeVo> getInfo(@PathVariable("dictId" ) Long dictId) {
+        return AjaxResult.success(iTopSysDictTypeService.queryById(dictId));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @ApiOperation("新增【请填写功能名称】")
+    @PreAuthorize("@ss.hasPermi('system:type:add')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody TopSysDictTypeAddBo bo) {
+        return toAjax(iTopSysDictTypeService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @ApiOperation("修改【请填写功能名称】")
+    @PreAuthorize("@ss.hasPermi('system:type:edit')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public AjaxResult<Void> edit(@RequestBody TopSysDictTypeEditBo bo) {
+        return toAjax(iTopSysDictTypeService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     */
+    @ApiOperation("删除【请填写功能名称】")
+    @PreAuthorize("@ss.hasPermi('system:type:remove')")
+    @Log(title = "【请填写功能名称】" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{dictIds}")
+    public AjaxResult<Void> remove(@PathVariable Long[] dictIds) {
+        return toAjax(iTopSysDictTypeService.deleteWithValidByIds(Arrays.asList(dictIds), true) ? 1 : 0);
+    }
+}

zhongzheng-framework/src/main/java/com/zhongzheng/framework/mybatisplus/CustomTenantLineHandler.java

@@ -43,6 +43,13 @@ public class CustomTenantLineHandler implements TenantLineHandler {
         add("top_sys_dept");
         add("top_sys_role");
         add("top_sys_user_role");
+        add("top_sys_user_post");
+        add("top_sys_role_menu");
+        add("top_sys_role_dept");
+        add("top_sys_menu");
+        add("top_sys_dict_type");
+        add("top_sys_dict_data");
+        add("top_sys_config");
         add("tables");
         add("columns");
         add("sys_logininfor");

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/TokenService.java

@@ -223,6 +223,24 @@ public class TokenService
         return createToken(claims);
     }
 
+    /**
+     * 创建令牌
+     *
+     * @param loginUser 用户信息
+     * @return 令牌
+     */
+    public String createTopToken(TopLoginUser loginUser)
+    {
+        String token = IdUtil.fastUUID();
+        loginUser.setToken(token);
+        setTopUserAgent(loginUser);
+        refreshTopToken(loginUser);
+
+        Map<String, Object> claims = new HashMap<>();
+        claims.put(Constants.LOGIN_USER_KEY, token);
+        return createToken(claims);
+    }
+
     /**
      * 验证令牌有效期，相差不足20分钟，自动刷新缓存
      *
@@ -282,6 +300,21 @@ public class TokenService
         loginUser.setOs(userAgent.getOs().getName());
     }
 
+    /**
+     * 设置用户代理信息
+     *
+     * @param loginUser 登录信息
+     */
+    public void setTopUserAgent(TopLoginUser loginUser)
+    {
+        UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent"));
+        String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
+        loginUser.setIpaddr(ip);
+        loginUser.setLoginLocation(AddressUtils.getRealAddressByIP(ip));
+        loginUser.setBrowser(userAgent.getBrowser().getName());
+        loginUser.setOs(userAgent.getOs().getName());
+    }
+
     /**
      * 从数据声明生成令牌
      *

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/TopSysLoginService.java

@@ -10,6 +10,7 @@ import com.zhongzheng.common.exception.user.UserPasswordNotMatchException;
 import com.zhongzheng.common.utils.MessageUtils;
 import com.zhongzheng.framework.manager.AsyncManager;
 import com.zhongzheng.framework.manager.factory.AsyncFactory;
+import com.zhongzheng.modules.top.service.ITopSysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;
@@ -36,6 +37,9 @@ public class TopSysLoginService
     @Autowired
     private RedisCache redisCache;
 
+    @Autowired
+    private ITopSysUserService iSysUserService;
+
     /**
      * 登录验证
      *

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/TopUserDetailsServiceImpl.java

@@ -14,9 +14,6 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 
-import java.util.HashSet;
-import java.util.Set;
-
 /**
  * 用户验证处理
  *
@@ -31,6 +28,9 @@ public class TopUserDetailsServiceImpl implements UserDetailsService
     @Autowired
     private ITopSysUserService topUserService;
 
+    @Autowired
+    private TopSysPermissionService permissionService;
+
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException
     {
@@ -56,9 +56,9 @@ public class TopUserDetailsServiceImpl implements UserDetailsService
 
     public UserDetails createTopLoginUser(TopSysUser user)
     {
-        Set<String> perms = new HashSet<String>();
-        //拥有所有权限
-        perms.add("*:*:*");
-        return new TopLoginUser(user, perms);
+//        Set<String> perms = new HashSet<String>();
+//        //拥有所有权限
+//        perms.add("*:*:*");
+        return new TopLoginUser(user, permissionService.getMenuPermission(user));
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityPosterAddBo.java

@@ -22,30 +22,9 @@ public class DistributionActivityPosterAddBo {
     /** 海报模板名称 */
     @ApiModelProperty("海报模板名称")
     private String name;
-    /** 海报标题 */
-    @ApiModelProperty("海报标题")
-    private String posterHead;
-    /** 海报广告语 */
-    @ApiModelProperty("海报广告语")
-    private String posterSlogan;
-    /** 海报商品图片 */
-    @ApiModelProperty("海报商品图片")
-    private String posterGoods;
-    /** 海报标题配置 */
-    @ApiModelProperty("海报标题配置")
-    private String posterHeadConfig;
-    /** 海报广告语配置 */
-    @ApiModelProperty("海报广告语配置")
-    private String posterSloganConfig;
-    /** 海报商品图片配置 */
-    @ApiModelProperty("海报商品图片配置")
-    private String posterGoodsConfig;
-    /** 海报个人信息码配置 */
-    @ApiModelProperty("海报个人信息码配置")
-    private String posterSalesmanConfig;
-    /** 海报分销码配置 */
-    @ApiModelProperty("海报分销码配置")
-    private String posterDistributionConfig;
+    /** 海报配置 */
+    @ApiModelProperty("海报配置")
+    private String posterConfig;
 
     /** 状态：1有效，0无效 */
     @ApiModelProperty("状态：1有效，-1无效")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityPosterEditBo.java

@@ -27,30 +27,9 @@ public class DistributionActivityPosterEditBo {
     @ApiModelProperty("海报模板地址")
     private String url;
 
-    /** 海报标题 */
-    @ApiModelProperty("海报标题")
-    private String posterHead;
-    /** 海报广告语 */
-    @ApiModelProperty("海报广告语")
-    private String posterSlogan;
-    /** 海报商品图片 */
-    @ApiModelProperty("海报商品图片")
-    private String posterGoods;
-    /** 海报标题配置 */
-    @ApiModelProperty("海报标题配置")
-    private String posterHeadConfig;
-    /** 海报广告语配置 */
-    @ApiModelProperty("海报广告语配置")
-    private String posterSloganConfig;
-    /** 海报商品图片配置 */
-    @ApiModelProperty("海报商品图片配置")
-    private String posterGoodsConfig;
-    /** 海报个人信息码配置 */
-    @ApiModelProperty("海报个人信息码配置")
-    private String posterSalesmanConfig;
-    /** 海报分销码配置 */
-    @ApiModelProperty("海报分销码配置")
-    private String posterDistributionConfig;
+    /** 海报配置 */
+    @ApiModelProperty("海报配置")
+    private String posterConfig;
 
     /** 状态：1有效，0无效 */
     @ApiModelProperty("状态：1有效，-1无效")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempAddBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTemplateAddBo.java

@@ -15,7 +15,7 @@ import java.util.List;
  */
 @Data
 @ApiModel("【请填写功能名称】添加对象")
-public class DistributionActivityTempAddBo {
+public class DistributionActivityTemplateAddBo {
 
     /** 活动编码 */
     @ApiModelProperty("活动编码")
@@ -64,5 +64,5 @@ public class DistributionActivityTempAddBo {
     private List<Long> tenantIds;
 
     @ApiModelProperty("活动商品集合")
-    private List<DistributionActivityTempGoodsAddBo> goodsList;
+    private List<DistributionActivityTemplateGoodsAddBo> goodsList;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempEditBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTemplateEditBo.java

@@ -15,7 +15,7 @@ import java.util.List;
  */
 @Data
 @ApiModel("【请填写功能名称】编辑对象")
-public class DistributionActivityTempEditBo {
+public class DistributionActivityTemplateEditBo {
 
     /** 模板ID */
     @ApiModelProperty("模板ID")
@@ -69,6 +69,6 @@ public class DistributionActivityTempEditBo {
     private List<Long> tenantIds;
 
     @ApiModelProperty("活动商品集合")
-    private List<DistributionActivityTempGoodsAddBo> goodsList;
+    private List<DistributionActivityTemplateGoodsAddBo> goodsList;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempGoodsAddBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTemplateGoodsAddBo.java

@@ -15,7 +15,7 @@ import java.math.BigDecimal;
  */
 @Data
 @ApiModel("【请填写功能名称】添加对象")
-public class DistributionActivityTempGoodsAddBo {
+public class DistributionActivityTemplateGoodsAddBo {
 
     /** 分销模板ID */
     @ApiModelProperty("分销模板ID")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempGoodsEditBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTemplateGoodsEditBo.java

@@ -15,7 +15,7 @@ import java.math.BigDecimal;
  */
 @Data
 @ApiModel("【请填写功能名称】编辑对象")
-public class DistributionActivityTempGoodsEditBo {
+public class DistributionActivityTemplateGoodsEditBo {
 
     /** 主键 */
     @ApiModelProperty("主键")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempGoodsQueryBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTemplateGoodsQueryBo.java

@@ -17,7 +17,7 @@ import java.math.BigDecimal;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ApiModel("【请填写功能名称】分页查询对象")
-public class DistributionActivityTempGoodsQueryBo extends BaseEntity {
+public class DistributionActivityTemplateGoodsQueryBo extends BaseEntity {
 
 	/** 分页大小 */
 	@ApiModelProperty("分页大小")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempPosterAddBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTemplatePosterAddBo.java

@@ -14,7 +14,7 @@ import lombok.Data;
  */
 @Data
 @ApiModel("【请填写功能名称】添加对象")
-public class DistributionActivityTempPosterAddBo {
+public class DistributionActivityTemplatePosterAddBo {
 
     /** 海报模板地址 */
     @ApiModelProperty("海报模板地址")
@@ -28,30 +28,9 @@ public class DistributionActivityTempPosterAddBo {
     /** 使用状态：1启用，0关闭 */
     @ApiModelProperty("使用状态：1启用，0关闭")
     private Integer useStatus;
-    /** 海报标题 */
-    @ApiModelProperty("海报标题")
-    private String posterHead;
-    /** 海报广告语 */
-    @ApiModelProperty("海报广告语")
-    private String posterSlogan;
-    /** 海报商品图片 */
-    @ApiModelProperty("海报商品图片")
-    private String posterGoods;
-    /** 海报标题配置 */
-    @ApiModelProperty("海报标题配置")
-    private String posterHeadConfig;
-    /** 海报广告语配置 */
-    @ApiModelProperty("海报广告语配置")
-    private String posterSloganConfig;
-    /** 海报商品图片配置 */
-    @ApiModelProperty("海报商品图片配置")
-    private String posterGoodsConfig;
-    /** 海报个人信息码配置 */
-    @ApiModelProperty("海报个人信息码配置")
-    private String posterSalesmanConfig;
-    /** 海报分销码配置 */
-    @ApiModelProperty("海报分销码配置")
-    private String posterDistributionConfig;
+    /** 海报配置 */
+    @ApiModelProperty("海报配置")
+    private String posterConfig;
     /** 添加时间 */
     @ApiModelProperty("添加时间")
     private Long createTime;

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempPosterQueryBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTemplatePosterQueryBo.java

@@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ApiModel("【请填写功能名称】分页查询对象")
-public class DistributionActivityTempPosterQueryBo extends BaseEntity {
+public class DistributionActivityTemplatePosterQueryBo extends BaseEntity {
 
 	/** 分页大小 */
 	@ApiModelProperty("分页大小")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempQueryBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTemplateQueryBo.java

@@ -20,7 +20,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ApiModel("【请填写功能名称】分页查询对象")
-public class DistributionActivityTempQueryBo extends BaseEntity {
+public class DistributionActivityTemplateQueryBo extends BaseEntity {
 
 	/** 分页大小 */
 	@ApiModelProperty("分页大小")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempRelationAddBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTemplateRelationAddBo.java

@@ -16,7 +16,7 @@ import java.util.Date;
  */
 @Data
 @ApiModel("【请填写功能名称】添加对象")
-public class DistributionActivityTempRelationAddBo {
+public class DistributionActivityTemplateRelationAddBo {
 
     /** 分销模板ID */
     @ApiModelProperty("分销模板ID")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempRelationEditBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTemplateRelationEditBo.java

@@ -15,7 +15,7 @@ import java.util.Date;
  */
 @Data
 @ApiModel("【请填写功能名称】编辑对象")
-public class DistributionActivityTempRelationEditBo {
+public class DistributionActivityTemplateRelationEditBo {
 
     /** 主键 */
     @ApiModelProperty("主键")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempRelationQueryBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTemplateRelationQueryBo.java

@@ -20,7 +20,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ApiModel("【请填写功能名称】分页查询对象")
-public class DistributionActivityTempRelationQueryBo extends BaseEntity {
+public class DistributionActivityTemplateRelationQueryBo extends BaseEntity {
 
 	/** 分页大小 */
 	@ApiModelProperty("分页大小")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempPosterEditBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/distributionActivityTemplatePosterEditBo.java

@@ -13,7 +13,7 @@ import lombok.Data;
  */
 @Data
 @ApiModel("【请填写功能名称】编辑对象")
-public class DistributionActivityTempPosterEditBo {
+public class distributionActivityTemplatePosterEditBo {
 
     /** 活动海报模板ID */
     @ApiModelProperty("活动海报模板ID")
@@ -25,30 +25,9 @@ public class DistributionActivityTempPosterEditBo {
     @ApiModelProperty("海报模板地址")
     private String posterUrl;
 
-    /** 海报标题 */
-    @ApiModelProperty("海报标题")
-    private String posterHead;
-    /** 海报广告语 */
-    @ApiModelProperty("海报广告语")
-    private String posterSlogan;
-    /** 海报商品图片 */
-    @ApiModelProperty("海报商品图片")
-    private String posterGoods;
-    /** 海报标题配置 */
-    @ApiModelProperty("海报标题配置")
-    private String posterHeadConfig;
-    /** 海报广告语配置 */
-    @ApiModelProperty("海报广告语配置")
-    private String posterSloganConfig;
-    /** 海报商品图片配置 */
-    @ApiModelProperty("海报商品图片配置")
-    private String posterGoodsConfig;
-    /** 海报个人信息码配置 */
-    @ApiModelProperty("海报个人信息码配置")
-    private String posterSalesmanConfig;
-    /** 海报分销码配置 */
-    @ApiModelProperty("海报分销码配置")
-    private String posterDistributionConfig;
+    /** 海报配置 */
+    @ApiModelProperty("海报配置")
+    private String posterConfig;
 
     /** 状态：1有效，0无效 */
     @ApiModelProperty("状态：1有效，-1无效")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivityPoster.java

@@ -35,22 +35,8 @@ private static final long serialVersionUID=1L;
     private Integer status;
     /** 使用状态：1启用，0关闭 */
     private Integer useStatus;
-    /** 海报标题 */
-    private String posterHead;
-    /** 海报广告语 */
-    private String posterSlogan;
-    /** 海报商品图片 */
-    private String posterGoods;
-    /** 海报标题配置 */
-    private String posterHeadConfig;
-    /** 海报广告语配置 */
-    private String posterSloganConfig;
-    /** 海报商品图片配置 */
-    private String posterGoodsConfig;
-    /** 海报个人信息码配置 */
-    private String posterSalesmanConfig;
-    /** 海报分销码配置 */
-    private String posterDistributionConfig;
+    /** 海报配置 */
+    private String posterConfig;
     /** 添加时间 */
     @TableField(fill = FieldFill.INSERT)
     private Long createTime;

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivityTemp.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivityTemplate.java

@@ -19,8 +19,8 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("distribution_activity_temp")
-public class DistributionActivityTemp implements Serializable {
+@TableName("distribution_activity_template")
+public class DistributionActivityTemplate implements Serializable {
 
 private static final long serialVersionUID=1L;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivityTempGoods.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivityTemplateGoods.java

@@ -20,8 +20,8 @@ import java.math.BigDecimal;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("distribution_activity_temp_goods")
-public class DistributionActivityTempGoods implements Serializable {
+@TableName("distribution_activity_template_goods")
+public class DistributionActivityTemplateGoods implements Serializable {
 
 private static final long serialVersionUID=1L;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivityTemplateImage.java

@@ -0,0 +1,42 @@
+package com.zhongzheng.modules.distribution.domain;
+
+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 lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 【请填写功能名称】对象 distribution_activity_template_image
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("distribution_activity_template_image")
+public class DistributionActivityTemplateImage implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** 主键 */
+    @TableId(value = "id")
+    private Long id;
+    /** 名称 */
+    private String name;
+    /** 图片地址 */
+    private String url;
+    /** 状态：1有效，-1无效 */
+    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/distribution/domain/DistributionActivityTempPoster.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivityTemplatePoster.java

@@ -19,8 +19,8 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("distribution_activity_temp_poster")
-public class DistributionActivityTempPoster implements Serializable {
+@TableName("distribution_activity_template_poster")
+public class DistributionActivityTemplatePoster implements Serializable {
 
 private static final long serialVersionUID=1L;
 
@@ -31,22 +31,8 @@ private static final long serialVersionUID=1L;
     private String name;
     /** 海报模板地址 */
     private String posterUrl;
-    /** 海报标题 */
-    private String posterHead;
-    /** 海报广告语 */
-    private String posterSlogan;
-    /** 海报商品图片 */
-    private String posterGoods;
-    /** 海报标题配置 */
-    private String posterHeadConfig;
-    /** 海报广告语配置 */
-    private String posterSloganConfig;
-    /** 海报商品图片配置 */
-    private String posterGoodsConfig;
-    /** 海报个人信息码配置 */
-    private String posterSalesmanConfig;
-    /** 海报分销码配置 */
-    private String posterDistributionConfig;
+    /** 海报配置 */
+    private String posterConfig;
     /** 状态：1有效，0无效 */
     private Integer status;
     /** 使用状态：1启用，0关闭 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivityTempRelation.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivityTemplateRelation.java

@@ -19,8 +19,8 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("distribution_activity_temp_relation")
-public class DistributionActivityTempRelation implements Serializable {
+@TableName("distribution_activity_template_relation")
+public class DistributionActivityTemplateRelation implements Serializable {
 
 private static final long serialVersionUID=1L;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/mapper/DistributionActivityTempGoodsMapper.java

@@ -1,7 +1,7 @@
 package com.zhongzheng.modules.distribution.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTempGoods;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplateGoods;
 
 /**
  * 【请填写功能名称】Mapper接口
@@ -9,6 +9,6 @@ import com.zhongzheng.modules.distribution.domain.DistributionActivityTempGoods;
  * @author ruoyi
  * @date 2023-03-06
  */
-public interface DistributionActivityTempGoodsMapper extends BaseMapper<DistributionActivityTempGoods> {
+public interface DistributionActivityTempGoodsMapper extends BaseMapper<DistributionActivityTemplateGoods> {
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/mapper/DistributionActivityTempMapper.java

@@ -1,7 +1,7 @@
 package com.zhongzheng.modules.distribution.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTemp;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplate;
 
 /**
  * 【请填写功能名称】Mapper接口
@@ -9,6 +9,6 @@ import com.zhongzheng.modules.distribution.domain.DistributionActivityTemp;
  * @author ruoyi
  * @date 2023-03-06
  */
-public interface DistributionActivityTempMapper extends BaseMapper<DistributionActivityTemp> {
+public interface DistributionActivityTempMapper extends BaseMapper<DistributionActivityTemplate> {
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/mapper/DistributionActivityTempPosterMapper.java

@@ -1,7 +1,7 @@
 package com.zhongzheng.modules.distribution.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTempPoster;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplatePoster;
 
 /**
  * 【请填写功能名称】Mapper接口
@@ -9,6 +9,6 @@ import com.zhongzheng.modules.distribution.domain.DistributionActivityTempPoster
  * @author ruoyi
  * @date 2023-03-06
  */
-public interface DistributionActivityTempPosterMapper extends BaseMapper<DistributionActivityTempPoster> {
+public interface DistributionActivityTempPosterMapper extends BaseMapper<DistributionActivityTemplatePoster> {
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/mapper/DistributionActivityTempRelationMapper.java

@@ -1,7 +1,7 @@
 package com.zhongzheng.modules.distribution.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTempRelation;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplateRelation;
 
 /**
  * 【请填写功能名称】Mapper接口
@@ -9,6 +9,6 @@ import com.zhongzheng.modules.distribution.domain.DistributionActivityTempRelati
  * @author ruoyi
  * @date 2023-03-06
  */
-public interface DistributionActivityTempRelationMapper extends BaseMapper<DistributionActivityTempRelation> {
+public interface DistributionActivityTempRelationMapper extends BaseMapper<DistributionActivityTemplateRelation> {
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/mapper/DistributionActivityTemplateImageMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.distribution.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplateImage;
+
+/**
+ * 【请填写功能名称】Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+public interface DistributionActivityTemplateImageMapper extends BaseMapper<DistributionActivityTemplateImage> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/IDistributionActivityTempRelationService.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/IDistributionActivityTemplateGoodsService.java

@@ -1,12 +1,11 @@
 package com.zhongzheng.modules.distribution.service;
 
-
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempRelationAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempRelationEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempRelationQueryBo;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTempRelation;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTempRelationVo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateGoodsAddBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateGoodsEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateGoodsQueryBo;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplateGoods;
+import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplateGoodsVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -17,31 +16,31 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-03-06
  */
-public interface IDistributionActivityTempRelationService extends IService<DistributionActivityTempRelation> {
+public interface IDistributionActivityTemplateGoodsService extends IService<DistributionActivityTemplateGoods> {
 	/**
 	 * 查询单个
 	 * @return
 	 */
-	DistributionActivityTempRelationVo queryById(Long id);
+	DistributionActivityTemplateGoodsVo queryById(Long id);
 
 	/**
 	 * 查询列表
 	 */
-	List<DistributionActivityTempRelationVo> queryList(DistributionActivityTempRelationQueryBo bo);
+	List<DistributionActivityTemplateGoodsVo> queryList(DistributionActivityTemplateGoodsQueryBo bo);
 
 	/**
 	 * 根据新增业务对象插入【请填写功能名称】
 	 * @param bo 【请填写功能名称】新增业务对象
 	 * @return
 	 */
-	Boolean insertByAddBo(DistributionActivityTempRelationAddBo bo);
+	Boolean insertByAddBo(DistributionActivityTemplateGoodsAddBo bo);
 
 	/**
 	 * 根据编辑业务对象修改【请填写功能名称】
 	 * @param bo 【请填写功能名称】编辑业务对象
 	 * @return
 	 */
-	Boolean updateByEditBo(DistributionActivityTempRelationEditBo bo);
+	Boolean updateByEditBo(DistributionActivityTemplateGoodsEditBo bo);
 
 	/**
 	 * 校验并删除数据

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/IDistributionActivityTemplateImageService.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.distribution.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplateImage;
+
+/**
+ * 【请填写功能名称】Service接口
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+public interface IDistributionActivityTemplateImageService extends IService<DistributionActivityTemplateImage> {
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/IDistributionActivityTempPosterService.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/IDistributionActivityTemplatePosterService.java

@@ -1,11 +1,11 @@
 package com.zhongzheng.modules.distribution.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempPosterAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempPosterEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempPosterQueryBo;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTempPoster;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTempPosterVo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplatePosterAddBo;
+import com.zhongzheng.modules.distribution.bo.distributionActivityTemplatePosterEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplatePosterQueryBo;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplatePoster;
+import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplatePosterVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -16,31 +16,31 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-03-06
  */
-public interface IDistributionActivityTempPosterService extends IService<DistributionActivityTempPoster> {
+public interface IDistributionActivityTemplatePosterService extends IService<DistributionActivityTemplatePoster> {
 	/**
 	 * 查询单个
 	 * @return
 	 */
-	DistributionActivityTempPosterVo queryById(Long posterTempId);
+	DistributionActivityTemplatePosterVo queryById(Long posterTempId);
 
 	/**
 	 * 查询列表
 	 */
-	List<DistributionActivityTempPosterVo> queryList(DistributionActivityTempPosterQueryBo bo);
+	List<DistributionActivityTemplatePosterVo> queryList(DistributionActivityTemplatePosterQueryBo bo);
 
 	/**
 	 * 根据新增业务对象插入【请填写功能名称】
 	 * @param bo 【请填写功能名称】新增业务对象
 	 * @return
 	 */
-	Boolean insertByAddBo(DistributionActivityTempPosterAddBo bo);
+	Boolean insertByAddBo(DistributionActivityTemplatePosterAddBo bo);
 
 	/**
 	 * 根据编辑业务对象修改【请填写功能名称】
 	 * @param bo 【请填写功能名称】编辑业务对象
 	 * @return
 	 */
-	Boolean updateByEditBo(DistributionActivityTempPosterEditBo bo);
+	Boolean updateByEditBo(distributionActivityTemplatePosterEditBo bo);
 
 	/**
 	 * 校验并删除数据

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/IDistributionActivityTempGoodsService.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/IDistributionActivityTemplateRelationService.java

@@ -1,11 +1,12 @@
 package com.zhongzheng.modules.distribution.service;
 
+
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempGoodsAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempGoodsEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempGoodsQueryBo;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTempGoods;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTempGoodsVo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateRelationAddBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateRelationEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateRelationQueryBo;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplateRelation;
+import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplateRelationVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -16,31 +17,31 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-03-06
  */
-public interface IDistributionActivityTempGoodsService extends IService<DistributionActivityTempGoods> {
+public interface IDistributionActivityTemplateRelationService extends IService<DistributionActivityTemplateRelation> {
 	/**
 	 * 查询单个
 	 * @return
 	 */
-	DistributionActivityTempGoodsVo queryById(Long id);
+	DistributionActivityTemplateRelationVo queryById(Long id);
 
 	/**
 	 * 查询列表
 	 */
-	List<DistributionActivityTempGoodsVo> queryList(DistributionActivityTempGoodsQueryBo bo);
+	List<DistributionActivityTemplateRelationVo> queryList(DistributionActivityTemplateRelationQueryBo bo);
 
 	/**
 	 * 根据新增业务对象插入【请填写功能名称】
 	 * @param bo 【请填写功能名称】新增业务对象
 	 * @return
 	 */
-	Boolean insertByAddBo(DistributionActivityTempGoodsAddBo bo);
+	Boolean insertByAddBo(DistributionActivityTemplateRelationAddBo bo);
 
 	/**
 	 * 根据编辑业务对象修改【请填写功能名称】
 	 * @param bo 【请填写功能名称】编辑业务对象
 	 * @return
 	 */
-	Boolean updateByEditBo(DistributionActivityTempGoodsEditBo bo);
+	Boolean updateByEditBo(DistributionActivityTemplateRelationEditBo bo);
 
 	/**
 	 * 校验并删除数据

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/IDistributionActivityTempService.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/IDistributionActivityTemplateService.java

@@ -2,11 +2,11 @@ package com.zhongzheng.modules.distribution.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempQueryBo;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTemp;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTempVo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateAddBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateQueryBo;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplate;
+import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplateVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -17,31 +17,31 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-03-06
  */
-public interface IDistributionActivityTempService extends IService<DistributionActivityTemp> {
+public interface IDistributionActivityTemplateService extends IService<DistributionActivityTemplate> {
 	/**
 	 * 查询单个
 	 * @return
 	 */
-	DistributionActivityTempVo queryById(Long id);
+	DistributionActivityTemplateVo queryById(Long id);
 
 	/**
 	 * 查询列表
 	 */
-	List<DistributionActivityTempVo> queryList(DistributionActivityTempQueryBo bo);
+	List<DistributionActivityTemplateVo> queryList(DistributionActivityTemplateQueryBo bo);
 
 	/**
 	 * 根据新增业务对象插入【请填写功能名称】
 	 * @param bo 【请填写功能名称】新增业务对象
 	 * @return
 	 */
-	Boolean insertByAddBo(DistributionActivityTempAddBo bo);
+	Boolean insertByAddBo(DistributionActivityTemplateAddBo bo);
 
 	/**
 	 * 根据编辑业务对象修改【请填写功能名称】
 	 * @param bo 【请填写功能名称】编辑业务对象
 	 * @return
 	 */
-	Boolean updateByEditBo(DistributionActivityTempEditBo bo);
+	Boolean updateByEditBo(DistributionActivityTemplateEditBo bo);
 
 	/**
 	 * 校验并删除数据

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityTempGoodsServiceImpl.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityTemplateGoodsServiceImpl.java

@@ -6,13 +6,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
 import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempGoodsAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempGoodsEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempGoodsQueryBo;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTempGoods;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateGoodsAddBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateGoodsEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateGoodsQueryBo;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplateGoods;
 import com.zhongzheng.modules.distribution.mapper.DistributionActivityTempGoodsMapper;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityTempGoodsService;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTempGoodsVo;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityTemplateGoodsService;
+import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplateGoodsVo;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;
@@ -26,21 +26,21 @@ import java.util.stream.Collectors;
  * @date 2023-03-06
  */
 @Service
-public class DistributionActivityTempGoodsServiceImpl extends ServiceImpl<DistributionActivityTempGoodsMapper, DistributionActivityTempGoods> implements IDistributionActivityTempGoodsService {
+public class DistributionActivityTemplateGoodsServiceImpl extends ServiceImpl<DistributionActivityTempGoodsMapper, DistributionActivityTemplateGoods> implements IDistributionActivityTemplateGoodsService {
 
     @Override
-    public DistributionActivityTempGoodsVo queryById(Long id){
-        DistributionActivityTempGoods db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, DistributionActivityTempGoodsVo.class);
+    public DistributionActivityTemplateGoodsVo queryById(Long id){
+        DistributionActivityTemplateGoods db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, DistributionActivityTemplateGoodsVo.class);
     }
 
     @Override
-    public List<DistributionActivityTempGoodsVo> queryList(DistributionActivityTempGoodsQueryBo bo) {
-        LambdaQueryWrapper<DistributionActivityTempGoods> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getDistributionTempId() != null, DistributionActivityTempGoods::getDistributionTempId, bo.getDistributionTempId());
-        lqw.eq(bo.getGoodsId() != null, DistributionActivityTempGoods::getGoodsId, bo.getGoodsId());
-        lqw.eq(bo.getProfitMax() != null, DistributionActivityTempGoods::getProfitMax, bo.getProfitMax());
-        lqw.eq(bo.getStatus() != null, DistributionActivityTempGoods::getStatus, bo.getStatus());
+    public List<DistributionActivityTemplateGoodsVo> queryList(DistributionActivityTemplateGoodsQueryBo bo) {
+        LambdaQueryWrapper<DistributionActivityTemplateGoods> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getDistributionTempId() != null, DistributionActivityTemplateGoods::getDistributionTempId, bo.getDistributionTempId());
+        lqw.eq(bo.getGoodsId() != null, DistributionActivityTemplateGoods::getGoodsId, bo.getGoodsId());
+        lqw.eq(bo.getProfitMax() != null, DistributionActivityTemplateGoods::getProfitMax, bo.getProfitMax());
+        lqw.eq(bo.getStatus() != null, DistributionActivityTemplateGoods::getStatus, bo.getStatus());
         return entity2Vo(this.list(lqw));
     }
 
@@ -50,13 +50,13 @@ public class DistributionActivityTempGoodsServiceImpl extends ServiceImpl<Distri
     * @param collection 实体类集合
     * @return
     */
-    private List<DistributionActivityTempGoodsVo> entity2Vo(Collection<DistributionActivityTempGoods> collection) {
-        List<DistributionActivityTempGoodsVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, DistributionActivityTempGoodsVo.class))
+    private List<DistributionActivityTemplateGoodsVo> entity2Vo(Collection<DistributionActivityTemplateGoods> collection) {
+        List<DistributionActivityTemplateGoodsVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, DistributionActivityTemplateGoodsVo.class))
                 .collect(Collectors.toList());
         if (collection instanceof Page) {
-            Page<DistributionActivityTempGoods> page = (Page<DistributionActivityTempGoods>)collection;
-            Page<DistributionActivityTempGoodsVo> pageVo = new Page<>();
+            Page<DistributionActivityTemplateGoods> page = (Page<DistributionActivityTemplateGoods>)collection;
+            Page<DistributionActivityTemplateGoodsVo> pageVo = new Page<>();
             BeanUtil.copyProperties(page,pageVo);
             pageVo.addAll(voList);
             voList = pageVo;
@@ -65,8 +65,8 @@ public class DistributionActivityTempGoodsServiceImpl extends ServiceImpl<Distri
     }
 
     @Override
-    public Boolean insertByAddBo(DistributionActivityTempGoodsAddBo bo) {
-        DistributionActivityTempGoods add = BeanUtil.toBean(bo, DistributionActivityTempGoods.class);
+    public Boolean insertByAddBo(DistributionActivityTemplateGoodsAddBo bo) {
+        DistributionActivityTemplateGoods add = BeanUtil.toBean(bo, DistributionActivityTemplateGoods.class);
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
@@ -74,8 +74,8 @@ public class DistributionActivityTempGoodsServiceImpl extends ServiceImpl<Distri
     }
 
     @Override
-    public Boolean updateByEditBo(DistributionActivityTempGoodsEditBo bo) {
-        DistributionActivityTempGoods update = BeanUtil.toBean(bo, DistributionActivityTempGoods.class);
+    public Boolean updateByEditBo(DistributionActivityTemplateGoodsEditBo bo) {
+        DistributionActivityTemplateGoods update = BeanUtil.toBean(bo, DistributionActivityTemplateGoods.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
         return this.updateById(update);
@@ -86,7 +86,7 @@ public class DistributionActivityTempGoodsServiceImpl extends ServiceImpl<Distri
      *
      * @param entity 实体类数据
      */
-    private void validEntityBeforeSave(DistributionActivityTempGoods entity){
+    private void validEntityBeforeSave(DistributionActivityTemplateGoods entity){
         //TODO 做一些数据校验,如唯一约束
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityTemplateImageServiceImpl.java

@@ -0,0 +1,17 @@
+package com.zhongzheng.modules.distribution.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplateImage;
+import com.zhongzheng.modules.distribution.mapper.DistributionActivityTemplateImageMapper;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityTemplateImageService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 【请填写功能名称】Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+@Service
+public class DistributionActivityTemplateImageServiceImpl extends ServiceImpl<DistributionActivityTemplateImageMapper, DistributionActivityTemplateImage> implements IDistributionActivityTemplateImageService {
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityTempPosterServiceImpl.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityTemplatePosterServiceImpl.java

@@ -8,15 +8,15 @@ 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.distribution.bo.DistributionActivityTempPosterAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempPosterEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempPosterQueryBo;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTemp;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTempPoster;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplatePosterAddBo;
+import com.zhongzheng.modules.distribution.bo.distributionActivityTemplatePosterEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplatePosterQueryBo;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplate;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplatePoster;
 import com.zhongzheng.modules.distribution.mapper.DistributionActivityTempPosterMapper;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityTempPosterService;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityTempService;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTempPosterVo;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityTemplatePosterService;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityTemplateService;
+import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplatePosterVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -31,22 +31,22 @@ import java.util.stream.Collectors;
  * @date 2023-03-06
  */
 @Service
-public class DistributionActivityTempPosterServiceImpl extends ServiceImpl<DistributionActivityTempPosterMapper, DistributionActivityTempPoster> implements IDistributionActivityTempPosterService {
+public class DistributionActivityTemplatePosterServiceImpl extends ServiceImpl<DistributionActivityTempPosterMapper, DistributionActivityTemplatePoster> implements IDistributionActivityTemplatePosterService {
 
     @Autowired
-    private IDistributionActivityTempService iDistributionActivityTempService;
+    private IDistributionActivityTemplateService iDistributionActivityTemplateService;
 
     @Override
-    public DistributionActivityTempPosterVo queryById(Long posterTempId){
-        DistributionActivityTempPoster db = this.baseMapper.selectById(posterTempId);
-        return BeanUtil.toBean(db, DistributionActivityTempPosterVo.class);
+    public DistributionActivityTemplatePosterVo queryById(Long posterTempId){
+        DistributionActivityTemplatePoster db = this.baseMapper.selectById(posterTempId);
+        return BeanUtil.toBean(db, DistributionActivityTemplatePosterVo.class);
     }
 
     @Override
-    public List<DistributionActivityTempPosterVo> queryList(DistributionActivityTempPosterQueryBo bo) {
-        LambdaQueryWrapper<DistributionActivityTempPoster> lqw = Wrappers.lambdaQuery();
-        lqw.eq(StrUtil.isNotBlank(bo.getPosterUrl()), DistributionActivityTempPoster::getPosterUrl, bo.getPosterUrl());
-        lqw.eq(bo.getStatus() != null, DistributionActivityTempPoster::getStatus, bo.getStatus());
+    public List<DistributionActivityTemplatePosterVo> queryList(DistributionActivityTemplatePosterQueryBo bo) {
+        LambdaQueryWrapper<DistributionActivityTemplatePoster> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StrUtil.isNotBlank(bo.getPosterUrl()), DistributionActivityTemplatePoster::getPosterUrl, bo.getPosterUrl());
+        lqw.eq(bo.getStatus() != null, DistributionActivityTemplatePoster::getStatus, bo.getStatus());
         return entity2Vo(this.list(lqw));
     }
 
@@ -56,13 +56,13 @@ public class DistributionActivityTempPosterServiceImpl extends ServiceImpl<Distr
     * @param collection 实体类集合
     * @return
     */
-    private List<DistributionActivityTempPosterVo> entity2Vo(Collection<DistributionActivityTempPoster> collection) {
-        List<DistributionActivityTempPosterVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, DistributionActivityTempPosterVo.class))
+    private List<DistributionActivityTemplatePosterVo> entity2Vo(Collection<DistributionActivityTemplatePoster> collection) {
+        List<DistributionActivityTemplatePosterVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, DistributionActivityTemplatePosterVo.class))
                 .collect(Collectors.toList());
         if (collection instanceof Page) {
-            Page<DistributionActivityTempPoster> page = (Page<DistributionActivityTempPoster>)collection;
-            Page<DistributionActivityTempPosterVo> pageVo = new Page<>();
+            Page<DistributionActivityTemplatePoster> page = (Page<DistributionActivityTemplatePoster>)collection;
+            Page<DistributionActivityTemplatePosterVo> pageVo = new Page<>();
             BeanUtil.copyProperties(page,pageVo);
             pageVo.addAll(voList);
             voList = pageVo;
@@ -71,8 +71,8 @@ public class DistributionActivityTempPosterServiceImpl extends ServiceImpl<Distr
     }
 
     @Override
-    public Boolean insertByAddBo(DistributionActivityTempPosterAddBo bo) {
-        DistributionActivityTempPoster add = BeanUtil.toBean(bo, DistributionActivityTempPoster.class);
+    public Boolean insertByAddBo(DistributionActivityTemplatePosterAddBo bo) {
+        DistributionActivityTemplatePoster add = BeanUtil.toBean(bo, DistributionActivityTemplatePoster.class);
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
@@ -80,16 +80,16 @@ public class DistributionActivityTempPosterServiceImpl extends ServiceImpl<Distr
     }
 
     @Override
-    public Boolean updateByEditBo(DistributionActivityTempPosterEditBo bo) {
+    public Boolean updateByEditBo(distributionActivityTemplatePosterEditBo bo) {
         //校验是否有绑定活动
-        int count = iDistributionActivityTempService.count(new LambdaQueryWrapper<DistributionActivityTemp>()
-                .eq(DistributionActivityTemp::getPosterTempId, bo.getPosterTempId())
-                .eq(DistributionActivityTemp::getStatus, 1)
-                .eq(DistributionActivityTemp::getPublishStatus, 1));
+        int count = iDistributionActivityTemplateService.count(new LambdaQueryWrapper<DistributionActivityTemplate>()
+                .eq(DistributionActivityTemplate::getPosterTempId, bo.getPosterTempId())
+                .eq(DistributionActivityTemplate::getStatus, 1)
+                .eq(DistributionActivityTemplate::getPublishStatus, 1));
         if (count > 0 ){
             throw new CustomException("该海报模板已绑定发布的分销活动，请勿修改！");
         }
-        DistributionActivityTempPoster update = BeanUtil.toBean(bo, DistributionActivityTempPoster.class);
+        DistributionActivityTemplatePoster update = BeanUtil.toBean(bo, DistributionActivityTemplatePoster.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
         return this.updateById(update);
@@ -100,7 +100,7 @@ public class DistributionActivityTempPosterServiceImpl extends ServiceImpl<Distr
      *
      * @param entity 实体类数据
      */
-    private void validEntityBeforeSave(DistributionActivityTempPoster entity){
+    private void validEntityBeforeSave(DistributionActivityTemplatePoster entity){
         //TODO 做一些数据校验,如唯一约束
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityTempRelationServiceImpl.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityTemplateRelationServiceImpl.java

@@ -6,13 +6,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
 import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempRelationAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempRelationEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempRelationQueryBo;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTempRelation;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateRelationAddBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateRelationEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateRelationQueryBo;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplateRelation;
 import com.zhongzheng.modules.distribution.mapper.DistributionActivityTempRelationMapper;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityTempRelationService;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTempRelationVo;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityTemplateRelationService;
+import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplateRelationVo;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;
@@ -26,19 +26,19 @@ import java.util.stream.Collectors;
  * @date 2023-03-06
  */
 @Service
-public class DistributionActivityTempRelationServiceImpl extends ServiceImpl<DistributionActivityTempRelationMapper, DistributionActivityTempRelation> implements IDistributionActivityTempRelationService {
+public class DistributionActivityTemplateRelationServiceImpl extends ServiceImpl<DistributionActivityTempRelationMapper, DistributionActivityTemplateRelation> implements IDistributionActivityTemplateRelationService {
 
     @Override
-    public DistributionActivityTempRelationVo queryById(Long id){
-        DistributionActivityTempRelation db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, DistributionActivityTempRelationVo.class);
+    public DistributionActivityTemplateRelationVo queryById(Long id){
+        DistributionActivityTemplateRelation db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, DistributionActivityTemplateRelationVo.class);
     }
 
     @Override
-    public List<DistributionActivityTempRelationVo> queryList(DistributionActivityTempRelationQueryBo bo) {
-        LambdaQueryWrapper<DistributionActivityTempRelation> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getDistributionTempId() != null, DistributionActivityTempRelation::getDistributionTempId, bo.getDistributionTempId());
-        lqw.eq(bo.getStatus() != null, DistributionActivityTempRelation::getStatus, bo.getStatus());
+    public List<DistributionActivityTemplateRelationVo> queryList(DistributionActivityTemplateRelationQueryBo bo) {
+        LambdaQueryWrapper<DistributionActivityTemplateRelation> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getDistributionTempId() != null, DistributionActivityTemplateRelation::getDistributionTempId, bo.getDistributionTempId());
+        lqw.eq(bo.getStatus() != null, DistributionActivityTemplateRelation::getStatus, bo.getStatus());
         return entity2Vo(this.list(lqw));
     }
 
@@ -48,13 +48,13 @@ public class DistributionActivityTempRelationServiceImpl extends ServiceImpl<Dis
     * @param collection 实体类集合
     * @return
     */
-    private List<DistributionActivityTempRelationVo> entity2Vo(Collection<DistributionActivityTempRelation> collection) {
-        List<DistributionActivityTempRelationVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, DistributionActivityTempRelationVo.class))
+    private List<DistributionActivityTemplateRelationVo> entity2Vo(Collection<DistributionActivityTemplateRelation> collection) {
+        List<DistributionActivityTemplateRelationVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, DistributionActivityTemplateRelationVo.class))
                 .collect(Collectors.toList());
         if (collection instanceof Page) {
-            Page<DistributionActivityTempRelation> page = (Page<DistributionActivityTempRelation>)collection;
-            Page<DistributionActivityTempRelationVo> pageVo = new Page<>();
+            Page<DistributionActivityTemplateRelation> page = (Page<DistributionActivityTemplateRelation>)collection;
+            Page<DistributionActivityTemplateRelationVo> pageVo = new Page<>();
             BeanUtil.copyProperties(page,pageVo);
             pageVo.addAll(voList);
             voList = pageVo;
@@ -63,8 +63,8 @@ public class DistributionActivityTempRelationServiceImpl extends ServiceImpl<Dis
     }
 
     @Override
-    public Boolean insertByAddBo(DistributionActivityTempRelationAddBo bo) {
-        DistributionActivityTempRelation add = BeanUtil.toBean(bo, DistributionActivityTempRelation.class);
+    public Boolean insertByAddBo(DistributionActivityTemplateRelationAddBo bo) {
+        DistributionActivityTemplateRelation add = BeanUtil.toBean(bo, DistributionActivityTemplateRelation.class);
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
@@ -72,8 +72,8 @@ public class DistributionActivityTempRelationServiceImpl extends ServiceImpl<Dis
     }
 
     @Override
-    public Boolean updateByEditBo(DistributionActivityTempRelationEditBo bo) {
-        DistributionActivityTempRelation update = BeanUtil.toBean(bo, DistributionActivityTempRelation.class);
+    public Boolean updateByEditBo(DistributionActivityTemplateRelationEditBo bo) {
+        DistributionActivityTemplateRelation update = BeanUtil.toBean(bo, DistributionActivityTemplateRelation.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
         return this.updateById(update);
@@ -84,7 +84,7 @@ public class DistributionActivityTempRelationServiceImpl extends ServiceImpl<Dis
      *
      * @param entity 实体类数据
      */
-    private void validEntityBeforeSave(DistributionActivityTempRelation entity){
+    private void validEntityBeforeSave(DistributionActivityTemplateRelation entity){
         //TODO 做一些数据校验,如唯一约束
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityTempServiceImpl.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityTemplateServiceImpl.java

@@ -10,17 +10,17 @@ 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.distribution.bo.DistributionActivityTempAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTempQueryBo;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTemp;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTempGoods;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTempRelation;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateAddBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateQueryBo;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplate;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplateGoods;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplateRelation;
 import com.zhongzheng.modules.distribution.mapper.DistributionActivityTempMapper;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityTempGoodsService;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityTempRelationService;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityTempService;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTempVo;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityTemplateGoodsService;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityTemplateRelationService;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityTemplateService;
+import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplateVo;
 import com.zhongzheng.modules.system.service.ISysOldOrgService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -37,23 +37,23 @@ import java.util.stream.Collectors;
  * @date 2023-03-06
  */
 @Service
-public class DistributionActivityTempServiceImpl extends ServiceImpl<DistributionActivityTempMapper, DistributionActivityTemp> implements IDistributionActivityTempService {
+public class DistributionActivityTemplateServiceImpl extends ServiceImpl<DistributionActivityTempMapper, DistributionActivityTemplate> implements IDistributionActivityTemplateService {
 
     @Autowired
-    private IDistributionActivityTempRelationService iDistributionActivityTempRelationService;
+    private IDistributionActivityTemplateRelationService iDistributionActivityTemplateRelationService;
     @Autowired
-    private IDistributionActivityTempGoodsService iDistributionActivityTempGoodsService;
+    private IDistributionActivityTemplateGoodsService iDistributionActivityTemplateGoodsService;
     @Autowired
     private ISysOldOrgService iSysOldOrgService;
 
     @Override
-    public DistributionActivityTempVo queryById(Long id){
-        DistributionActivityTemp db = this.baseMapper.selectById(id);
-        DistributionActivityTempVo vo = BeanUtil.toBean(db, DistributionActivityTempVo.class);
+    public DistributionActivityTemplateVo queryById(Long id){
+        DistributionActivityTemplate db = this.baseMapper.selectById(id);
+        DistributionActivityTemplateVo vo = BeanUtil.toBean(db, DistributionActivityTemplateVo.class);
         //获取商品和机构信息
-        List<DistributionActivityTempRelation> relationList = iDistributionActivityTempRelationService
-                .list(new LambdaQueryWrapper<DistributionActivityTempRelation>()
-                .eq(DistributionActivityTempRelation::getDistributionTempId, vo.getId()));
+        List<DistributionActivityTemplateRelation> relationList = iDistributionActivityTemplateRelationService
+                .list(new LambdaQueryWrapper<DistributionActivityTemplateRelation>()
+                .eq(DistributionActivityTemplateRelation::getDistributionTempId, vo.getId()));
 //        if (CollectionUtils.isNotEmpty(relationList)){
 //            relationList.stream().map(item -> {
 //                DistributionActivityTenantVo tenantVo = new DistributionActivityTenantVo();
@@ -65,15 +65,15 @@ public class DistributionActivityTempServiceImpl extends ServiceImpl<Distributio
     }
 
     @Override
-    public List<DistributionActivityTempVo> queryList(DistributionActivityTempQueryBo bo) {
-        LambdaQueryWrapper<DistributionActivityTemp> lqw = Wrappers.lambdaQuery();
-        lqw.eq(StrUtil.isNotBlank(bo.getCode()), DistributionActivityTemp::getCode, bo.getCode());
-        lqw.eq(bo.getType() != null, DistributionActivityTemp::getType, bo.getType());
-        lqw.like(StrUtil.isNotBlank(bo.getName()), DistributionActivityTemp::getName, bo.getName());
-        lqw.eq(bo.getStatus() != null, DistributionActivityTemp::getStatus, bo.getStatus());
-        lqw.eq(bo.getPosterTempId() != null, DistributionActivityTemp::getPosterTempId, bo.getPosterTempId());
-        lqw.eq(bo.getStartTime() != null, DistributionActivityTemp::getStartTime, bo.getStartTime());
-        lqw.eq(bo.getEndTime() != null, DistributionActivityTemp::getEndTime, bo.getEndTime());
+    public List<DistributionActivityTemplateVo> queryList(DistributionActivityTemplateQueryBo bo) {
+        LambdaQueryWrapper<DistributionActivityTemplate> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StrUtil.isNotBlank(bo.getCode()), DistributionActivityTemplate::getCode, bo.getCode());
+        lqw.eq(bo.getType() != null, DistributionActivityTemplate::getType, bo.getType());
+        lqw.like(StrUtil.isNotBlank(bo.getName()), DistributionActivityTemplate::getName, bo.getName());
+        lqw.eq(bo.getStatus() != null, DistributionActivityTemplate::getStatus, bo.getStatus());
+        lqw.eq(bo.getPosterTempId() != null, DistributionActivityTemplate::getPosterTempId, bo.getPosterTempId());
+        lqw.eq(bo.getStartTime() != null, DistributionActivityTemplate::getStartTime, bo.getStartTime());
+        lqw.eq(bo.getEndTime() != null, DistributionActivityTemplate::getEndTime, bo.getEndTime());
         return entity2Vo(this.list(lqw));
     }
 
@@ -83,13 +83,13 @@ public class DistributionActivityTempServiceImpl extends ServiceImpl<Distributio
     * @param collection 实体类集合
     * @return
     */
-    private List<DistributionActivityTempVo> entity2Vo(Collection<DistributionActivityTemp> collection) {
-        List<DistributionActivityTempVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, DistributionActivityTempVo.class))
+    private List<DistributionActivityTemplateVo> entity2Vo(Collection<DistributionActivityTemplate> collection) {
+        List<DistributionActivityTemplateVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, DistributionActivityTemplateVo.class))
                 .collect(Collectors.toList());
         if (collection instanceof Page) {
-            Page<DistributionActivityTemp> page = (Page<DistributionActivityTemp>)collection;
-            Page<DistributionActivityTempVo> pageVo = new Page<>();
+            Page<DistributionActivityTemplate> page = (Page<DistributionActivityTemplate>)collection;
+            Page<DistributionActivityTemplateVo> pageVo = new Page<>();
             BeanUtil.copyProperties(page,pageVo);
             pageVo.addAll(voList);
             voList = pageVo;
@@ -99,9 +99,9 @@ public class DistributionActivityTempServiceImpl extends ServiceImpl<Distributio
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean insertByAddBo(DistributionActivityTempAddBo bo) {
+    public Boolean insertByAddBo(DistributionActivityTemplateAddBo bo) {
         //活动模板基本信息
-        DistributionActivityTemp add = BeanUtil.toBean(bo, DistributionActivityTemp.class);
+        DistributionActivityTemplate add = BeanUtil.toBean(bo, DistributionActivityTemplate.class);
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
@@ -111,60 +111,60 @@ public class DistributionActivityTempServiceImpl extends ServiceImpl<Distributio
     }
 
     //添加关联信息
-    private void saveRelation(DistributionActivityTempAddBo bo,Long tempId){
+    private void saveRelation(DistributionActivityTemplateAddBo bo, Long tempId){
         //机构信息
         if (ObjectUtils.isNotNull(bo.getIsAllOrg()) && bo.getIsAllOrg() == 1){
             //发布所有机构
-            DistributionActivityTempRelation entity = new DistributionActivityTempRelation();
+            DistributionActivityTemplateRelation entity = new DistributionActivityTemplateRelation();
             entity.setDistributionTempId(tempId);
             entity.setTenantId(0L);
             entity.setCreateTime(DateUtils.getNowTime());
             entity.setUpdateTime(DateUtils.getNowTime());
-            iDistributionActivityTempRelationService.save(entity);
+            iDistributionActivityTemplateRelationService.save(entity);
         }
         if (CollectionUtils.isNotEmpty(bo.getTenantIds())){
-            List<DistributionActivityTempRelation> entitys = bo.getTenantIds().stream().map(id -> {
-                DistributionActivityTempRelation entity = new DistributionActivityTempRelation();
+            List<DistributionActivityTemplateRelation> entitys = bo.getTenantIds().stream().map(id -> {
+                DistributionActivityTemplateRelation entity = new DistributionActivityTemplateRelation();
                 entity.setDistributionTempId(tempId);
                 entity.setTenantId(id);
                 entity.setCreateTime(DateUtils.getNowTime());
                 entity.setUpdateTime(DateUtils.getNowTime());
                 return entity;
             }).collect(Collectors.toList());
-            iDistributionActivityTempRelationService.saveBatch(entitys);
+            iDistributionActivityTemplateRelationService.saveBatch(entitys);
         }
         //活动商品
         if (CollectionUtils.isNotEmpty(bo.getGoodsList())){
-            List<DistributionActivityTempGoods> collect = bo.getGoodsList().stream().map(item -> {
-                DistributionActivityTempGoods entity = BeanUtil.toBean(item, DistributionActivityTempGoods.class);
+            List<DistributionActivityTemplateGoods> collect = bo.getGoodsList().stream().map(item -> {
+                DistributionActivityTemplateGoods entity = BeanUtil.toBean(item, DistributionActivityTemplateGoods.class);
                 entity.setDistributionTempId(tempId);
                 entity.setCreateTime(DateUtils.getNowTime());
                 entity.setUpdateTime(DateUtils.getNowTime());
                 return entity;
             }).collect(Collectors.toList());
-            iDistributionActivityTempGoodsService.saveBatch(collect);
+            iDistributionActivityTemplateGoodsService.saveBatch(collect);
         }
     }
 
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean updateByEditBo(DistributionActivityTempEditBo bo) {
+    public Boolean updateByEditBo(DistributionActivityTemplateEditBo bo) {
         //校验
-        DistributionActivityTemp activityTemp = getById(bo.getId());
+        DistributionActivityTemplate activityTemp = getById(bo.getId());
         if (activityTemp.getPublishStatus() == 1){
             throw new CustomException("活动已发布，不能修改！");
         }
-        DistributionActivityTemp update = BeanUtil.toBean(bo, DistributionActivityTemp.class);
+        DistributionActivityTemplate update = BeanUtil.toBean(bo, DistributionActivityTemplate.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
         this.updateById(update);
         //删除活动商品和下发机构重新绑定
-        iDistributionActivityTempGoodsService.remove(new LambdaQueryWrapper<DistributionActivityTempGoods>()
-        .eq(DistributionActivityTempGoods::getDistributionTempId,bo.getId()));
-        iDistributionActivityTempRelationService.remove(new LambdaQueryWrapper<DistributionActivityTempRelation>()
-        .eq(DistributionActivityTempRelation::getDistributionTempId,bo.getId()));
-        DistributionActivityTempAddBo addBo = new DistributionActivityTempAddBo();
+        iDistributionActivityTemplateGoodsService.remove(new LambdaQueryWrapper<DistributionActivityTemplateGoods>()
+        .eq(DistributionActivityTemplateGoods::getDistributionTempId,bo.getId()));
+        iDistributionActivityTemplateRelationService.remove(new LambdaQueryWrapper<DistributionActivityTemplateRelation>()
+        .eq(DistributionActivityTemplateRelation::getDistributionTempId,bo.getId()));
+        DistributionActivityTemplateAddBo addBo = new DistributionActivityTemplateAddBo();
         addBo.setIsAllOrg(bo.getIsAllOrg());
         addBo.setGoodsList(bo.getGoodsList());
         addBo.setTenantIds(bo.getTenantIds());
@@ -177,7 +177,7 @@ public class DistributionActivityTempServiceImpl extends ServiceImpl<Distributio
      *
      * @param entity 实体类数据
      */
-    private void validEntityBeforeSave(DistributionActivityTemp entity){
+    private void validEntityBeforeSave(DistributionActivityTemplate entity){
         //TODO 做一些数据校验,如唯一约束
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityPosterVo.java

@@ -29,30 +29,9 @@ public class DistributionActivityPosterVo {
 	/** 海报模板名称 */
 	@ApiModelProperty("海报模板名称")
 	private String name;
-	/** 海报标题 */
-	@ApiModelProperty("海报标题")
-	private String posterHead;
-	/** 海报广告语 */
-	@ApiModelProperty("海报广告语")
-	private String posterSlogan;
-	/** 海报商品图片 */
-	@ApiModelProperty("海报商品图片")
-	private String posterGoods;
-	/** 海报标题配置 */
-	@ApiModelProperty("海报标题配置")
-	private String posterHeadConfig;
-	/** 海报广告语配置 */
-	@ApiModelProperty("海报广告语配置")
-	private String posterSloganConfig;
-	/** 海报商品图片配置 */
-	@ApiModelProperty("海报商品图片配置")
-	private String posterGoodsConfig;
-	/** 海报个人信息码配置 */
-	@ApiModelProperty("海报个人信息码配置")
-	private String posterSalesmanConfig;
-	/** 海报分销码配置 */
-	@ApiModelProperty("海报分销码配置")
-	private String posterDistributionConfig;
+	/** 海报配置 */
+	@ApiModelProperty("海报配置")
+	private String posterConfig;
 	/** 状态：1有效，0无效 */
 	@Excel(name = "状态：1有效，0无效")
 	@ApiModelProperty("状态：1有效，-1无效")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityTempGoodsVo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityTemplateGoodsVo.java

@@ -16,7 +16,7 @@ import java.math.BigDecimal;
  */
 @Data
 @ApiModel("【请填写功能名称】视图对象")
-public class DistributionActivityTempGoodsVo {
+public class DistributionActivityTemplateGoodsVo {
 	private static final long serialVersionUID = 1L;
 
 	/** 主键 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityTempPosterVo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityTemplatePosterVo.java

@@ -15,7 +15,7 @@ import lombok.Data;
  */
 @Data
 @ApiModel("【请填写功能名称】视图对象")
-public class DistributionActivityTempPosterVo {
+public class DistributionActivityTemplatePosterVo {
 	private static final long serialVersionUID = 1L;
 
 	/** 活动海报模板ID */
@@ -26,30 +26,9 @@ public class DistributionActivityTempPosterVo {
 	@Excel(name = "海报模板地址")
 	@ApiModelProperty("海报模板地址")
 	private String posterUrl;
-	/** 海报标题 */
-	@ApiModelProperty("海报标题")
-	private String posterHead;
-	/** 海报广告语 */
-	@ApiModelProperty("海报广告语")
-	private String posterSlogan;
-	/** 海报商品图片 */
-	@ApiModelProperty("海报商品图片")
-	private String posterGoods;
-	/** 海报标题配置 */
-	@ApiModelProperty("海报标题配置")
-	private String posterHeadConfig;
-	/** 海报广告语配置 */
-	@ApiModelProperty("海报广告语配置")
-	private String posterSloganConfig;
-	/** 海报商品图片配置 */
-	@ApiModelProperty("海报商品图片配置")
-	private String posterGoodsConfig;
-	/** 海报个人信息码配置 */
-	@ApiModelProperty("海报个人信息码配置")
-	private String posterSalesmanConfig;
-	/** 海报分销码配置 */
-	@ApiModelProperty("海报分销码配置")
-	private String posterDistributionConfig;
+	/** 海报配置 */
+	@ApiModelProperty("海报配置")
+	private String posterConfig;
 	/** 状态：1有效，0无效 */
 	@Excel(name = "状态：1有效，0无效")
 	@ApiModelProperty("状态：1有效，-1无效")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityTempRelationVo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityTemplateRelationVo.java

@@ -17,7 +17,7 @@ import java.util.Date;
  */
 @Data
 @ApiModel("【请填写功能名称】视图对象")
-public class DistributionActivityTempRelationVo {
+public class DistributionActivityTemplateRelationVo {
 	private static final long serialVersionUID = 1L;
 
 	/** 主键 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityTempVo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityTemplateVo.java

@@ -16,7 +16,7 @@ import java.util.List;
  */
 @Data
 @ApiModel("【请填写功能名称】视图对象")
-public class DistributionActivityTempVo {
+public class DistributionActivityTemplateVo {
 	private static final long serialVersionUID = 1L;
 
 	/** 模板ID */
@@ -65,5 +65,5 @@ public class DistributionActivityTempVo {
 	private List<DistributionActivityTenantVo> tenantList;
 
 	@ApiModelProperty("活动商品集合")
-	private List<DistributionActivityTempGoodsVo> goodsList;
+	private List<DistributionActivityTemplateGoodsVo> goodsList;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/bo/TopSysDictDataAddBo.java

@@ -0,0 +1,65 @@
+package com.zhongzheng.modules.top.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 【请填写功能名称】添加对象 top_sys_dict_data
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+@Data
+@ApiModel("【请填写功能名称】添加对象")
+public class TopSysDictDataAddBo {
+
+    /** 字典排序 */
+    @ApiModelProperty("字典排序")
+    private Long dictSort;
+    /** 字典标签 */
+    @ApiModelProperty("字典标签")
+    private String dictLabel;
+    /** 字典键值 */
+    @ApiModelProperty("字典键值")
+    private String dictValue;
+    /** 字典类型 */
+    @ApiModelProperty("字典类型")
+    private String dictType;
+    /** 样式属性（其他样式扩展） */
+    @ApiModelProperty("样式属性（其他样式扩展）")
+    private String cssClass;
+    /** 表格回显样式 */
+    @ApiModelProperty("表格回显样式")
+    private String listClass;
+    /** 是否默认（Y是 N否） */
+    @ApiModelProperty("是否默认（Y是 N否）")
+    private String isDefault;
+    /** 状态（1正常0停用） */
+    @ApiModelProperty("状态（1正常0停用）")
+    private String status;
+    /** 创建者 */
+    @ApiModelProperty("创建者")
+    private String createBy;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    /** 更新者 */
+    @ApiModelProperty("更新者")
+    private String updateBy;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+    /** 字典类型ID */
+    @ApiModelProperty("字典类型ID")
+    private Long dictTypeId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/bo/TopSysDictDataEditBo.java

@@ -0,0 +1,73 @@
+package com.zhongzheng.modules.top.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 【请填写功能名称】编辑对象 top_sys_dict_data
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+@Data
+@ApiModel("【请填写功能名称】编辑对象")
+public class TopSysDictDataEditBo {
+
+    /** 字典编码 */
+    @ApiModelProperty("字典编码")
+    private Long dictCode;
+
+    /** 字典排序 */
+    @ApiModelProperty("字典排序")
+    private Long dictSort;
+
+    /** 字典标签 */
+    @ApiModelProperty("字典标签")
+    private String dictLabel;
+
+    /** 字典键值 */
+    @ApiModelProperty("字典键值")
+    private String dictValue;
+
+    /** 字典类型 */
+    @ApiModelProperty("字典类型")
+    private String dictType;
+
+    /** 样式属性（其他样式扩展） */
+    @ApiModelProperty("样式属性（其他样式扩展）")
+    private String cssClass;
+
+    /** 表格回显样式 */
+    @ApiModelProperty("表格回显样式")
+    private String listClass;
+
+    /** 是否默认（Y是 N否） */
+    @ApiModelProperty("是否默认（Y是 N否）")
+    private String isDefault;
+
+    /** 状态（1正常0停用） */
+    @ApiModelProperty("状态（1正常0停用）")
+    private String status;
+
+    /** 更新者 */
+    @ApiModelProperty("更新者")
+    private String updateBy;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+
+    /** 字典类型ID */
+    @ApiModelProperty("字典类型ID")
+    private Long dictTypeId;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/bo/TopSysDictDataQueryBo.java

@@ -0,0 +1,66 @@
+package com.zhongzheng.modules.top.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;
+
+/**
+ * 【请填写功能名称】分页查询对象 top_sys_dict_data
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("【请填写功能名称】分页查询对象")
+public class TopSysDictDataQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 字典排序 */
+	@ApiModelProperty("字典排序")
+	private Long dictSort;
+	/** 字典标签 */
+	@ApiModelProperty("字典标签")
+	private String dictLabel;
+	/** 字典键值 */
+	@ApiModelProperty("字典键值")
+	private String dictValue;
+	/** 字典类型 */
+	@ApiModelProperty("字典类型")
+	private String dictType;
+	/** 样式属性（其他样式扩展） */
+	@ApiModelProperty("样式属性（其他样式扩展）")
+	private String cssClass;
+	/** 表格回显样式 */
+	@ApiModelProperty("表格回显样式")
+	private String listClass;
+	/** 是否默认（Y是 N否） */
+	@ApiModelProperty("是否默认（Y是 N否）")
+	private String isDefault;
+	/** 状态（1正常0停用） */
+	@ApiModelProperty("状态（1正常0停用）")
+	private String status;
+	/** 字典类型ID */
+	@ApiModelProperty("字典类型ID")
+	private Long dictTypeId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/bo/TopSysDictTypeAddBo.java

@@ -0,0 +1,47 @@
+package com.zhongzheng.modules.top.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 【请填写功能名称】添加对象 top_sys_dict_type
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+@Data
+@ApiModel("【请填写功能名称】添加对象")
+public class TopSysDictTypeAddBo {
+
+    /** 字典名称 */
+    @ApiModelProperty("字典名称")
+    private String dictName;
+    /** 字典类型 */
+    @ApiModelProperty("字典类型")
+    private String dictType;
+    /** 状态（1正常 0停用） */
+    @ApiModelProperty("状态（1正常 0停用）")
+    private String status;
+    /** 创建者 */
+    @ApiModelProperty("创建者")
+    private String createBy;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    /** 更新者 */
+    @ApiModelProperty("更新者")
+    private String updateBy;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/bo/TopSysDictTypeEditBo.java

@@ -0,0 +1,49 @@
+package com.zhongzheng.modules.top.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 【请填写功能名称】编辑对象 top_sys_dict_type
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+@Data
+@ApiModel("【请填写功能名称】编辑对象")
+public class TopSysDictTypeEditBo {
+
+    /** 字典主键 */
+    @ApiModelProperty("字典主键")
+    private Long dictId;
+
+    /** 字典名称 */
+    @ApiModelProperty("字典名称")
+    private String dictName;
+
+    /** 字典类型 */
+    @ApiModelProperty("字典类型")
+    private String dictType;
+
+    /** 状态（1正常 0停用） */
+    @ApiModelProperty("状态（1正常 0停用）")
+    private String status;
+
+    /** 更新者 */
+    @ApiModelProperty("更新者")
+    private String updateBy;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/bo/TopSysDictTypeQueryBo.java

@@ -0,0 +1,48 @@
+package com.zhongzheng.modules.top.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;
+
+/**
+ * 【请填写功能名称】分页查询对象 top_sys_dict_type
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("【请填写功能名称】分页查询对象")
+public class TopSysDictTypeQueryBo 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 dictName;
+	/** 字典类型 */
+	@ApiModelProperty("字典类型")
+	private String dictType;
+	/** 状态（1正常 0停用） */
+	@ApiModelProperty("状态（1正常 0停用）")
+	private String status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/domain/TopSysDictData.java

@@ -0,0 +1,63 @@
+package com.zhongzheng.modules.top.domain;
+
+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 lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 【请填写功能名称】对象 top_sys_dict_data
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("top_sys_dict_data")
+public class TopSysDictData implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** 字典编码 */
+    @TableId(value = "dict_code")
+    private Long dictCode;
+    /** 字典排序 */
+    private Long dictSort;
+    /** 字典标签 */
+    private String dictLabel;
+    /** 字典键值 */
+    private String dictValue;
+    /** 字典类型 */
+    private String dictType;
+    /** 样式属性（其他样式扩展） */
+    private String cssClass;
+    /** 表格回显样式 */
+    private String listClass;
+    /** 是否默认（Y是 N否） */
+    private String isDefault;
+    /** 状态（1正常0停用） */
+    private String status;
+    /** 创建者 */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+    /** 更新者 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+    /** 备注 */
+    private String remark;
+    /** 字典类型ID */
+    private Long dictTypeId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/domain/TopSysDictType.java

@@ -0,0 +1,51 @@
+package com.zhongzheng.modules.top.domain;
+
+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 lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 【请填写功能名称】对象 top_sys_dict_type
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("top_sys_dict_type")
+public class TopSysDictType implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** 字典主键 */
+    @TableId(value = "dict_id")
+    private Long dictId;
+    /** 字典名称 */
+    private String dictName;
+    /** 字典类型 */
+    private String dictType;
+    /** 状态（1正常 0停用） */
+    private String status;
+    /** 创建者 */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+    /** 更新者 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+    /** 备注 */
+    private String remark;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mapper/TopSysDictDataMapper.java

@@ -0,0 +1,15 @@
+package com.zhongzheng.modules.top.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.top.domain.TopSysDictData;
+
+/**
+ * 【请填写功能名称】Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+public interface TopSysDictDataMapper extends BaseMapper<TopSysDictData> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mapper/TopSysDictTypeMapper.java

@@ -0,0 +1,15 @@
+package com.zhongzheng.modules.top.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.top.domain.TopSysDictType;
+
+/**
+ * 【请填写功能名称】Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+public interface TopSysDictTypeMapper extends BaseMapper<TopSysDictType> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/service/ITopSysDictDataService.java

@@ -0,0 +1,53 @@
+package com.zhongzheng.modules.top.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.top.bo.TopSysDictDataAddBo;
+import com.zhongzheng.modules.top.bo.TopSysDictDataEditBo;
+import com.zhongzheng.modules.top.bo.TopSysDictDataQueryBo;
+import com.zhongzheng.modules.top.domain.TopSysDictData;
+import com.zhongzheng.modules.top.vo.TopSysDictDataVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 【请填写功能名称】Service接口
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+public interface ITopSysDictDataService extends IService<TopSysDictData> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	TopSysDictDataVo queryById(Long dictCode);
+
+	/**
+	 * 查询列表
+	 */
+	List<TopSysDictDataVo> queryList(TopSysDictDataQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入【请填写功能名称】
+	 * @param bo 【请填写功能名称】新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(TopSysDictDataAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改【请填写功能名称】
+	 * @param bo 【请填写功能名称】编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(TopSysDictDataEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/service/ITopSysDictTypeService.java

@@ -0,0 +1,53 @@
+package com.zhongzheng.modules.top.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.top.bo.TopSysDictTypeAddBo;
+import com.zhongzheng.modules.top.bo.TopSysDictTypeEditBo;
+import com.zhongzheng.modules.top.bo.TopSysDictTypeQueryBo;
+import com.zhongzheng.modules.top.domain.TopSysDictType;
+import com.zhongzheng.modules.top.vo.TopSysDictTypeVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 【请填写功能名称】Service接口
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+public interface ITopSysDictTypeService extends IService<TopSysDictType> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	TopSysDictTypeVo queryById(Long dictId);
+
+	/**
+	 * 查询列表
+	 */
+	List<TopSysDictTypeVo> queryList(TopSysDictTypeQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入【请填写功能名称】
+	 * @param bo 【请填写功能名称】新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(TopSysDictTypeAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改【请填写功能名称】
+	 * @param bo 【请填写功能名称】编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(TopSysDictTypeEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/service/impl/TopSysDictDataServiceImpl.java

@@ -0,0 +1,107 @@
+package com.zhongzheng.modules.top.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.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
+import com.zhongzheng.modules.top.bo.TopSysDictDataAddBo;
+import com.zhongzheng.modules.top.bo.TopSysDictDataEditBo;
+import com.zhongzheng.modules.top.bo.TopSysDictDataQueryBo;
+import com.zhongzheng.modules.top.domain.TopSysDictData;
+import com.zhongzheng.modules.top.mapper.TopSysDictDataMapper;
+import com.zhongzheng.modules.top.service.ITopSysDictDataService;
+import com.zhongzheng.modules.top.vo.TopSysDictDataVo;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 【请填写功能名称】Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+@Service
+public class TopSysDictDataServiceImpl extends ServiceImpl<TopSysDictDataMapper, TopSysDictData> implements ITopSysDictDataService {
+
+    @Override
+    public TopSysDictDataVo queryById(Long dictCode){
+        TopSysDictData db = this.baseMapper.selectById(dictCode);
+        return BeanUtil.toBean(db, TopSysDictDataVo.class);
+    }
+
+    @Override
+    public List<TopSysDictDataVo> queryList(TopSysDictDataQueryBo bo) {
+        LambdaQueryWrapper<TopSysDictData> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getDictSort() != null, TopSysDictData::getDictSort, bo.getDictSort());
+        lqw.eq(StrUtil.isNotBlank(bo.getDictLabel()), TopSysDictData::getDictLabel, bo.getDictLabel());
+        lqw.eq(StrUtil.isNotBlank(bo.getDictValue()), TopSysDictData::getDictValue, bo.getDictValue());
+        lqw.eq(StrUtil.isNotBlank(bo.getDictType()), TopSysDictData::getDictType, bo.getDictType());
+        lqw.eq(StrUtil.isNotBlank(bo.getCssClass()), TopSysDictData::getCssClass, bo.getCssClass());
+        lqw.eq(StrUtil.isNotBlank(bo.getListClass()), TopSysDictData::getListClass, bo.getListClass());
+        lqw.eq(StrUtil.isNotBlank(bo.getIsDefault()), TopSysDictData::getIsDefault, bo.getIsDefault());
+        lqw.eq(StrUtil.isNotBlank(bo.getStatus()), TopSysDictData::getStatus, bo.getStatus());
+        lqw.eq(bo.getDictTypeId() != null, TopSysDictData::getDictTypeId, bo.getDictTypeId());
+        lqw.orderByAsc(TopSysDictData::getDictSort);
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<TopSysDictDataVo> entity2Vo(Collection<TopSysDictData> collection) {
+        List<TopSysDictDataVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, TopSysDictDataVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<TopSysDictData> page = (Page<TopSysDictData>)collection;
+            Page<TopSysDictDataVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(TopSysDictDataAddBo bo) {
+        TopSysDictData add = BeanUtil.toBean(bo, TopSysDictData.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(new Date());
+        add.setUpdateTime(new Date());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(TopSysDictDataEditBo bo) {
+        TopSysDictData update = BeanUtil.toBean(bo, TopSysDictData.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(new Date());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(TopSysDictData 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/top/service/impl/TopSysDictTypeServiceImpl.java

@@ -0,0 +1,100 @@
+package com.zhongzheng.modules.top.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.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
+import com.zhongzheng.modules.top.bo.TopSysDictTypeAddBo;
+import com.zhongzheng.modules.top.bo.TopSysDictTypeEditBo;
+import com.zhongzheng.modules.top.bo.TopSysDictTypeQueryBo;
+import com.zhongzheng.modules.top.domain.TopSysDictType;
+import com.zhongzheng.modules.top.mapper.TopSysDictTypeMapper;
+import com.zhongzheng.modules.top.service.ITopSysDictTypeService;
+import com.zhongzheng.modules.top.vo.TopSysDictTypeVo;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 【请填写功能名称】Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+@Service
+public class TopSysDictTypeServiceImpl extends ServiceImpl<TopSysDictTypeMapper, TopSysDictType> implements ITopSysDictTypeService {
+
+    @Override
+    public TopSysDictTypeVo queryById(Long dictId){
+        TopSysDictType db = this.baseMapper.selectById(dictId);
+        return BeanUtil.toBean(db, TopSysDictTypeVo.class);
+    }
+
+    @Override
+    public List<TopSysDictTypeVo> queryList(TopSysDictTypeQueryBo bo) {
+        LambdaQueryWrapper<TopSysDictType> lqw = Wrappers.lambdaQuery();
+        lqw.like(StrUtil.isNotBlank(bo.getDictName()), TopSysDictType::getDictName, bo.getDictName());
+        lqw.eq(StrUtil.isNotBlank(bo.getDictType()), TopSysDictType::getDictType, bo.getDictType());
+        lqw.eq(StrUtil.isNotBlank(bo.getStatus()), TopSysDictType::getStatus, bo.getStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<TopSysDictTypeVo> entity2Vo(Collection<TopSysDictType> collection) {
+        List<TopSysDictTypeVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, TopSysDictTypeVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<TopSysDictType> page = (Page<TopSysDictType>)collection;
+            Page<TopSysDictTypeVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(TopSysDictTypeAddBo bo) {
+        TopSysDictType add = BeanUtil.toBean(bo, TopSysDictType.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(new Date());
+        add.setUpdateTime(new Date());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(TopSysDictTypeEditBo bo) {
+        TopSysDictType update = BeanUtil.toBean(bo, TopSysDictType.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(new Date());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(TopSysDictType 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/top/vo/TopSysDictDataVo.java

@@ -0,0 +1,67 @@
+package com.zhongzheng.modules.top.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 2023-03-13
+ */
+@Data
+@ApiModel("【请填写功能名称】视图对象")
+public class TopSysDictDataVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 字典编码 */
+	@ApiModelProperty("字典编码")
+	private Long dictCode;
+
+	/** 字典排序 */
+	@Excel(name = "字典排序")
+	@ApiModelProperty("字典排序")
+	private Long dictSort;
+	/** 字典标签 */
+	@Excel(name = "字典标签")
+	@ApiModelProperty("字典标签")
+	private String dictLabel;
+	/** 字典键值 */
+	@Excel(name = "字典键值")
+	@ApiModelProperty("字典键值")
+	private String dictValue;
+	/** 字典类型 */
+	@Excel(name = "字典类型")
+	@ApiModelProperty("字典类型")
+	private String dictType;
+	/** 样式属性（其他样式扩展） */
+	@Excel(name = "样式属性" , readConverterExp = "其=他样式扩展")
+	@ApiModelProperty("样式属性（其他样式扩展）")
+	private String cssClass;
+	/** 表格回显样式 */
+	@Excel(name = "表格回显样式")
+	@ApiModelProperty("表格回显样式")
+	private String listClass;
+	/** 是否默认（Y是 N否） */
+	@Excel(name = "是否默认" , readConverterExp = "Y=是,N=否")
+	@ApiModelProperty("是否默认（Y是 N否）")
+	private String isDefault;
+	/** 状态（1正常0停用） */
+	@Excel(name = "状态" , readConverterExp = "1=正常0停用")
+	@ApiModelProperty("状态（1正常0停用）")
+	private String status;
+	/** 备注 */
+	@Excel(name = "备注")
+	@ApiModelProperty("备注")
+	private String remark;
+	/** 字典类型ID */
+	@Excel(name = "字典类型ID")
+	@ApiModelProperty("字典类型ID")
+	private Long dictTypeId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/vo/TopSysDictTypeVo.java

@@ -0,0 +1,41 @@
+package com.zhongzheng.modules.top.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+
+/**
+ * 【请填写功能名称】视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2023-03-13
+ */
+@Data
+@ApiModel("【请填写功能名称】视图对象")
+public class TopSysDictTypeVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 字典主键 */
+	@ApiModelProperty("字典主键")
+	private Long dictId;
+
+	/** 字典名称 */
+	@Excel(name = "字典名称")
+	@ApiModelProperty("字典名称")
+	private String dictName;
+	/** 字典类型 */
+	@Excel(name = "字典类型")
+	@ApiModelProperty("字典类型")
+	private String dictType;
+	/** 状态（1正常 0停用） */
+	@Excel(name = "状态" , readConverterExp = "1=正常,0=停用")
+	@ApiModelProperty("状态（1正常 0停用）")
+	private String status;
+	/** 备注 */
+	@Excel(name = "备注")
+	@ApiModelProperty("备注")
+	private String remark;
+}