yangdamao 2 vuotta sitten
vanhempi
commit
9a2d7c9a89
26 muutettua tiedostoa jossa 1594 lisäystä ja 3 poistoa
  1. 112 0
      zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/inform/TopInformSysUserController.java
  2. 5 3
      zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java
  3. 54 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopInformRemindAddBo.java
  4. 64 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopInformRemindEditBo.java
  5. 66 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopInformRemindQueryBo.java
  6. 36 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopInformRemindRelevanceAddBo.java
  7. 40 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopInformRemindRelevanceEditBo.java
  8. 48 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopInformRemindRelevanceQueryBo.java
  9. 72 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopInformSysUserAddBo.java
  10. 91 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopInformSysUserEditBo.java
  11. 84 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopInformSysUserQueryBo.java
  12. 53 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/domain/TopInformRemind.java
  13. 41 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/domain/TopInformRemindRelevance.java
  14. 65 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/domain/TopInformSysUser.java
  15. 14 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/mapper/TopInformRemindMapper.java
  16. 14 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/mapper/TopInformRemindRelevanceMapper.java
  17. 14 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/mapper/TopInformSysUserMapper.java
  18. 53 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/ITopInformRemindRelevanceService.java
  19. 52 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/ITopInformRemindService.java
  20. 56 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/ITopInformSysUserService.java
  21. 102 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/impl/TopInformRemindRelevanceServiceImpl.java
  22. 108 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/impl/TopInformRemindServiceImpl.java
  23. 158 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/impl/TopInformSysUserServiceImpl.java
  24. 39 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/vo/TopInformRemindRelevanceVo.java
  25. 63 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/vo/TopInformRemindVo.java
  26. 90 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/vo/TopInformSysUserVo.java

+ 112 - 0
zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/inform/TopInformSysUserController.java

