submit

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/alioss/OssController.java

@@ -0,0 +1,73 @@
+package com.zhongzheng.controller.alioss;
+
+
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.modules.alioss.bo.OssRequest;
+import com.zhongzheng.modules.alioss.service.OssService;
+import com.zhongzheng.modules.alioss.vo.ResultBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 阿里OSS
+ *
+ * @author change
+ * @date 2021-05-17
+ */
+@Api(value = "阿里OSS上传文件控制器", tags = {"阿里OSS上传文件"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/aliyun/oss")
+public class OssController extends BaseController {
+
+    private static Logger log = LoggerFactory.getLogger(OssController.class);
+
+    private final OssService ossService;
+
+    /**
+     * policy获得
+     */
+    @ApiOperation("policy获得")
+    @GetMapping("/policy")
+    public AjaxResult<ResultBean> policy(@Validated OssRequest ossRequest) {
+        ResultBean result = ossService.getPolicy(ossRequest);
+        log.info("服务端生成签名:{}",result);
+        return AjaxResult.success(result);
+    }
+
+    /**
+     * 阿里回调OSS返回参数到前端
+     */
+    @ApiOperation("回调")
+    @PostMapping("/callback")
+    public ResultBean callback(HttpServletRequest request) {
+        ResultBean ossCallbackResult = ossService.callback(request);
+        log.info("oss成功的回调:{}",ossCallbackResult);
+        return ossCallbackResult;
+    }
+
+
+    /**
+     * upload上传文件
+     */
+    @ApiOperation("上传file图片")
+    @PostMapping("/upload")
+    public AjaxResult<String> upload( OssRequest file) throws Exception {
+        String result = ossService.upload(file);
+        log.info("服务端生成签名:{}",result);
+        return AjaxResult.success("返回图片路径",result);
+    }
+
+}

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

@@ -4,12 +4,12 @@ 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.DistributionActivityTemplateAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateQueryBo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateAddBo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateEditBo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateQueryBo;
 import com.zhongzheng.modules.distribution.bo.DistributionStatusEditBo;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityTemplateService;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplateVo;
+import com.zhongzheng.modules.top.distribution.service.IDistributionActivityTemplateService;
+import com.zhongzheng.modules.top.distribution.vo.DistributionActivityTemplateVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityTemplateGoodsController.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.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 com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateGoodsAddBo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateGoodsEditBo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateGoodsQueryBo;
+import com.zhongzheng.modules.top.distribution.service.IDistributionActivityTemplateGoodsService;
+import com.zhongzheng.modules.top.distribution.vo.DistributionActivityTemplateGoodsVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

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

@@ -1,24 +1,24 @@
 package com.zhongzheng.controller.distribution;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplatePosterAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplatePosterQueryBo;
-import com.zhongzheng.modules.distribution.bo.distributionActivityTemplatePosterEditBo;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplateImage;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityTemplateImageService;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityTemplatePosterService;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplateImageVo;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplatePosterVo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplatePosterAddBo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplatePosterQueryBo;
+import com.zhongzheng.modules.top.distribution.bo.distributionActivityTemplatePosterEditBo;
+import com.zhongzheng.modules.top.distribution.domain.DistributionActivityTemplateImage;
+import com.zhongzheng.modules.top.distribution.service.IDistributionActivityTemplateImageService;
+import com.zhongzheng.modules.top.distribution.service.IDistributionActivityTemplatePosterService;
+import com.zhongzheng.modules.top.distribution.vo.DistributionActivityTemplateImageVo;
+import com.zhongzheng.modules.top.distribution.vo.DistributionActivityTemplatePosterVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -55,7 +55,7 @@ public class DistributionActivityTemplatePosterController extends BaseController
     @ApiOperation("获取海报模板底图列表")
     @GetMapping("/image/list")
     public AjaxResult<List<DistributionActivityTemplateImageVo>> list() {
-        List<DistributionActivityTemplateImage> imageList = iDistributionActivityTemplateImageService.list();
+        List<DistributionActivityTemplateImage> imageList = iDistributionActivityTemplateImageService.list(new LambdaQueryWrapper<DistributionActivityTemplateImage>().eq(DistributionActivityTemplateImage::getStatus,1));
         List<DistributionActivityTemplateImageVo> voList = imageList.stream().map(item -> BeanUtil.toBean(item, DistributionActivityTemplateImageVo.class)).collect(Collectors.toList());
         return AjaxResult.success(voList);
     }

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityTemplateRelationController.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.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 com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateRelationAddBo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateRelationEditBo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateRelationQueryBo;
+import com.zhongzheng.modules.top.distribution.service.IDistributionActivityTemplateRelationService;
+import com.zhongzheng.modules.top.distribution.vo.DistributionActivityTemplateRelationVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

zhongzheng-admin/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityController.java

@@ -1,10 +1,8 @@
 package com.zhongzheng.controller.distribution;
 
-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.distribution.bo.DistributionActivityEditBo;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityQueryBo;
@@ -15,10 +13,8 @@ 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;
 
 /**
@@ -27,19 +23,19 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-03-06
  */
-@Api(value = "【请填写功能名称】控制器", tags = {"【请填写功能名称】管理"})
+@Api(value = "分销活动控制器", tags = {"分销活动管理"})
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
-@RequestMapping("/system/activity")
+@RequestMapping("/distribution/activity")
 public class DistributionActivityController extends BaseController {
 
     private final IDistributionActivityService iDistributionActivityService;
 
+
     /**
      * 查询【请填写功能名称】列表
      */
     @ApiOperation("查询【请填写功能名称】列表")
-    @PreAuthorize("@ss.hasPermi('system:activity:list')")
     @GetMapping("/list")
     public TableDataInfo<DistributionActivityVo> list(DistributionActivityQueryBo bo) {
         startPage();
@@ -51,8 +47,6 @@ public class DistributionActivityController extends BaseController {
      * 导出【请填写功能名称】列表
      */
     @ApiOperation("导出【请填写功能名称】列表")
-    @PreAuthorize("@ss.hasPermi('system:activity:export')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult<DistributionActivityVo> export(DistributionActivityQueryBo bo) {
         List<DistributionActivityVo> list = iDistributionActivityService.queryList(bo);
@@ -64,7 +58,6 @@ public class DistributionActivityController extends BaseController {
      * 获取【请填写功能名称】详细信息
      */
     @ApiOperation("获取【请填写功能名称】详细信息")
-    @PreAuthorize("@ss.hasPermi('system:activity:query')")
     @GetMapping("/{distributionId}")
     public AjaxResult<DistributionActivityVo> getInfo(@PathVariable("distributionId" ) Long distributionId) {
         return AjaxResult.success(iDistributionActivityService.queryById(distributionId));
@@ -74,9 +67,7 @@ public class DistributionActivityController extends BaseController {
      * 新增【请填写功能名称】
      */
     @ApiOperation("新增【请填写功能名称】")
-    @PreAuthorize("@ss.hasPermi('system:activity:add')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
-    @PostMapping()
+    @PostMapping("/save")
     public AjaxResult<Void> add(@RequestBody DistributionActivityAddBo bo) {
         return toAjax(iDistributionActivityService.insertByAddBo(bo) ? 1 : 0);
     }
@@ -85,21 +76,9 @@ public class DistributionActivityController extends BaseController {
      * 修改【请填写功能名称】
      */
     @ApiOperation("修改【请填写功能名称】")
-    @PreAuthorize("@ss.hasPermi('system:activity:edit')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
-    @PutMapping()
+    @PostMapping("/edit")
     public AjaxResult<Void> edit(@RequestBody DistributionActivityEditBo bo) {
         return toAjax(iDistributionActivityService.updateByEditBo(bo) ? 1 : 0);
     }
 
-    /**
-     * 删除【请填写功能名称】
-     */
-    @ApiOperation("删除【请填写功能名称】")
-    @PreAuthorize("@ss.hasPermi('system:activity:remove')")
-    @Log(title = "【请填写功能名称】" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{distributionIds}")
-    public AjaxResult<Void> remove(@PathVariable Long[] distributionIds) {
-        return toAjax(iDistributionActivityService.deleteWithValidByIds(Arrays.asList(distributionIds), true) ? 1 : 0);
-    }
 }

zhongzheng-admin/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityPosterController.java

@@ -1,25 +1,27 @@
 package com.zhongzheng.controller.distribution;
 
-import com.zhongzheng.common.annotation.Log;
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.distribution.bo.DistributionActivityPosterAddBo;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityPosterEditBo;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityPosterQueryBo;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityImage;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityImageService;
 import com.zhongzheng.modules.distribution.service.IDistributionActivityPosterService;
+import com.zhongzheng.modules.distribution.vo.DistributionActivityImageVo;
 import com.zhongzheng.modules.distribution.vo.DistributionActivityPosterVo;
 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;
+import java.util.stream.Collectors;
 
 /**
  * 【请填写功能名称】Controller
@@ -27,19 +29,20 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-03-06
  */
-@Api(value = "【请填写功能名称】控制器", tags = {"【请填写功能名称】管理"})
+@Api(value = "分销活动海报控制器", tags = {"分销活动海报控制器管理"})
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
-@RequestMapping("/system/poster")
+@RequestMapping("/distribution/poster")
 public class DistributionActivityPosterController extends BaseController {
 
     private final IDistributionActivityPosterService iDistributionActivityPosterService;
 
+    private final IDistributionActivityImageService iDistributionImageService;
+
     /**
-     * 查询【请填写功能名称】列表
+     * 查询海报列表
      */
-    @ApiOperation("查询【请填写功能名称】列表")
-    @PreAuthorize("@ss.hasPermi('system:poster:list')")
+    @ApiOperation("查询海报列表")
     @GetMapping("/list")
     public TableDataInfo<DistributionActivityPosterVo> list(DistributionActivityPosterQueryBo bo) {
         startPage();
@@ -47,12 +50,21 @@ public class DistributionActivityPosterController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 获取底图列表
+     */
+    @ApiOperation("获取海报底图列表")
+    @GetMapping("/image/list")
+    public AjaxResult<List<DistributionActivityImageVo>> list() {
+        List<DistributionActivityImage> imageList = iDistributionImageService.list(new LambdaQueryWrapper<DistributionActivityImage>().eq(DistributionActivityImage::getStatus,1));
+        List<DistributionActivityImageVo> voList = imageList.stream().map(item -> BeanUtil.toBean(item, DistributionActivityImageVo.class)).collect(Collectors.toList());
+        return AjaxResult.success(voList);
+    }
+
     /**
      * 导出【请填写功能名称】列表
      */
     @ApiOperation("导出【请填写功能名称】列表")
-    @PreAuthorize("@ss.hasPermi('system:poster:export')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult<DistributionActivityPosterVo> export(DistributionActivityPosterQueryBo bo) {
         List<DistributionActivityPosterVo> list = iDistributionActivityPosterService.queryList(bo);
@@ -61,45 +73,30 @@ public class DistributionActivityPosterController extends BaseController {
     }
 
     /**
-     * 获取【请填写功能名称】详细信息
+     * 获取海报详细信息
      */
-    @ApiOperation("获取【请填写功能名称】详细信息")
-    @PreAuthorize("@ss.hasPermi('system:poster:query')")
+    @ApiOperation("获取海报详细信息")
     @GetMapping("/{posterId}")
     public AjaxResult<DistributionActivityPosterVo> getInfo(@PathVariable("posterId" ) Long posterId) {
         return AjaxResult.success(iDistributionActivityPosterService.queryById(posterId));
     }
 
     /**
-     * 新增【请填写功能名称】
+     * 新增海报
      */
-    @ApiOperation("新增【请填写功能名称】")
-    @PreAuthorize("@ss.hasPermi('system:poster:add')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
-    @PostMapping()
+    @ApiOperation("新增海报")
+    @PostMapping("/save")
     public AjaxResult<Void> add(@RequestBody DistributionActivityPosterAddBo bo) {
         return toAjax(iDistributionActivityPosterService.insertByAddBo(bo) ? 1 : 0);
     }
 
     /**
-     * 修改【请填写功能名称】
+     * 修改海报
      */
-    @ApiOperation("修改【请填写功能名称】")
-    @PreAuthorize("@ss.hasPermi('system:poster:edit')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
-    @PutMapping()
+    @ApiOperation("修改海报")
+    @PostMapping("/edit")
     public AjaxResult<Void> edit(@RequestBody DistributionActivityPosterEditBo bo) {
         return toAjax(iDistributionActivityPosterService.updateByEditBo(bo) ? 1 : 0);
     }
 
-    /**
-     * 删除【请填写功能名称】
-     */
-    @ApiOperation("删除【请填写功能名称】")
-    @PreAuthorize("@ss.hasPermi('system:poster:remove')")
-    @Log(title = "【请填写功能名称】" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{posterIds}")
-    public AjaxResult<Void> remove(@PathVariable Long[] posterIds) {
-        return toAjax(iDistributionActivityPosterService.deleteWithValidByIds(Arrays.asList(posterIds), true) ? 1 : 0);
-    }
 }

zhongzheng-common/src/main/java/com/zhongzheng/common/core/domain/entity/SysRole.java

@@ -101,6 +101,8 @@ public class SysRole implements Serializable
     @ApiModelProperty(value ="备注")
     private String remark;
 
+    private Long tenantId;
+
     /**
      * 请求参数
      */

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

@@ -1,9 +1,10 @@
-package com.zhongzheng.system.bo;
+package com.zhongzheng.modules.distribution.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
 
 
 /**
@@ -58,4 +59,6 @@ public class DistributionActivityAddBo {
     /** 修改时间 */
     @ApiModelProperty("修改时间")
     private Long updateTime;
+    @ApiModelProperty("活动商品集合")
+    private List<DistributionActivityGoodsAddBo> goodsList;
 }

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

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 
 /**
  * 【请填写功能名称】编辑对象 distribution_activity
@@ -65,5 +67,6 @@ public class DistributionActivityEditBo {
     @ApiModelProperty("修改时间")
     private Long updateTime;
 
-
+    @ApiModelProperty("活动商品集合")
+    private List<DistributionActivityGoodsAddBo> goodsList;
 }

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

@@ -0,0 +1,44 @@
+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_poster
+ *
+ * @author ruoyi
+ * @date 2023-03-06
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("distribution_activity_image")
+public class DistributionActivityImage implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** 活动海报模板ID */
+    @TableId(value = "id")
+    private Long id;
+    /** 海报模板名称 */
+    private String name;
+    /** 海报模板地址 */
+    private String url;
+    /** 状态：1有效，0无效 */
+    private Integer status;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 备注 */
+    private Long tenantId;
+}

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

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

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

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

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

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.distribution.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityAddBo;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityEditBo;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityQueryBo;
 import com.zhongzheng.modules.distribution.domain.DistributionActivity;
@@ -32,7 +33,7 @@ public interface IDistributionActivityService extends IService<DistributionActiv
 	 * @param bo 【请填写功能名称】新增业务对象
 	 * @return
 	 */
-	Boolean insertByAddBo(com.zhongzheng.system.bo.DistributionActivityAddBo bo);
+	Boolean insertByAddBo(DistributionActivityAddBo bo);
 
 	/**
 	 * 根据编辑业务对象修改【请填写功能名称】

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

@@ -1,17 +1,19 @@
 package com.zhongzheng.modules.distribution.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 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 com.zhongzheng.modules.distribution.domain.DistributionActivityImage;
+import com.zhongzheng.modules.distribution.mapper.DistributionActivityImageMapper;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityImageService;
 import org.springframework.stereotype.Service;
 
 /**
  * 【请填写功能名称】Service业务层处理
  *
  * @author ruoyi
- * @date 2023-03-13
+ * @date 2023-03-06
  */
 @Service
-public class DistributionActivityTemplateImageServiceImpl extends ServiceImpl<DistributionActivityTemplateImageMapper, DistributionActivityTemplateImage> implements IDistributionActivityTemplateImageService {
+@DS("slave")
+public class DistributionActivityImageServiceImpl extends ServiceImpl<DistributionActivityImageMapper, DistributionActivityImage> implements IDistributionActivityImageService {
 }

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

@@ -7,14 +7,18 @@ 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.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityPosterAddBo;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityPosterEditBo;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityPosterQueryBo;
+import com.zhongzheng.modules.distribution.domain.DistributionActivity;
 import com.zhongzheng.modules.distribution.domain.DistributionActivityPoster;
 import com.zhongzheng.modules.distribution.mapper.DistributionActivityPosterMapper;
 import com.zhongzheng.modules.distribution.service.IDistributionActivityPosterService;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityService;
 import com.zhongzheng.modules.distribution.vo.DistributionActivityPosterVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;
@@ -31,6 +35,9 @@ import java.util.stream.Collectors;
 @DS("slave")
 public class DistributionActivityPosterServiceImpl extends ServiceImpl<DistributionActivityPosterMapper, DistributionActivityPoster> implements IDistributionActivityPosterService {
 
+    @Autowired
+    private IDistributionActivityService iDistributionActivityService;
+
     @Override
     public DistributionActivityPosterVo queryById(Long posterId){
         DistributionActivityPoster db = this.baseMapper.selectById(posterId);
@@ -76,6 +83,14 @@ public class DistributionActivityPosterServiceImpl extends ServiceImpl<Distribut
 
     @Override
     public Boolean updateByEditBo(DistributionActivityPosterEditBo bo) {
+        //校验是否有绑定活动
+        int count = iDistributionActivityService.count(new LambdaQueryWrapper<DistributionActivity>()
+                .eq(DistributionActivity::getPosterId, bo.getPosterId())
+                .eq(DistributionActivity::getStatus, 1)
+                .eq(DistributionActivity::getUseStatus, 1));
+        if (count > 0 ){
+            throw new CustomException("该海报已绑定启用的分销活动，请勿修改！");
+        }
         DistributionActivityPoster update = BeanUtil.toBean(bo, DistributionActivityPoster.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());

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

@@ -4,16 +4,25 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
+import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityAddBo;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityEditBo;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityQueryBo;
 import com.zhongzheng.modules.distribution.domain.DistributionActivity;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityGoods;
 import com.zhongzheng.modules.distribution.mapper.DistributionActivityMapper;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityGoodsService;
 import com.zhongzheng.modules.distribution.service.IDistributionActivityService;
+import com.zhongzheng.modules.distribution.vo.DistributionActivityGoodsVo;
 import com.zhongzheng.modules.distribution.vo.DistributionActivityVo;
+import com.zhongzheng.modules.goods.domain.Goods;
+import com.zhongzheng.modules.goods.service.IGoodsService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;
@@ -30,10 +39,31 @@ import java.util.stream.Collectors;
 @DS("slave")
 public class DistributionActivityServiceImpl extends ServiceImpl<DistributionActivityMapper, DistributionActivity> implements IDistributionActivityService {
 
+    @Autowired
+    private IDistributionActivityGoodsService iDistributionActivityGoodsService;
+    @Autowired
+    private IGoodsService iGoodsService;
+
     @Override
     public DistributionActivityVo queryById(Long distributionId){
         DistributionActivity db = this.baseMapper.selectById(distributionId);
-        return BeanUtil.toBean(db, DistributionActivityVo.class);
+        DistributionActivityVo vo = BeanUtil.toBean(db, DistributionActivityVo.class);
+        //获取商品信息
+        List<DistributionActivityGoods> templateGoodsList = iDistributionActivityGoodsService
+                .list(new LambdaQueryWrapper<DistributionActivityGoods>()
+                        .eq(DistributionActivityGoods::getStatus, 1)
+                        .eq(DistributionActivityGoods::getDistributionId, vo.getDistributionId()));
+        if (CollectionUtils.isNotEmpty(templateGoodsList)){
+            List<DistributionActivityGoodsVo> templateGoodsVos = templateGoodsList.stream().map(item -> {
+                DistributionActivityGoodsVo goodsVo = BeanUtil.toBean(item, DistributionActivityGoodsVo.class);
+                Goods goods = iGoodsService.getById(goodsVo.getGoodsId());
+                goodsVo.setGoodsName(goods.getGoodsName());
+                goodsVo.setGoodsPrice(goods.getStandPrice());
+                return goodsVo;
+            }).collect(Collectors.toList());
+            vo.setGoodsList(templateGoodsVos);
+        }
+        return vo;
     }
 
     @Override
@@ -71,20 +101,53 @@ public class DistributionActivityServiceImpl extends ServiceImpl<DistributionAct
     }
 
     @Override
-    public Boolean insertByAddBo(com.zhongzheng.system.bo.DistributionActivityAddBo bo) {
+    public Boolean insertByAddBo(DistributionActivityAddBo bo) {
         DistributionActivity add = BeanUtil.toBean(bo, DistributionActivity.class);
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
+        this.save(add);
+        //活动商品
+        if (CollectionUtils.isNotEmpty(bo.getGoodsList())){
+            List<DistributionActivityGoods> collect = bo.getGoodsList().stream().map(item -> {
+                DistributionActivityGoods entity = BeanUtil.toBean(item, DistributionActivityGoods.class);
+                entity.setDistributionId(add.getDistributionId());
+                entity.setCreateTime(DateUtils.getNowTime());
+                entity.setUpdateTime(DateUtils.getNowTime());
+                return entity;
+            }).collect(Collectors.toList());
+            iDistributionActivityGoodsService.saveBatch(collect);
+        }
+
+        return true;
     }
 
     @Override
     public Boolean updateByEditBo(DistributionActivityEditBo bo) {
+        //校验
+        DistributionActivity activityTemp = getById(bo.getDistributionId());
+        if (activityTemp.getUseStatus() == 1){
+            throw new CustomException("活动已启用，不能修改！");
+        }
         DistributionActivity update = BeanUtil.toBean(bo, DistributionActivity.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
-        return this.updateById(update);
+        this.updateById(update);
+        //删除活动商品和下发机构重新绑定
+        iDistributionActivityGoodsService.remove(new LambdaQueryWrapper<DistributionActivityGoods>()
+                .eq(DistributionActivityGoods::getDistributionId,bo.getDistributionId()));
+        //活动商品
+        if (CollectionUtils.isNotEmpty(bo.getGoodsList())){
+            List<DistributionActivityGoods> collect = bo.getGoodsList().stream().map(item -> {
+                DistributionActivityGoods entity = BeanUtil.toBean(item, DistributionActivityGoods.class);
+                entity.setDistributionId(update.getDistributionId());
+                entity.setCreateTime(DateUtils.getNowTime());
+                entity.setUpdateTime(DateUtils.getNowTime());
+                return entity;
+            }).collect(Collectors.toList());
+            iDistributionActivityGoodsService.saveBatch(collect);
+        }
+        return true;
     }
 
     /**

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

@@ -31,6 +31,10 @@ public class DistributionActivityGoodsVo {
 	@Excel(name = "商品ID")
 	@ApiModelProperty("商品ID")
 	private Long goodsId;
+	@ApiModelProperty("商品名称")
+	private String goodsName;
+	@ApiModelProperty("商品价格")
+	private BigDecimal goodsPrice;
 	/** 总佣金上限 */
 	@Excel(name = "总佣金上限")
 	@ApiModelProperty("总佣金上限")

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

@@ -0,0 +1,41 @@
+package com.zhongzheng.modules.distribution.vo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 【请填写功能名称】对象 distribution_activity_poster
+ *
+ * @author ruoyi
+ * @date 2023-03-06
+ */
+@Data
+@ApiModel("海报底图对象VO")
+public class DistributionActivityImageVo implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** 活动海报模板ID */
+    @ApiModelProperty("活动海报模板ID")
+    private Long id;
+    /** 海报模板名称 */
+    @ApiModelProperty("海报模板名称")
+    private String name;
+    /** 海报模板地址 */
+    @ApiModelProperty("海报模板地址")
+    private String url;
+    /** 状态：1有效，0无效 */
+    @ApiModelProperty("状态：1有效，0无效")
+    private Integer status;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+}

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
 
 
 /**
@@ -63,4 +64,6 @@ public class DistributionActivityVo {
 	@Excel(name = "海报ID")
 	@ApiModelProperty("海报ID")
 	private Long posterId;
+	@ApiModelProperty("活动商品集合")
+	private List<DistributionActivityGoodsVo> goodsList;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/impl/InformRemindServiceImpl.java

@@ -3,12 +3,16 @@ package com.zhongzheng.modules.inform.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+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.course.bo.CourseBusinessQueryBo;
 import com.zhongzheng.modules.course.bo.CourseEducationTypeQueryBo;
 import com.zhongzheng.modules.course.bo.CourseProjectTypeQueryBo;
-import com.zhongzheng.modules.course.domain.CourseMenu;
 import com.zhongzheng.modules.course.service.ICourseBusinessService;
 import com.zhongzheng.modules.course.service.ICourseEducationTypeService;
 import com.zhongzheng.modules.course.service.ICourseProjectTypeService;
@@ -18,29 +22,23 @@ import com.zhongzheng.modules.grade.bo.ClassGradeQueryBo;
 import com.zhongzheng.modules.grade.service.IClassGradeGoodsService;
 import com.zhongzheng.modules.grade.service.IClassGradeSysService;
 import com.zhongzheng.modules.grade.service.IClassGradeUserService;
-import com.zhongzheng.modules.grade.vo.ClassGradeStudentVo;
+import com.zhongzheng.modules.inform.bo.InformRemindAddBo;
 import com.zhongzheng.modules.inform.bo.InformRemindBusinessAddBo;
+import com.zhongzheng.modules.inform.bo.InformRemindEditBo;
+import com.zhongzheng.modules.inform.bo.InformRemindQueryBo;
+import com.zhongzheng.modules.inform.domain.InformRemind;
 import com.zhongzheng.modules.inform.domain.InformRemindBusiness;
+import com.zhongzheng.modules.inform.mapper.InformRemindMapper;
 import com.zhongzheng.modules.inform.service.IInformRemindBusinessService;
+import com.zhongzheng.modules.inform.service.IInformRemindService;
 import com.zhongzheng.modules.inform.vo.InformRemindBusinessVo;
+import com.zhongzheng.modules.inform.vo.InformRemindVo;
 import com.zhongzheng.modules.user.service.IUserStudyRecordService;
 import com.zhongzheng.modules.user.service.IUserUpdateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.Page;
-import com.zhongzheng.modules.inform.bo.InformRemindAddBo;
-import com.zhongzheng.modules.inform.bo.InformRemindQueryBo;
-import com.zhongzheng.modules.inform.bo.InformRemindEditBo;
-import com.zhongzheng.modules.inform.domain.InformRemind;
-import com.zhongzheng.modules.inform.mapper.InformRemindMapper;
-import com.zhongzheng.modules.inform.vo.InformRemindVo;
-import com.zhongzheng.modules.inform.service.IInformRemindService;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -51,6 +49,7 @@ import java.util.stream.Collectors;
  * @date 2021-11-25
  */
 @Service
+@DS("slave")
 public class InformRemindServiceImpl extends ServiceImpl<InformRemindMapper, InformRemind> implements IInformRemindService {
 
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/impl/InformSysUserServiceImpl.java

@@ -2,13 +2,17 @@ package com.zhongzheng.modules.inform.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.inform.bo.InformSysUserAddBo;
 import com.zhongzheng.modules.inform.bo.InformSysUserEditBo;
 import com.zhongzheng.modules.inform.bo.InformSysUserQueryBo;
-import com.zhongzheng.modules.inform.bo.InformUserEditBo;
 import com.zhongzheng.modules.inform.domain.InformRemind;
 import com.zhongzheng.modules.inform.domain.InformSysUser;
 import com.zhongzheng.modules.inform.mapper.InformSysUserMapper;
@@ -17,18 +21,11 @@ import com.zhongzheng.modules.inform.service.IInformSysUserService;
 import com.zhongzheng.modules.inform.vo.InformSysUserVo;
 import com.zhongzheng.modules.order.domain.OrderGoods;
 import com.zhongzheng.modules.order.service.IOrderGoodsService;
-import com.zhongzheng.modules.user.domain.User;
-import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.Page;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -39,6 +36,7 @@ import java.util.stream.Collectors;
  * @date 2022-08-04
  */
 @Service
+@DS("slave")
 public class InformSysUserServiceImpl extends ServiceImpl<InformSysUserMapper, InformSysUser> implements IInformSysUserService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/domain/SysUserRole.java

@@ -1,6 +1,5 @@
 package com.zhongzheng.modules.system.domain;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -25,4 +24,6 @@ public class SysUserRole {
      */
     private Long roleId;
 
+    private Long tenantId;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/ISysUserRoleService.java

@@ -0,0 +1,12 @@
+package com.zhongzheng.modules.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.system.domain.SysUserRole;
+
+/**
+ * 角色业务层
+ *
+ * @author zhongzheng
+ */
+public interface ISysUserRoleService extends IService<SysUserRole> {
+}

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

@@ -2,6 +2,7 @@ package com.zhongzheng.modules.system.service.impl;
 
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -10,7 +11,6 @@ import com.zhongzheng.common.constant.UserConstants;
 import com.zhongzheng.common.core.domain.entity.SysRole;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.spring.SpringUtils;
-import com.zhongzheng.modules.course.bo.CourseHandoutsBusinessAddBo;
 import com.zhongzheng.modules.system.bo.SysRoleBusinessQueryBo;
 import com.zhongzheng.modules.system.domain.SysRoleBusiness;
 import com.zhongzheng.modules.system.domain.SysRoleDept;
@@ -19,9 +19,9 @@ import com.zhongzheng.modules.system.domain.SysUserRole;
 import com.zhongzheng.modules.system.mapper.SysRoleDeptMapper;
 import com.zhongzheng.modules.system.mapper.SysRoleMapper;
 import com.zhongzheng.modules.system.mapper.SysRoleMenuMapper;
+import com.zhongzheng.modules.system.mapper.SysUserRoleMapper;
 import com.zhongzheng.modules.system.service.ISysRoleBusinessService;
 import com.zhongzheng.modules.system.service.ISysRoleService;
-import com.zhongzheng.modules.system.mapper.SysUserRoleMapper;
 import com.zhongzheng.modules.system.vo.SysRoleBusinessVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -35,6 +35,7 @@ import java.util.*;
  * @author zhongzheng
  */
 @Service
+@DS("slave")
 public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements ISysRoleService {
 
     @Autowired

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

@@ -0,0 +1,18 @@
+package com.zhongzheng.modules.system.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhongzheng.modules.system.domain.SysUserRole;
+import com.zhongzheng.modules.system.mapper.SysUserRoleMapper;
+import com.zhongzheng.modules.system.service.ISysUserRoleService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 角色业务层
+ *
+ * @author zhongzheng
+ */
+@Service
+@DS("slave")
+public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUserRole> implements ISysUserRoleService {
+}

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

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.distribution.bo;
+package com.zhongzheng.modules.top.distribution.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.distribution.bo;
+package com.zhongzheng.modules.top.distribution.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.distribution.bo;
+package com.zhongzheng.modules.top.distribution.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.distribution.bo;
+package com.zhongzheng.modules.top.distribution.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.distribution.bo;
+package com.zhongzheng.modules.top.distribution.bo;
 
 import com.zhongzheng.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;

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

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.distribution.bo;
+package com.zhongzheng.modules.top.distribution.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.distribution.bo;
+package com.zhongzheng.modules.top.distribution.bo;
 
 import com.zhongzheng.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】分页查询对象 distribution_activity_temp_poster
  *
@@ -38,6 +40,6 @@ public class DistributionActivityTemplatePosterQueryBo extends BaseEntity {
 	@ApiModelProperty("海报模板名称")
 	private String name;
 	/** 状态：1有效，0无效 */
-	@ApiModelProperty("状态：1有效，-1无效")
-	private Integer status;
+	@ApiModelProperty("1有效，0禁用，-1无效")
+	private List<Integer> status;
 }

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

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.distribution.bo;
+package com.zhongzheng.modules.top.distribution.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

@@ -1,10 +1,8 @@
-package com.zhongzheng.modules.distribution.bo;
+package com.zhongzheng.modules.top.distribution.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import java.util.Date;
 
 
 

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

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.distribution.bo;
+package com.zhongzheng.modules.top.distribution.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.distribution.bo;
+package com.zhongzheng.modules.top.distribution.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.distribution.bo;
+package com.zhongzheng.modules.top.distribution.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.distribution.domain;
+package com.zhongzheng.modules.top.distribution.domain;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

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

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.distribution.domain;
+package com.zhongzheng.modules.top.distribution.domain;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

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

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.distribution.domain;
+package com.zhongzheng.modules.top.distribution.domain;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivityTemplatePoster.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/top/distribution/domain/DistributionActivityTemplatePoster.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.distribution.domain;
+package com.zhongzheng.modules.top.distribution.domain;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

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

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.distribution.domain;
+package com.zhongzheng.modules.top.distribution.domain;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

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

@@ -1,7 +1,7 @@
-package com.zhongzheng.modules.distribution.mapper;
+package com.zhongzheng.modules.top.distribution.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplateGoods;
+import com.zhongzheng.modules.top.distribution.domain.DistributionActivityTemplateGoods;
 
 /**
  * 【请填写功能名称】Mapper接口

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

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

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

@@ -1,7 +1,7 @@
-package com.zhongzheng.modules.distribution.mapper;
+package com.zhongzheng.modules.top.distribution.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplatePoster;
+import com.zhongzheng.modules.top.distribution.domain.DistributionActivityTemplatePoster;
 
 /**
  * 【请填写功能名称】Mapper接口

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

@@ -1,7 +1,7 @@
-package com.zhongzheng.modules.distribution.mapper;
+package com.zhongzheng.modules.top.distribution.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplateRelation;
+import com.zhongzheng.modules.top.distribution.domain.DistributionActivityTemplateRelation;
 
 /**
  * 【请填写功能名称】Mapper接口

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

@@ -1,7 +1,7 @@
-package com.zhongzheng.modules.distribution.mapper;
+package com.zhongzheng.modules.top.distribution.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplateImage;
+import com.zhongzheng.modules.top.distribution.domain.DistributionActivityTemplateImage;
 
 /**
  * 【请填写功能名称】Mapper接口

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

@@ -1,11 +1,11 @@
-package com.zhongzheng.modules.distribution.service;
+package com.zhongzheng.modules.top.distribution.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-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 com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateGoodsAddBo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateGoodsEditBo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateGoodsQueryBo;
+import com.zhongzheng.modules.top.distribution.domain.DistributionActivityTemplateGoods;
+import com.zhongzheng.modules.top.distribution.vo.DistributionActivityTemplateGoodsVo;
 
 import java.util.Collection;
 import java.util.List;

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

@@ -1,8 +1,8 @@
-package com.zhongzheng.modules.distribution.service;
+package com.zhongzheng.modules.top.distribution.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplateImage;
+import com.zhongzheng.modules.top.distribution.domain.DistributionActivityTemplateImage;
 
 /**
  * 【请填写功能名称】Service接口

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

@@ -1,11 +1,11 @@
-package com.zhongzheng.modules.distribution.service;
+package com.zhongzheng.modules.top.distribution.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplatePosterAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplatePosterQueryBo;
-import com.zhongzheng.modules.distribution.bo.distributionActivityTemplatePosterEditBo;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplatePoster;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplatePosterVo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplatePosterAddBo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplatePosterQueryBo;
+import com.zhongzheng.modules.top.distribution.bo.distributionActivityTemplatePosterEditBo;
+import com.zhongzheng.modules.top.distribution.domain.DistributionActivityTemplatePoster;
+import com.zhongzheng.modules.top.distribution.vo.DistributionActivityTemplatePosterVo;
 
 import java.util.List;
 

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

@@ -1,12 +1,12 @@
-package com.zhongzheng.modules.distribution.service;
+package com.zhongzheng.modules.top.distribution.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-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 com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateRelationAddBo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateRelationEditBo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateRelationQueryBo;
+import com.zhongzheng.modules.top.distribution.domain.DistributionActivityTemplateRelation;
+import com.zhongzheng.modules.top.distribution.vo.DistributionActivityTemplateRelationVo;
 
 import java.util.Collection;
 import java.util.List;

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

@@ -1,13 +1,13 @@
-package com.zhongzheng.modules.distribution.service;
+package com.zhongzheng.modules.top.distribution.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-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.top.distribution.bo.DistributionActivityTemplateAddBo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateEditBo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateQueryBo;
 import com.zhongzheng.modules.distribution.bo.DistributionStatusEditBo;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityTemplate;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplateVo;
+import com.zhongzheng.modules.top.distribution.domain.DistributionActivityTemplate;
+import com.zhongzheng.modules.top.distribution.vo.DistributionActivityTemplateVo;
 
 import java.util.Collection;
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.distribution.service.impl;
+package com.zhongzheng.modules.top.distribution.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -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.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.IDistributionActivityTemplateGoodsService;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplateGoodsVo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateGoodsAddBo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateGoodsEditBo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateGoodsQueryBo;
+import com.zhongzheng.modules.top.distribution.domain.DistributionActivityTemplateGoods;
+import com.zhongzheng.modules.top.distribution.mapper.DistributionActivityTempGoodsMapper;
+import com.zhongzheng.modules.top.distribution.service.IDistributionActivityTemplateGoodsService;
+import com.zhongzheng.modules.top.distribution.vo.DistributionActivityTemplateGoodsVo;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;

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

@@ -0,0 +1,17 @@
+package com.zhongzheng.modules.top.distribution.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhongzheng.modules.top.distribution.domain.DistributionActivityTemplateImage;
+import com.zhongzheng.modules.top.distribution.mapper.DistributionActivityTemplateImageMapper;
+import com.zhongzheng.modules.top.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/DistributionActivityTemplatePosterServiceImpl.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/top/distribution/service/impl/DistributionActivityTemplatePosterServiceImpl.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.distribution.service.impl;
+package com.zhongzheng.modules.top.distribution.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
@@ -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.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.IDistributionActivityTemplatePosterService;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityTemplateService;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplatePosterVo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplatePosterAddBo;
+import com.zhongzheng.modules.top.distribution.bo.distributionActivityTemplatePosterEditBo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplatePosterQueryBo;
+import com.zhongzheng.modules.top.distribution.domain.DistributionActivityTemplate;
+import com.zhongzheng.modules.top.distribution.domain.DistributionActivityTemplatePoster;
+import com.zhongzheng.modules.top.distribution.mapper.DistributionActivityTempPosterMapper;
+import com.zhongzheng.modules.top.distribution.service.IDistributionActivityTemplatePosterService;
+import com.zhongzheng.modules.top.distribution.service.IDistributionActivityTemplateService;
+import com.zhongzheng.modules.top.distribution.vo.DistributionActivityTemplatePosterVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -45,8 +45,8 @@ public class DistributionActivityTemplatePosterServiceImpl extends ServiceImpl<D
     @Override
     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());
+        lqw.like(StrUtil.isNotBlank(bo.getName()), DistributionActivityTemplatePoster::getName, bo.getName());
+        lqw.in(bo.getStatus() != null, DistributionActivityTemplatePoster::getStatus, bo.getStatus());
         return entity2Vo(this.list(lqw));
     }
 

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

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.distribution.service.impl;
+package com.zhongzheng.modules.top.distribution.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -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.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.IDistributionActivityTemplateRelationService;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplateRelationVo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateRelationAddBo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateRelationEditBo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateRelationQueryBo;
+import com.zhongzheng.modules.top.distribution.domain.DistributionActivityTemplateRelation;
+import com.zhongzheng.modules.top.distribution.mapper.DistributionActivityTempRelationMapper;
+import com.zhongzheng.modules.top.distribution.service.IDistributionActivityTemplateRelationService;
+import com.zhongzheng.modules.top.distribution.vo.DistributionActivityTemplateRelationVo;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;

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

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.distribution.service.impl;
+package com.zhongzheng.modules.top.distribution.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
@@ -8,22 +8,38 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
+import com.zhongzheng.common.core.domain.entity.SysRole;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
-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.top.distribution.bo.DistributionActivityTemplateAddBo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateEditBo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateQueryBo;
 import com.zhongzheng.modules.distribution.bo.DistributionStatusEditBo;
 import com.zhongzheng.modules.distribution.domain.*;
-import com.zhongzheng.modules.distribution.mapper.DistributionActivityTempMapper;
+import com.zhongzheng.modules.top.distribution.mapper.DistributionActivityTempMapper;
 import com.zhongzheng.modules.distribution.service.*;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplateGoodsVo;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplateVo;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityTenantVo;
+import com.zhongzheng.modules.top.distribution.vo.DistributionActivityTemplateGoodsVo;
+import com.zhongzheng.modules.top.distribution.vo.DistributionActivityTemplateVo;
+import com.zhongzheng.modules.top.distribution.vo.DistributionActivityTenantVo;
 import com.zhongzheng.modules.goods.domain.Goods;
 import com.zhongzheng.modules.goods.service.IGoodsService;
+import com.zhongzheng.modules.inform.bo.InformSysUserAddBo;
+import com.zhongzheng.modules.inform.service.IInformRemindService;
+import com.zhongzheng.modules.inform.service.IInformSysUserService;
+import com.zhongzheng.modules.inform.vo.InformRemindVo;
 import com.zhongzheng.modules.system.domain.SysTenant;
+import com.zhongzheng.modules.system.domain.SysUserRole;
+import com.zhongzheng.modules.system.service.ISysRoleService;
 import com.zhongzheng.modules.system.service.ISysTenantService;
+import com.zhongzheng.modules.system.service.ISysUserRoleService;
+import com.zhongzheng.modules.top.distribution.domain.DistributionActivityTemplate;
+import com.zhongzheng.modules.top.distribution.domain.DistributionActivityTemplateGoods;
+import com.zhongzheng.modules.top.distribution.domain.DistributionActivityTemplatePoster;
+import com.zhongzheng.modules.top.distribution.domain.DistributionActivityTemplateRelation;
+import com.zhongzheng.modules.top.distribution.service.IDistributionActivityTemplateGoodsService;
+import com.zhongzheng.modules.top.distribution.service.IDistributionActivityTemplatePosterService;
+import com.zhongzheng.modules.top.distribution.service.IDistributionActivityTemplateRelationService;
+import com.zhongzheng.modules.top.distribution.service.IDistributionActivityTemplateService;
 import com.zhongzheng.modules.top.goods.domain.TopGoods;
 import com.zhongzheng.modules.top.goods.service.ITopGoodsService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -62,6 +78,14 @@ public class DistributionActivityTemplateServiceImpl extends ServiceImpl<Distrib
     private ITopGoodsService iTopGoodsService;
     @Autowired
     private IGoodsService iGoodsService;
+    @Autowired
+    private ISysRoleService iSysRoleService;
+    @Autowired
+    private ISysUserRoleService iSysUserRoleService;
+    @Autowired
+    private IInformSysUserService iInformSysUserService;
+    @Autowired
+    private IInformRemindService informRemindService;
 
     @Override
     public DistributionActivityTemplateVo queryById(Long id){
@@ -301,6 +325,35 @@ public class DistributionActivityTemplateServiceImpl extends ServiceImpl<Distrib
                 }
             });
             iDistributionActivityGoodsService.saveBatch(activityGoodsList);
+
+            //站内信通知业务员管理员 seller_admin
+            SysRole role = iSysRoleService.getOne(new LambdaQueryWrapper<SysRole>()
+                    .eq(SysRole::getRoleKey, "seller_admin")
+                    .eq(SysRole::getTenantId,id)
+                    .eq(SysRole::getStatus, 1).last("limit 1"));
+            if (ObjectUtils.isNotNull(role)){
+                List<SysUserRole> sysUserRoles = iSysUserRoleService.list(new LambdaQueryWrapper<SysUserRole>()
+                        .eq(SysUserRole::getRoleId, role.getRoleId())
+                        .eq(SysUserRole::getTenantId, id));
+                InformRemindVo informRemindVo = informRemindService.queryByName("课程试卷未做完7天提醒");
+                if (CollectionUtils.isNotEmpty(sysUserRoles) && ObjectUtils.isNotNull(informRemindVo)){
+                    sysUserRoles.forEach(item -> {
+                        InformSysUserAddBo informUserAddBo = new InformSysUserAddBo();
+                        informUserAddBo.setUserId(item.getUserId());
+                        informUserAddBo.setSendStatus(1);
+                        informUserAddBo.setSendTime(DateUtils.getNowTime());
+                        informUserAddBo.setCreateTime(DateUtils.getNowTime());
+                        informUserAddBo.setUpdateTime(DateUtils.getNowTime());
+                        informUserAddBo.setSystemStatus(1);
+                        informUserAddBo.setRemindId(informRemindVo.getId());
+                        informUserAddBo.setPlanId(dailyActivity.getDistributionId());
+                        informUserAddBo.setRemind("分销活动提醒");
+                        informUserAddBo.setText("有新的分销活动，请查看！");
+                        iInformSysUserService.insertByAddBo(informUserAddBo);
+                    });
+                }
+            }
+
         });
 
         return true;

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

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.distribution.vo;
+package com.zhongzheng.modules.top.distribution.vo;
 
 import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityTemplateImageVo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/top/distribution/vo/DistributionActivityTemplateImageVo.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.distribution.vo;
+package com.zhongzheng.modules.top.distribution.vo;
 
 import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;

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

@@ -1,6 +1,5 @@
-package com.zhongzheng.modules.distribution.vo;
+package com.zhongzheng.modules.top.distribution.vo;
 
-import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -22,18 +21,24 @@ public class DistributionActivityTemplatePosterVo {
 	@ApiModelProperty("活动海报模板ID")
 	private Long posterTempId;
 
+	@ApiModelProperty("海报模板名称")
+	private String name;
 	/** 海报模板地址 */
-	@Excel(name = "海报模板地址")
 	@ApiModelProperty("海报模板地址")
 	private String posterUrl;
 	/** 海报配置 */
 	@ApiModelProperty("海报配置")
 	private String posterConfig;
 	/** 状态：1有效，0无效 */
-	@Excel(name = "状态：1有效，0无效")
 	@ApiModelProperty("状态：1有效，-1无效")
 	private Integer status;
 	/** 使用状态：1启用，0关闭 */
 	@ApiModelProperty("使用状态：1启用，0关闭")
 	private Integer useStatus;
+	@ApiModelProperty("添加时间")
+	private Long createTime;
+	@ApiModelProperty("修改时间")
+	private Long updateTime;
+	@ApiModelProperty("备注")
+	private String remark;
 }

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

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.distribution.vo;
+package com.zhongzheng.modules.top.distribution.vo;
 
 import com.zhongzheng.common.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;

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

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.distribution.vo;
+package com.zhongzheng.modules.top.distribution.vo;
 
 import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityTenantVo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/top/distribution/vo/DistributionActivityTenantVo.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.distribution.vo;
+package com.zhongzheng.modules.top.distribution.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

zhongzheng-system/src/main/resources/mapper/modules/distribution/DistributionActivityTempGoodsMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.modules.distribution.mapper.DistributionActivityTempGoodsMapper">
+<mapper namespace="com.zhongzheng.modules.top.distribution.mapper.DistributionActivityTempGoodsMapper">
 
 
 

zhongzheng-system/src/main/resources/mapper/modules/distribution/DistributionActivityTempMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.modules.distribution.mapper.DistributionActivityTempMapper">
+<mapper namespace="com.zhongzheng.modules.top.distribution.mapper.DistributionActivityTempMapper">
 
 
 

zhongzheng-system/src/main/resources/mapper/modules/distribution/DistributionActivityTempPosterMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.modules.distribution.mapper.DistributionActivityTempPosterMapper">
+<mapper namespace="com.zhongzheng.modules.top.distribution.mapper.DistributionActivityTempPosterMapper">
 
 
 

zhongzheng-system/src/main/resources/mapper/modules/distribution/DistributionActivityTempRelationMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.modules.distribution.mapper.DistributionActivityTempRelationMapper">
+<mapper namespace="com.zhongzheng.modules.top.distribution.mapper.DistributionActivityTempRelationMapper">