fix 消息通知

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformUserAddBo.java

@@ -64,5 +64,7 @@ public class InformUserAddBo {
     /** 班级ID */
     @ApiModelProperty("班级ID")
     private Long gradeId;
-
+    /** 订单商品ID */
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformUserEditBo.java

@@ -70,6 +70,8 @@ public class InformUserEditBo {
     /** 班级ID */
     @ApiModelProperty("班级ID")
     private Long gradeId;
-
+    /** 订单商品ID */
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformUserQueryBo.java

@@ -23,68 +23,107 @@ import com.zhongzheng.common.core.domain.BaseEntity;
 @ApiModel("通知绑定学员分页查询对象")
 public class InformUserQueryBo 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失败 */
-	@ApiModelProperty("发送状态 1成功 0失败")
-	private Integer sendStatus;
-	/** 已读回执 1已读 0未读 */
-	@ApiModelProperty("已读回执 1已读 0未读")
-	private Integer receiptStatus;
-
-	/** 已读回执 1已读 0未读 */
-	@ApiModelProperty("身份证姓名班级")
-	private String receiptName;
-
-	/** $column.columnComment */
-	@ApiModelProperty("$column.columnComment")
-	private Long informId;
-
-
-	/** 1系统通知 2教务通知 */
-	@ApiModelProperty("1系统通知 2教务通知")
-	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;
-
-	private List<Integer> systemStatusList;
+    /**
+     * 分页大小
+     */
+    @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失败
+     */
+    @ApiModelProperty("发送状态 1成功 0失败")
+    private Integer sendStatus;
+    /**
+     * 已读回执 1已读 0未读
+     */
+    @ApiModelProperty("已读回执 1已读 0未读")
+    private Integer receiptStatus;
+
+    /**
+     * 已读回执 1已读 0未读
+     */
+    @ApiModelProperty("身份证姓名班级")
+    private String receiptName;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("$column.columnComment")
+    private Long informId;
+
+
+    /**
+     * 1系统通知 2教务通知
+     */
+    @ApiModelProperty("1系统通知 2教务通知")
+    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;
+
+    private List<Integer> systemStatusList;
+    /**
+     * 订单商品ID
+     */
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/domain/InformUser.java

@@ -4,9 +4,11 @@ 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;
 
 /**
@@ -21,44 +23,78 @@ import com.zhongzheng.common.annotation.Excel;
 @TableName("inform_user")
 public class InformUser implements Serializable {
 
-private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @TableId(value = "id")
     private Long id;
-    /** 用户id */
+    /**
+     * 用户id
+     */
     private Long userId;
-    /** 发送时间 */
+    /**
+     * 发送时间
+     */
     private Long sendTime;
-    /** 发送状态 1成功 0失败 */
+    /**
+     * 发送状态 1成功 0失败
+     */
     private Integer sendStatus;
-    /** 已读回执 1已读 0未读 */
+    /**
+     * 已读回执 1已读 0未读
+     */
     private Integer receiptStatus;
-    /** 创建时间 */
+    /**
+     * 创建时间
+     */
     @TableField(fill = FieldFill.INSERT)
     private Long createTime;
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     private Long informId;
 
-    /** 绑定系统通知内容 */
+    /**
+     * 绑定系统通知内容
+     */
     private Long remindId;
-    /** 1系统通知 2教务通知 */
+    /**
+     * 1系统通知 2教务通知
+     */
     private Integer systemStatus;
 
-    /** 提醒项 */
+    /**
+     * 提醒项
+     */
     private String remind;
 
-    /** 系统通知内容 */
+    /**
+     * 系统通知内容
+     */
     private String text;
 
-    /** 绑定商品ID */
+    /**
+     * 绑定商品ID
+     */
     private Long goodsId;
 
-    /** 计划ID */
+    /**
+     * 计划ID
+     */
     private Long planId;
-    /** 班级ID */
+    /**
+     * 班级ID
+     */
     private Long gradeId;
+    /**
+     * 订单商品ID
+     */
+    private Long orderGoodsId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/vo/InformUserVo.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.util.Date;
 import java.util.List;
 
@@ -18,80 +19,109 @@ import java.util.List;
 @Data
 @ApiModel("通知绑定学员视图对象")
 public class InformUserVo {
-	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失败 */
-	@Excel(name = "发送状态 1成功 0失败")
-	@ApiModelProperty("发送状态 1成功 0失败")
-	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;
-
-	@Excel(name = "学员姓名")
-	@ApiModelProperty("学员姓名")
-	private String realName;
-
-	@Excel(name = "电话")
-	@ApiModelProperty("电话")
-	private String telPhone;
-
-	@Excel(name = "商品ID")
-	@ApiModelProperty("商品ID")
-	private Long goodsId;
-
-	@Excel(name = "身份证")
-	@ApiModelProperty("身份证")
-	private String idCard;
-
-	@Excel(name = "通知绑定")
-	@ApiModelProperty("通知绑定")
-	private InformVo informVo;
-
-	/** 1系统通知 2教务通知 */
-	@Excel(name = "1系统通知 2教务通知")
-	@ApiModelProperty("1系统通知 2教务通知")
-	private Integer systemStatus;
-	/** 绑定系统通知内容 */
-	@Excel(name = "绑定系统通知内容")
-	@ApiModelProperty("绑定系统通知内容")
-	private Long remindId;
-
-	/** 系统通知内容 */
-	@ApiModelProperty("系统通知内容")
-	private String text;
-
-	/** 提醒项 */
-	@ApiModelProperty("提醒项")
-	private String remind;
-
-	@Excel(name = "班级名称")
-	@ApiModelProperty("班级名称")
-	private List<String> className;
-
-	/** 计划ID */
-	@ApiModelProperty("计划ID")
-	private Long planId;
-	/** 班级ID */
-	@ApiModelProperty("班级ID")
-	private Long gradeId;
-
+    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失败
+     */
+    @Excel(name = "发送状态 1成功 0失败")
+    @ApiModelProperty("发送状态 1成功 0失败")
+    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;
+
+    @Excel(name = "学员姓名")
+    @ApiModelProperty("学员姓名")
+    private String realName;
+
+    @Excel(name = "电话")
+    @ApiModelProperty("电话")
+    private String telPhone;
+
+    @Excel(name = "商品ID")
+    @ApiModelProperty("商品ID")
+    private Long goodsId;
+
+    @Excel(name = "身份证")
+    @ApiModelProperty("身份证")
+    private String idCard;
+
+    @Excel(name = "通知绑定")
+    @ApiModelProperty("通知绑定")
+    private InformVo informVo;
+
+    /**
+     * 1系统通知 2教务通知
+     */
+    @Excel(name = "1系统通知 2教务通知")
+    @ApiModelProperty("1系统通知 2教务通知")
+    private Integer systemStatus;
+    /**
+     * 绑定系统通知内容
+     */
+    @Excel(name = "绑定系统通知内容")
+    @ApiModelProperty("绑定系统通知内容")
+    private Long remindId;
+
+    /**
+     * 系统通知内容
+     */
+    @ApiModelProperty("系统通知内容")
+    private String text;
+
+    /**
+     * 提醒项
+     */
+    @ApiModelProperty("提醒项")
+    private String remind;
+
+    @Excel(name = "班级名称")
+    @ApiModelProperty("班级名称")
+    private List<String> className;
+
+    /**
+     * 计划ID
+     */
+    @ApiModelProperty("计划ID")
+    private Long planId;
+    /**
+     * 班级ID
+     */
+    @ApiModelProperty("班级ID")
+    private Long gradeId;
+    /**
+     * 订单商品ID
+     */
+    @Excel(name = "订单商品ID")
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
 
 }

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

@@ -204,6 +204,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     informUserAddBo.setRemind("商品开通提醒");
                     informUserAddBo.setGoodsId(goodsVo.getGoodsId());
                     informUserAddBo.setGradeId(goodsVo.getGradeId());
+                    informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
                     GoodsVo goodsVo1 = iGoodsService.queryById(goodsVo.getGoodsId());
                     informUserAddBo.setText("尊敬的用户：您购买的" + goodsVo1.getGoodsName() + "已经开通，请尽快去学习吧。");
                     iInformUserService.insertByAddBo(informUserAddBo);
@@ -220,6 +221,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     informUserAddBo.setRemind("完善报名资料通知");
                     informUserAddBo.setGoodsId(goodsVo.getGoodsId());
                     informUserAddBo.setGradeId(goodsVo.getGradeId());
+                    informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
                     GoodsVo goodsVo1 = iGoodsService.queryById(goodsVo.getGoodsId());
                     informUserAddBo.setText("尊敬的用户：已为您开通了" + goodsVo1.getGoodsName() + "课程，本课程需完善信息方可学习，请尽快去完善资料吧");
                     iInformUserService.insertByAddBo(informUserAddBo);
@@ -242,6 +244,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     informUserAddBo.setRemindId(1L);
                     informUserAddBo.setSystemStatus(3);
                     informUserAddBo.setRemind("商品开通提醒");
+                    informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
                     informUserAddBo.setGoodsId(goodsVo.getGoodsId());
                     GoodsVo goodsVo1 = iGoodsService.queryById(goodsVo.getGoodsId());
                     informUserAddBo.setText("尊敬的用户：您购买的" + goodsVo1.getGoodsName() + "已经开通，请尽快去学习吧。");
@@ -266,6 +269,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     informUserAddBo.setSystemStatus(3);
                     informUserAddBo.setRemind("完善报名资料通知");
                     informUserAddBo.setGoodsId(goodsVo.getGoodsId());
+                    informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
                     GoodsVo goodsVo1 = iGoodsService.queryById(goodsVo.getGoodsId());
                     informUserAddBo.setText("尊敬的用户：已为您开通了" + goodsVo1.getGoodsName() + "课程，本课程需完善信息方可学习，请尽快去完善资料吧");
                     UserVo userVo = iUserService.queryById(goodsVo.getUserId());

zhongzheng-system/src/main/resources/mapper/modules/inform/InformUserMapper.xml

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="receiptStatus" column="receipt_status"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
+        <result property="orderGoodsId" column="order_goods_id"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.inform.vo.InformUserVo" id="InformUserVo">
@@ -23,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="realName" column="realname"/>
         <result property="idCard" column="id_card"/>
         <result property="telPhone" column="telphone"/>
+        <result property="orderGoodsId" column="order_goods_id"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.exam.vo.ExamUserApplyVo" id="ExamUserApplyVo">