@@ -0,0 +1,112 @@
+package com.zhongzheng.controller.inform;
+
+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.domain.model.TopLoginUser;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.TopTokenService;
+import com.zhongzheng.modules.top.financial.bo.TopInformSysUserAddBo;
+import com.zhongzheng.modules.top.financial.bo.TopInformSysUserEditBo;
+import com.zhongzheng.modules.top.financial.bo.TopInformSysUserQueryBo;
+import com.zhongzheng.modules.top.financial.service.ITopInformSysUserService;
+import com.zhongzheng.modules.top.financial.vo.TopInformSysUserVo;
+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.List;
+
+/**
+ * 通知绑定系统用户Controller
+ *
+ * @author hjl
+ * @date 2022-08-04
+ */
+@Api(value = "通知绑定系统用户控制器", tags = {"通知绑定系统用户管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/inform/sys_user")
+public class TopInformSysUserController extends BaseController {
+
+    private final ITopInformSysUserService iInformSysUserService;
+
+    private final TopTokenService tokenService;
+
+    /**
+     * 查询通知绑定系统用户列表
+     */
+    @ApiOperation("查询通知绑定系统用户列表")
+    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @GetMapping("/list")
+    public TableDataInfo<TopInformSysUserVo> list(TopInformSysUserQueryBo bo) {
+        TopLoginUser TopLoginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(TopLoginUser.getUser().getUserId());
+        startPage();
+        List<TopInformSysUserVo> list = iInformSysUserService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取通知绑定系统用户详细信息
+     */
+    @ApiOperation("获取通知绑定教务用户未读消息数量")
+    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    @GetMapping("/informUnReadSum")
+    public AjaxResult<Integer> informUnReadSum() {
+        TopLoginUser TopLoginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        return AjaxResult.success(iInformSysUserService.informUnReadSum(TopLoginUser.getUser().getUserId()));
+    }
+
+
+
+    /**
+     * 获取通知绑定系统用户详细信息
+     */
+    @ApiOperation("获取通知绑定系统用户详细信息")
+    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<TopInformSysUserVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iInformSysUserService.queryById(id));
+    }
+
+    /**
+     * 新增通知绑定系统用户
+     */
+    @ApiOperation("新增通知绑定系统用户")
+    @PreAuthorize("@ss.hasPermi('system:user:add')")
+    @Log(title = "通知绑定系统用户", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody TopInformSysUserAddBo bo) {
+        return toAjax(iInformSysUserService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改通知绑定系统用户
+     */
+    @ApiOperation("修改通知绑定系统用户")
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @Log(title = "通知绑定系统用户", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody TopInformSysUserEditBo bo) {
+        return toAjax(iInformSysUserService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+
+    /**
+     * 修改通知绑定系统用户
+     */
+    @ApiOperation("批量修改通知绑定系统用户状态")
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @Log(title = "批量修改通知绑定系统用户状态", businessType = BusinessType.UPDATE)
+    @PostMapping("/updateReadStatusBatch")
+    public AjaxResult<Void> updateReadStatusBatch(@RequestBody TopInformSysUserEditBo bo) {
+        return toAjax(iInformSysUserService.updateReadStatusBatch(bo) ? 1 : 0);
+    }
+
+}

+ 5 - 3
zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -414,9 +414,11 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
                     GoodsVo goodsVo1 = iGoodsService.queryById(goodsVo.getGoodsId());
                     informUserAddBo.setText("尊敬的用户:已为您开通了" + goodsVo1.getGoodsName() + "课程,本课程需完善信息方可学习,请尽快去完善资料吧。");
-                    goodsVo.setContext("尊敬的用户:已为您开通了" + goodsVo1.getGoodsName() + "课程,本课程需完善信息方可学习,请尽快去完善资料吧。");
-                    goodsVo.setGoodsName(goodsVo1.getGoodsName());
-                    voList.add(goodsVo);
+                    if (voList.stream().allMatch(x -> !x.getGoodsId().equals(goodsVo.getGoodsId()))){
+                        goodsVo.setContext("尊敬的用户:您购买的" + goodsVo1.getGoodsName() + "已经开通,请尽快去学习吧。");
+                        goodsVo.setGoodsName(goodsVo1.getGoodsName());
+                        voList.add(goodsVo);
+                    }
                     iInformUserService.insertByAddBo(informUserAddBo);
                 }
             }

+ 54 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopInformRemindAddBo.java

@@ -0,0 +1,54 @@
+package com.zhongzheng.modules.top.financial.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_inform_remind
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Data
+@ApiModel("提醒设置添加对象")
+public class TopInformRemindAddBo {
+
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Long sort;
+    /** 提醒项 */
+    @ApiModelProperty("提醒项")
+    private String remind;
+    /** 触发规则 */
+    @ApiModelProperty("触发规则")
+    private String logic;
+    /** 短信启用状态 1启用 0未启用 */
+    @ApiModelProperty("短信启用状态 1启用 0未启用")
+    private Integer noteStatus;
+    /** 站内信 1启用 0未启用 */
+    @ApiModelProperty("站内信 1启用 0未启用")
+    private Integer wayStatus;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+    /** 业务是否有关联 1是全部 2是部分关联 */
+    @ApiModelProperty("业务是否有关联 1是全部 2是部分关联")
+    private Long serviceStatus;
+    /** 公众号模板消息 1启用 0未启用 */
+    @ApiModelProperty("公众号模板消息 1启用 0未启用")
+    private Integer gzhTpStatus;
+    /** 1学员 2教务 */
+    @ApiModelProperty("1学员 2教务")
+    private Integer userType;
+    /** 类型:1,普通 2,订单初审 3,订单复审 4,审核通知 */
+    @ApiModelProperty("类型:1,普通 2,订单初审 3,订单复审 4,审核通知")
+    private Long type;
+}

+ 64 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopInformRemindEditBo.java

@@ -0,0 +1,64 @@
+package com.zhongzheng.modules.top.financial.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_inform_remind
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Data
+@ApiModel("提醒设置编辑对象")
+public class TopInformRemindEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Long sort;
+
+    /** 提醒项 */
+    @ApiModelProperty("提醒项")
+    private String remind;
+
+    /** 触发规则 */
+    @ApiModelProperty("触发规则")
+    private String logic;
+
+    /** 短信启用状态 1启用 0未启用 */
+    @ApiModelProperty("短信启用状态 1启用 0未启用")
+    private Integer noteStatus;
+
+    /** 站内信 1启用 0未启用 */
+    @ApiModelProperty("站内信 1启用 0未启用")
+    private Integer wayStatus;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+    /** 业务是否有关联 1是全部 2是部分关联 */
+    @ApiModelProperty("业务是否有关联 1是全部 2是部分关联")
+    private Long serviceStatus;
+
+    /** 公众号模板消息 1启用 0未启用 */
+    @ApiModelProperty("公众号模板消息 1启用 0未启用")
+    private Integer gzhTpStatus;
+
+    /** 1学员 2教务 */
+    @ApiModelProperty("1学员 2教务")
+    private Integer userType;
+
+    /** 类型:1,普通 2,订单初审 3,订单复审 4,审核通知 */
+    @ApiModelProperty("类型:1,普通 2,订单初审 3,订单复审 4,审核通知")
+    private Long type;
+
+}

+ 66 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopInformRemindQueryBo.java

@@ -0,0 +1,66 @@
+package com.zhongzheng.modules.top.financial.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_inform_remind
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("提醒设置分页查询对象")
+public class TopInformRemindQueryBo 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 sort;
+	/** 提醒项 */
+	@ApiModelProperty("提醒项")
+	private String remind;
+	/** 触发规则 */
+	@ApiModelProperty("触发规则")
+	private String logic;
+	/** 短信启用状态 1启用 0未启用 */
+	@ApiModelProperty("短信启用状态 1启用 0未启用")
+	private Integer noteStatus;
+	/** 站内信 1启用 0未启用 */
+	@ApiModelProperty("站内信 1启用 0未启用")
+	private Integer wayStatus;
+	/** 业务是否有关联 1是全部 2是部分关联 */
+	@ApiModelProperty("业务是否有关联 1是全部 2是部分关联")
+	private Long serviceStatus;
+	/** 公众号模板消息 1启用 0未启用 */
+	@ApiModelProperty("公众号模板消息 1启用 0未启用")
+	private Integer gzhTpStatus;
+	/** 1学员 2教务 */
+	@ApiModelProperty("1学员 2教务")
+	private Integer userType;
+	/** 类型:1,普通 2,订单初审 3,订单复审 4,审核通知 */
+	@ApiModelProperty("类型:1,普通 2,订单初审 3,订单复审 4,审核通知")
+	private Long type;
+}

+ 36 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopInformRemindRelevanceAddBo.java

@@ -0,0 +1,36 @@
+package com.zhongzheng.modules.top.financial.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_inform_remind_relevance
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Data
+@ApiModel("消息后台账号关联添加对象")
+public class TopInformRemindRelevanceAddBo {
+
+    /** 消息ID */
+    @ApiModelProperty("消息ID")
+    private Long remindId;
+    /** 关联ID(关联后台账号ID) */
+    @ApiModelProperty("关联ID(关联后台账号ID)")
+    private Long relevanceId;
+    /** 类型:1学员退学提醒,2订单审核通知 */
+    @ApiModelProperty("类型:1学员退学提醒,2订单审核通知")
+    private Integer type;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+}

+ 40 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopInformRemindRelevanceEditBo.java

@@ -0,0 +1,40 @@
+package com.zhongzheng.modules.top.financial.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_inform_remind_relevance
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Data
+@ApiModel("消息后台账号关联编辑对象")
+public class TopInformRemindRelevanceEditBo {
+
+    /** 主键 */
+    @ApiModelProperty("主键")
+    private Long id;
+
+    /** 消息ID */
+    @ApiModelProperty("消息ID")
+    private Long remindId;
+
+    /** 关联ID(关联后台账号ID) */
+    @ApiModelProperty("关联ID(关联后台账号ID)")
+    private Long relevanceId;
+
+    /** 类型:1学员退学提醒,2订单审核通知 */
+    @ApiModelProperty("类型:1学员退学提醒,2订单审核通知")
+    private Integer type;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+}

+ 48 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopInformRemindRelevanceQueryBo.java

@@ -0,0 +1,48 @@
+package com.zhongzheng.modules.top.financial.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_inform_remind_relevance
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("消息后台账号关联分页查询对象")
+public class TopInformRemindRelevanceQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 消息ID */
+	@ApiModelProperty("消息ID")
+	private Long remindId;
+	/** 关联ID(关联后台账号ID) */
+	@ApiModelProperty("关联ID(关联后台账号ID)")
+	private Long relevanceId;
+	/** 类型:1学员退学提醒,2订单审核通知 */
+	@ApiModelProperty("类型:1学员退学提醒,2订单审核通知")
+	private Integer type;
+}

+ 72 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopInformSysUserAddBo.java

@@ -0,0 +1,72 @@
+package com.zhongzheng.modules.top.financial.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_inform_sys_user
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Data
+@ApiModel("通知绑定系统用户添加对象")
+public class TopInformSysUserAddBo {
+
+    /** 系统用户id */
+    @ApiModelProperty("系统用户id")
+    private Long userId;
+    /** 发送时间 */
+    @ApiModelProperty("发送时间")
+    private Long sendTime;
+    /** 发送状态 1成功 0失败 2草稿 */
+    @ApiModelProperty("发送状态 1成功 0失败 2草稿")
+    private Integer sendStatus;
+    /** 已读回执 1已读 0未读 */
+    @ApiModelProperty("已读回执 1已读 0未读")
+    private Integer receiptStatus;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long informId;
+    /** 1系统通知 2教务通知 3短信通知 */
+    @ApiModelProperty("1系统通知 2教务通知 3短信通知")
+    private Integer systemStatus;
+    /** 绑定系统通知内容 */
+    @ApiModelProperty("绑定系统通知内容")
+    private Long remindId;
+    /** 系统通知内容 */
+    @ApiModelProperty("系统通知内容")
+    private String text;
+    /** 提醒项 */
+    @ApiModelProperty("提醒项")
+    private String remind;
+    /** 绑定商品ID */
+    @ApiModelProperty("绑定商品ID")
+    private Long goodsId;
+    /** 计划ID */
+    @ApiModelProperty("计划ID")
+    private Long planId;
+    /** 班级ID */
+    @ApiModelProperty("班级ID")
+    private Long gradeId;
+    /** 订单商品ID */
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
+    /** 状态 1有效 0无效 */
+    @ApiModelProperty("状态 1有效 0无效")
+    private Integer status;
+    /** 学员用户ID */
+    @ApiModelProperty("学员用户ID")
+    private Long studentUserId;
+}

+ 91 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopInformSysUserEditBo.java

@@ -0,0 +1,91 @@
+package com.zhongzheng.modules.top.financial.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 通知绑定系统用户编辑对象 top_inform_sys_user
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Data
+@ApiModel("通知绑定系统用户编辑对象")
+public class TopInformSysUserEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    private List<Long> ids;
+
+    /** 系统用户id */
+    @ApiModelProperty("系统用户id")
+    private Long userId;
+
+    /** 发送时间 */
+    @ApiModelProperty("发送时间")
+    private Long sendTime;
+
+    /** 发送状态 1成功 0失败 2草稿 */
+    @ApiModelProperty("发送状态 1成功 0失败 2草稿")
+    private Integer sendStatus;
+
+    /** 已读回执 1已读 0未读 */
+    @ApiModelProperty("已读回执 1已读 0未读")
+    private Integer receiptStatus;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long informId;
+
+    /** 1系统通知 2教务通知 3短信通知 */
+    @ApiModelProperty("1系统通知 2教务通知 3短信通知")
+    private Integer systemStatus;
+
+    /** 绑定系统通知内容 */
+    @ApiModelProperty("绑定系统通知内容")
+    private Long remindId;
+
+    /** 系统通知内容 */
+    @ApiModelProperty("系统通知内容")
+    private String text;
+
+    /** 提醒项 */
+    @ApiModelProperty("提醒项")
+    private String remind;
+
+    /** 绑定商品ID */
+    @ApiModelProperty("绑定商品ID")
+    private Long goodsId;
+
+    /** 计划ID */
+    @ApiModelProperty("计划ID")
+    private Long planId;
+
+    /** 班级ID */
+    @ApiModelProperty("班级ID")
+    private Long gradeId;
+
+    /** 订单商品ID */
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
+
+    /** 状态 1有效 0无效 */
+    @ApiModelProperty("状态 1有效 0无效")
+    private Integer status;
+
+    /** 学员用户ID */
+    @ApiModelProperty("学员用户ID")
+    private Long studentUserId;
+
+}

+ 84 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopInformSysUserQueryBo.java

@@ -0,0 +1,84 @@
+package com.zhongzheng.modules.top.financial.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_inform_sys_user
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("通知绑定系统用户分页查询对象")
+public class TopInformSysUserQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 系统用户id */
+	@ApiModelProperty("系统用户id")
+	private Long userId;
+	/** 发送时间 */
+	@ApiModelProperty("发送时间")
+	private Long sendTime;
+	/** 发送状态 1成功 0失败 2草稿 */
+	@ApiModelProperty("发送状态 1成功 0失败 2草稿")
+	private Integer sendStatus;
+	/** 已读回执 1已读 0未读 */
+	@ApiModelProperty("已读回执 1已读 0未读")
+	private Integer receiptStatus;
+	/** $column.columnComment */
+	@ApiModelProperty("$column.columnComment")
+	private Long informId;
+	/** 1系统通知 2教务通知 3短信通知 */
+	@ApiModelProperty("1系统通知 2教务通知 3短信通知")
+	private Integer systemStatus;
+	/** 绑定系统通知内容 */
+	@ApiModelProperty("绑定系统通知内容")
+	private Long remindId;
+	/** 系统通知内容 */
+	@ApiModelProperty("系统通知内容")
+	private String text;
+	/** 提醒项 */
+	@ApiModelProperty("提醒项")
+	private String remind;
+	/** 绑定商品ID */
+	@ApiModelProperty("绑定商品ID")
+	private Long goodsId;
+	/** 计划ID */
+	@ApiModelProperty("计划ID")
+	private Long planId;
+	/** 班级ID */
+	@ApiModelProperty("班级ID")
+	private Long gradeId;
+	/** 订单商品ID */
+	@ApiModelProperty("订单商品ID")
+	private Long orderGoodsId;
+	/** 状态 1有效 0无效 */
+	@ApiModelProperty("状态 1有效 0无效")
+	private Integer status;
+	/** 学员用户ID */
+	@ApiModelProperty("学员用户ID")
+	private Long studentUserId;
+}

+ 53 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/domain/TopInformRemind.java

@@ -0,0 +1,53 @@
+package com.zhongzheng.modules.top.financial.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 提醒设置对象 top_inform_remind
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("top_inform_remind")
+public class TopInformRemind implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 排序 */
+    private Long sort;
+    /** 提醒项 */
+    private String remind;
+    /** 触发规则 */
+    private String logic;
+    /** 短信启用状态 1启用 0未启用 */
+    private Integer noteStatus;
+    /** 站内信 1启用 0未启用 */
+    private Integer wayStatus;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 业务是否有关联 1是全部 2是部分关联 */
+    private Long serviceStatus;
+    /** 公众号模板消息 1启用 0未启用 */
+    private Integer gzhTpStatus;
+    /** 1学员 2教务 */
+    private Integer userType;
+    /** 类型:1,普通 2,订单初审 3,订单复审 4,审核通知 */
+    private Integer type;
+}

+ 41 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/domain/TopInformRemindRelevance.java

@@ -0,0 +1,41 @@
+package com.zhongzheng.modules.top.financial.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 消息后台账号关联对象 top_inform_remind_relevance
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("top_inform_remind_relevance")
+public class TopInformRemindRelevance implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** 主键 */
+    @TableId(value = "id")
+    private Long id;
+    /** 消息ID */
+    private Long remindId;
+    /** 关联ID(关联后台账号ID) */
+    private Long relevanceId;
+    /** 类型:1学员退学提醒,2订单审核通知 */
+    private Integer type;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+}

+ 65 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/domain/TopInformSysUser.java

@@ -0,0 +1,65 @@
+package com.zhongzheng.modules.top.financial.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 通知绑定系统用户对象 top_inform_sys_user
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("top_inform_sys_user")
+public class TopInformSysUser implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 系统用户id */
+    private Long userId;
+    /** 发送时间 */
+    private Long sendTime;
+    /** 发送状态 1成功 0失败 2草稿 */
+    private Integer sendStatus;
+    /** 已读回执 1已读 0未读 */
+    private Integer receiptStatus;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** $column.columnComment */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** $column.columnComment */
+    private Long informId;
+    /** 1系统通知 2教务通知 3短信通知 */
+    private Integer systemStatus;
+    /** 绑定系统通知内容 */
+    private Long remindId;
+    /** 系统通知内容 */
+    private String text;
+    /** 提醒项 */
+    private String remind;
+    /** 绑定商品ID */
+    private Long goodsId;
+    /** 计划ID */
+    private Long planId;
+    /** 班级ID */
+    private Long gradeId;
+    /** 订单商品ID */
+    private Long orderGoodsId;
+    /** 状态 1有效 0无效 */
+    private Integer status;
+    /** 学员用户ID */
+    private Long studentUserId;
+}

+ 14 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/mapper/TopInformRemindMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.top.financial.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.top.financial.domain.TopInformRemind;
+
+/**
+ * 提醒设置Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+public interface TopInformRemindMapper extends BaseMapper<TopInformRemind> {
+
+}

+ 14 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/mapper/TopInformRemindRelevanceMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.top.financial.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.top.financial.domain.TopInformRemindRelevance;
+
+/**
+ * 消息后台账号关联Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+public interface TopInformRemindRelevanceMapper extends BaseMapper<TopInformRemindRelevance> {
+
+}

+ 14 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/mapper/TopInformSysUserMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.top.financial.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.top.financial.domain.TopInformSysUser;
+
+/**
+ * 通知绑定系统用户Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+public interface TopInformSysUserMapper extends BaseMapper<TopInformSysUser> {
+
+}

+ 53 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/ITopInformRemindRelevanceService.java

@@ -0,0 +1,53 @@
+package com.zhongzheng.modules.top.financial.service;
+
+;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.top.financial.bo.TopInformRemindRelevanceAddBo;
+import com.zhongzheng.modules.top.financial.bo.TopInformRemindRelevanceEditBo;
+import com.zhongzheng.modules.top.financial.bo.TopInformRemindRelevanceQueryBo;
+import com.zhongzheng.modules.top.financial.domain.TopInformRemindRelevance;
+import com.zhongzheng.modules.top.financial.vo.TopInformRemindRelevanceVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 消息后台账号关联Service接口
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+public interface ITopInformRemindRelevanceService extends IService<TopInformRemindRelevance> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	TopInformRemindRelevanceVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<TopInformRemindRelevanceVo> queryList(TopInformRemindRelevanceQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入消息后台账号关联
+	 * @param bo 消息后台账号关联新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(TopInformRemindRelevanceAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改消息后台账号关联
+	 * @param bo 消息后台账号关联编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(TopInformRemindRelevanceEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

+ 52 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/ITopInformRemindService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.top.financial.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.top.financial.bo.TopInformRemindAddBo;
+import com.zhongzheng.modules.top.financial.bo.TopInformRemindEditBo;
+import com.zhongzheng.modules.top.financial.bo.TopInformRemindQueryBo;
+import com.zhongzheng.modules.top.financial.domain.TopInformRemind;
+import com.zhongzheng.modules.top.financial.vo.TopInformRemindVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 提醒设置Service接口
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+public interface ITopInformRemindService extends IService<TopInformRemind> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	TopInformRemindVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<TopInformRemindVo> queryList(TopInformRemindQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入提醒设置
+	 * @param bo 提醒设置新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(TopInformRemindAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改提醒设置
+	 * @param bo 提醒设置编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(TopInformRemindEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

+ 56 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/ITopInformSysUserService.java

@@ -0,0 +1,56 @@
+package com.zhongzheng.modules.top.financial.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.top.financial.bo.TopInformSysUserAddBo;
+import com.zhongzheng.modules.top.financial.bo.TopInformSysUserEditBo;
+import com.zhongzheng.modules.top.financial.bo.TopInformSysUserQueryBo;
+import com.zhongzheng.modules.top.financial.domain.TopInformSysUser;
+import com.zhongzheng.modules.top.financial.vo.TopInformSysUserVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 通知绑定系统用户Service接口
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+public interface ITopInformSysUserService extends IService<TopInformSysUser> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	TopInformSysUserVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<TopInformSysUserVo> queryList(TopInformSysUserQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入通知绑定系统用户
+	 * @param bo 通知绑定系统用户新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(TopInformSysUserAddBo bo);
+
+	Integer informUnReadSum(Long userId);
+
+	Boolean updateReadStatusBatch(TopInformSysUserEditBo bo);
+
+	/**
+	 * 根据编辑业务对象修改通知绑定系统用户
+	 * @param bo 通知绑定系统用户编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(TopInformSysUserEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

+ 102 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/impl/TopInformRemindRelevanceServiceImpl.java

@@ -0,0 +1,102 @@
+package com.zhongzheng.modules.top.financial.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.top.financial.bo.TopInformRemindRelevanceAddBo;
+import com.zhongzheng.modules.top.financial.bo.TopInformRemindRelevanceEditBo;
+import com.zhongzheng.modules.top.financial.bo.TopInformRemindRelevanceQueryBo;
+import com.zhongzheng.modules.top.financial.domain.TopInformRemindRelevance;
+import com.zhongzheng.modules.top.financial.mapper.TopInformRemindRelevanceMapper;
+import com.zhongzheng.modules.top.financial.service.ITopInformRemindRelevanceService;
+import com.zhongzheng.modules.top.financial.vo.TopInformRemindRelevanceVo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 消息后台账号关联Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Service
+public class TopInformRemindRelevanceServiceImpl extends ServiceImpl<TopInformRemindRelevanceMapper, TopInformRemindRelevance> implements ITopInformRemindRelevanceService {
+
+    @Override
+    public TopInformRemindRelevanceVo queryById(Long id){
+        TopInformRemindRelevance db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, TopInformRemindRelevanceVo.class);
+    }
+
+    @Override
+    public List<TopInformRemindRelevanceVo> queryList(TopInformRemindRelevanceQueryBo bo) {
+        LambdaQueryWrapper<TopInformRemindRelevance> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getRemindId() != null, TopInformRemindRelevance::getRemindId, bo.getRemindId());
+        lqw.eq(bo.getRelevanceId() != null, TopInformRemindRelevance::getRelevanceId, bo.getRelevanceId());
+        lqw.eq(bo.getType() != null, TopInformRemindRelevance::getType, bo.getType());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<TopInformRemindRelevanceVo> entity2Vo(Collection<TopInformRemindRelevance> collection) {
+        List<TopInformRemindRelevanceVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, TopInformRemindRelevanceVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<TopInformRemindRelevance> page = (Page<TopInformRemindRelevance>)collection;
+            Page<TopInformRemindRelevanceVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(TopInformRemindRelevanceAddBo bo) {
+        TopInformRemindRelevance add = BeanUtil.toBean(bo, TopInformRemindRelevance.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(TopInformRemindRelevanceEditBo bo) {
+        TopInformRemindRelevance update = BeanUtil.toBean(bo, TopInformRemindRelevance.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(TopInformRemindRelevance entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

+ 108 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/impl/TopInformRemindServiceImpl.java

@@ -0,0 +1,108 @@
+package com.zhongzheng.modules.top.financial.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.top.financial.bo.TopInformRemindAddBo;
+import com.zhongzheng.modules.top.financial.bo.TopInformRemindEditBo;
+import com.zhongzheng.modules.top.financial.bo.TopInformRemindQueryBo;
+import com.zhongzheng.modules.top.financial.domain.TopInformRemind;
+import com.zhongzheng.modules.top.financial.mapper.TopInformRemindMapper;
+import com.zhongzheng.modules.top.financial.service.ITopInformRemindService;
+import com.zhongzheng.modules.top.financial.vo.TopInformRemindVo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 提醒设置Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Service
+public class TopInformRemindServiceImpl extends ServiceImpl<TopInformRemindMapper, TopInformRemind> implements ITopInformRemindService {
+
+    @Override
+    public TopInformRemindVo queryById(Long id){
+        TopInformRemind db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, TopInformRemindVo.class);
+    }
+
+    @Override
+    public List<TopInformRemindVo> queryList(TopInformRemindQueryBo bo) {
+        LambdaQueryWrapper<TopInformRemind> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getSort() != null, TopInformRemind::getSort, bo.getSort());
+        lqw.eq(StrUtil.isNotBlank(bo.getRemind()), TopInformRemind::getRemind, bo.getRemind());
+        lqw.eq(StrUtil.isNotBlank(bo.getLogic()), TopInformRemind::getLogic, bo.getLogic());
+        lqw.eq(bo.getNoteStatus() != null, TopInformRemind::getNoteStatus, bo.getNoteStatus());
+        lqw.eq(bo.getWayStatus() != null, TopInformRemind::getWayStatus, bo.getWayStatus());
+        lqw.eq(bo.getServiceStatus() != null, TopInformRemind::getServiceStatus, bo.getServiceStatus());
+        lqw.eq(bo.getGzhTpStatus() != null, TopInformRemind::getGzhTpStatus, bo.getGzhTpStatus());
+        lqw.eq(bo.getUserType() != null, TopInformRemind::getUserType, bo.getUserType());
+        lqw.eq(bo.getType() != null, TopInformRemind::getType, bo.getType());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<TopInformRemindVo> entity2Vo(Collection<TopInformRemind> collection) {
+        List<TopInformRemindVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, TopInformRemindVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<TopInformRemind> page = (Page<TopInformRemind>)collection;
+            Page<TopInformRemindVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(TopInformRemindAddBo bo) {
+        TopInformRemind add = BeanUtil.toBean(bo, TopInformRemind.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(TopInformRemindEditBo bo) {
+        TopInformRemind update = BeanUtil.toBean(bo, TopInformRemind.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(TopInformRemind entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

+ 158 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/impl/TopInformSysUserServiceImpl.java

@@ -0,0 +1,158 @@
+package com.zhongzheng.modules.top.financial.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.top.financial.bo.TopInformSysUserAddBo;
+import com.zhongzheng.modules.top.financial.bo.TopInformSysUserEditBo;
+import com.zhongzheng.modules.top.financial.bo.TopInformSysUserQueryBo;
+import com.zhongzheng.modules.top.financial.domain.TopInformRemind;
+import com.zhongzheng.modules.top.financial.domain.TopInformSysUser;
+import com.zhongzheng.modules.top.financial.mapper.TopInformSysUserMapper;
+import com.zhongzheng.modules.top.financial.service.ITopInformRemindService;
+import com.zhongzheng.modules.top.financial.service.ITopInformSysUserService;
+import com.zhongzheng.modules.top.financial.vo.TopInformSysUserVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 通知绑定系统用户Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-05-29
+ */
+@Service
+public class TopInformSysUserServiceImpl extends ServiceImpl<TopInformSysUserMapper, TopInformSysUser> implements ITopInformSysUserService {
+    
+    @Autowired
+    private ITopInformRemindService iInformRemindService;
+
+    @Override
+    public TopInformSysUserVo queryById(Long id){
+        TopInformSysUser db = this.baseMapper.selectById(id);
+        TopInformSysUserVo vo = BeanUtil.toBean(db, TopInformSysUserVo.class);
+        if (ObjectUtils.isNotNull(vo.getRemindId())){
+            TopInformRemind informRemind = iInformRemindService.getById(vo.getRemindId());
+            vo.setType(informRemind.getType());
+        }else {
+            vo.setType(1);
+        }
+        return vo;
+    }
+
+    @Override
+    public List<TopInformSysUserVo> queryList(TopInformSysUserQueryBo bo) {
+        LambdaQueryWrapper<TopInformSysUser> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getUserId() != null, TopInformSysUser::getUserId, bo.getUserId());
+        lqw.eq(bo.getSendTime() != null, TopInformSysUser::getSendTime, bo.getSendTime());
+        lqw.eq(bo.getSendStatus() != null, TopInformSysUser::getSendStatus, bo.getSendStatus());
+        lqw.eq(bo.getReceiptStatus() != null, TopInformSysUser::getReceiptStatus, bo.getReceiptStatus());
+        lqw.eq(bo.getInformId() != null, TopInformSysUser::getInformId, bo.getInformId());
+        lqw.eq(bo.getSystemStatus() != null, TopInformSysUser::getSystemStatus, bo.getSystemStatus());
+        lqw.eq(bo.getRemindId() != null, TopInformSysUser::getRemindId, bo.getRemindId());
+        lqw.eq(StrUtil.isNotBlank(bo.getText()), TopInformSysUser::getText, bo.getText());
+        lqw.eq(StrUtil.isNotBlank(bo.getRemind()), TopInformSysUser::getRemind, bo.getRemind());
+        lqw.eq(bo.getGoodsId() != null, TopInformSysUser::getGoodsId, bo.getGoodsId());
+        lqw.eq(bo.getPlanId() != null, TopInformSysUser::getPlanId, bo.getPlanId());
+        lqw.eq(bo.getGradeId() != null, TopInformSysUser::getGradeId, bo.getGradeId());
+        lqw.eq(bo.getOrderGoodsId() != null, TopInformSysUser::getOrderGoodsId, bo.getOrderGoodsId());
+        lqw.eq(bo.getStatus() != null, TopInformSysUser::getStatus, bo.getStatus());
+        List<TopInformSysUserVo> informSysUserVos = entity2Vo(this.list(lqw));
+        if (CollectionUtils.isEmpty(informSysUserVos)){
+            return new ArrayList<>();
+        }
+        informSysUserVos.forEach(item -> {
+            if (ObjectUtils.isNotNull(item.getRemindId())){
+                TopInformRemind informRemind = iInformRemindService.getById(item.getRemindId());
+                item.setType(informRemind.getType());
+            }else {
+                item.setType(1);
+            }
+        });
+        return informSysUserVos;
+    }
+
+    /**
+     * 实体类转化成视图对象
+     *
+     * @param collection 实体类集合
+     * @return
+     */
+    private List<TopInformSysUserVo> entity2Vo(Collection<TopInformSysUser> collection) {
+        List<TopInformSysUserVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, TopInformSysUserVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<TopInformSysUser> page = (Page<TopInformSysUser>)collection;
+            Page<TopInformSysUserVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(TopInformSysUserAddBo bo) {
+        TopInformSysUser add = BeanUtil.toBean(bo, TopInformSysUser.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Integer informUnReadSum(Long userId) {
+        return count(new LambdaQueryWrapper<TopInformSysUser>()
+                .eq(TopInformSysUser::getUserId,userId).eq(TopInformSysUser::getReceiptStatus,0).eq(TopInformSysUser::getSystemStatus,1)
+                .eq(TopInformSysUser::getStatus,1));
+    }
+
+    @Override
+    public Boolean updateReadStatusBatch(TopInformSysUserEditBo bo) {
+        boolean result = false;
+        for(Long id : bo.getIds()){
+            TopInformSysUserEditBo editBo = new TopInformSysUserEditBo();
+            editBo.setId(id);
+            editBo.setReceiptStatus(bo.getReceiptStatus());
+            result = updateByEditBo(editBo);
+        }
+        return result;
+    }
+
+    @Override
+    public Boolean updateByEditBo(TopInformSysUserEditBo bo) {
+        TopInformSysUser update = BeanUtil.toBean(bo, TopInformSysUser.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(TopInformSysUser entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

+ 39 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/vo/TopInformRemindRelevanceVo.java

@@ -0,0 +1,39 @@
+package com.zhongzheng.modules.top.financial.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-05-29
+ */
+@Data
+@ApiModel("消息后台账号关联视图对象")
+public class TopInformRemindRelevanceVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 主键 */
+	@ApiModelProperty("主键")
+	private Long id;
+
+	/** 消息ID */
+	@Excel(name = "消息ID")
+	@ApiModelProperty("消息ID")
+	private Long remindId;
+	/** 关联ID(关联后台账号ID) */
+	@Excel(name = "关联ID" , readConverterExp = "关=联后台账号ID")
+	@ApiModelProperty("关联ID(关联后台账号ID)")
+	private Long relevanceId;
+	/** 类型:1学员退学提醒,2订单审核通知 */
+	@Excel(name = "类型:1学员退学提醒,2订单审核通知")
+	@ApiModelProperty("类型:1学员退学提醒,2订单审核通知")
+	private Integer type;
+}

+ 63 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/vo/TopInformRemindVo.java

@@ -0,0 +1,63 @@
+package com.zhongzheng.modules.top.financial.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-05-29
+ */
+@Data
+@ApiModel("提醒设置视图对象")
+public class TopInformRemindVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 排序 */
+	@Excel(name = "排序")
+	@ApiModelProperty("排序")
+	private Long sort;
+	/** 提醒项 */
+	@Excel(name = "提醒项")
+	@ApiModelProperty("提醒项")
+	private String remind;
+	/** 触发规则 */
+	@Excel(name = "触发规则")
+	@ApiModelProperty("触发规则")
+	private String logic;
+	/** 短信启用状态 1启用 0未启用 */
+	@Excel(name = "短信启用状态 1启用 0未启用")
+	@ApiModelProperty("短信启用状态 1启用 0未启用")
+	private Integer noteStatus;
+	/** 站内信 1启用 0未启用 */
+	@Excel(name = "站内信 1启用 0未启用")
+	@ApiModelProperty("站内信 1启用 0未启用")
+	private Integer wayStatus;
+	/** 业务是否有关联 1是全部 2是部分关联 */
+	@Excel(name = "业务是否有关联 1是全部 2是部分关联")
+	@ApiModelProperty("业务是否有关联 1是全部 2是部分关联")
+	private Long serviceStatus;
+	/** 公众号模板消息 1启用 0未启用 */
+	@Excel(name = "公众号模板消息 1启用 0未启用")
+	@ApiModelProperty("公众号模板消息 1启用 0未启用")
+	private Integer gzhTpStatus;
+	/** 1学员 2教务 */
+	@Excel(name = "1学员 2教务")
+	@ApiModelProperty("1学员 2教务")
+	private Integer userType;
+	/** 类型:1,普通 2,订单初审 3,订单复审 4,审核通知 */
+	@Excel(name = "类型:1,普通 2,订单初审 3,订单复审 4,审核通知")
+	@ApiModelProperty("类型:1,普通 2,订单初审 3,订单复审 4,审核通知")
+	private Long type;
+}

+ 90 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/vo/TopInformSysUserVo.java

@@ -0,0 +1,90 @@
+package com.zhongzheng.modules.top.financial.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-05-29
+ */
+@Data
+@ApiModel("通知绑定系统用户视图对象")
+public class TopInformSysUserVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 系统用户id */
+	@Excel(name = "系统用户id")
+	@ApiModelProperty("系统用户id")
+	private Long userId;
+	/** 发送时间 */
+	@Excel(name = "发送时间")
+	@ApiModelProperty("发送时间")
+	private Long sendTime;
+	/** 发送状态 1成功 0失败 2草稿 */
+	@Excel(name = "发送状态 1成功 0失败 2草稿")
+	@ApiModelProperty("发送状态 1成功 0失败 2草稿")
+	private Integer sendStatus;
+	/** 已读回执 1已读 0未读 */
+	@Excel(name = "已读回执 1已读 0未读")
+	@ApiModelProperty("已读回执 1已读 0未读")
+	private Integer receiptStatus;
+	/** $column.columnComment */
+	@Excel(name = "已读回执 1已读 0未读")
+	@ApiModelProperty("$column.columnComment")
+	private Long informId;
+	/** 1系统通知 2教务通知 3短信通知 */
+	@Excel(name = "1系统通知 2教务通知 3短信通知")
+	@ApiModelProperty("1系统通知 2教务通知 3短信通知")
+	private Integer systemStatus;
+	/** 绑定系统通知内容 */
+	@Excel(name = "绑定系统通知内容")
+	@ApiModelProperty("绑定系统通知内容")
+	private Long remindId;
+	/** 系统通知内容 */
+	@Excel(name = "系统通知内容")
+	@ApiModelProperty("系统通知内容")
+	private String text;
+	/** 提醒项 */
+	@Excel(name = "提醒项")
+	@ApiModelProperty("提醒项")
+	private String remind;
+	/** 绑定商品ID */
+	@Excel(name = "绑定商品ID")
+	@ApiModelProperty("绑定商品ID")
+	private Long goodsId;
+	/** 计划ID */
+	@Excel(name = "计划ID")
+	@ApiModelProperty("计划ID")
+	private Long planId;
+	/** 班级ID */
+	@Excel(name = "班级ID")
+	@ApiModelProperty("班级ID")
+	private Long gradeId;
+	/** 订单商品ID */
+	@Excel(name = "订单商品ID")
+	@ApiModelProperty("订单商品ID")
+	private Long orderGoodsId;
+	/** 状态 1有效 0无效 */
+	@Excel(name = "状态 1有效 0无效")
+	@ApiModelProperty("状态 1有效 0无效")
+	private Integer status;
+	/** 学员用户ID */
+	@Excel(name = "学员用户ID")
+	@ApiModelProperty("学员用户ID")
+	private Long studentUserId;
+
+	@ApiModelProperty("/** 类型:1,普通 2,订单初审 3,订单复审 4,审核通知 */")
+	private Integer type;
+}