fix 教务推送

zhongzheng-api/src/main/java/com/zhongzheng/controller/data/DataWxTpClickController.java

@@ -0,0 +1,58 @@
+package com.zhongzheng.controller.data;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.data.bo.DataWxTpClickAddBo;
+import com.zhongzheng.modules.data.bo.DataWxTpClickQueryBo;
+import com.zhongzheng.modules.data.service.IDataWxTpClickService;
+import com.zhongzheng.modules.data.vo.DataWxTpClickVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 微信模板消息点击数据Controller
+ *
+ * @author hjl
+ * @date 2022-08-09
+ */
+@Api(value = "微信模板消息点击数据控制器", tags = {"微信模板消息点击数据管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/data/click")
+public class DataWxTpClickController extends BaseController {
+
+    private final IDataWxTpClickService iDataWxTpClickService;
+
+
+    /**
+     * 新增微信模板消息点击数据
+     */
+    @ApiOperation("新增微信模板消息点击数据")
+    @PreAuthorize("@ss.hasPermi('system:click:add')")
+    @Log(title = "微信模板消息点击数据", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody DataWxTpClickAddBo bo) {
+        return toAjax(iDataWxTpClickService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/data/bo/DataWxTpClickAddBo.java

@@ -0,0 +1,33 @@
+package com.zhongzheng.modules.data.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 微信模板消息点击数据添加对象 data_wx_tp_click
+ *
+ * @author hjl
+ * @date 2022-08-09
+ */
+@Data
+@ApiModel("微信模板消息点击数据添加对象")
+public class DataWxTpClickAddBo {
+
+    /** 消息ID */
+    @ApiModelProperty("消息ID")
+    private Long informId;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+    /** 状态 1有效 0无效 */
+    @ApiModelProperty("状态 1有效 0无效")
+    private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/data/bo/DataWxTpClickEditBo.java

@@ -0,0 +1,37 @@
+package com.zhongzheng.modules.data.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 微信模板消息点击数据编辑对象 data_wx_tp_click
+ *
+ * @author hjl
+ * @date 2022-08-09
+ */
+@Data
+@ApiModel("微信模板消息点击数据编辑对象")
+public class DataWxTpClickEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 消息ID */
+    @ApiModelProperty("消息ID")
+    private Long informId;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+
+
+    /** 状态 1有效 0无效 */
+    @ApiModelProperty("状态 1有效 0无效")
+    private Integer status;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/data/bo/DataWxTpClickQueryBo.java

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.data.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;
+
+/**
+ * 微信模板消息点击数据分页查询对象 data_wx_tp_click
+ *
+ * @author hjl
+ * @date 2022-08-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("微信模板消息点击数据分页查询对象")
+public class DataWxTpClickQueryBo 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 informId;
+	/** 状态 1有效 0无效 */
+	@ApiModelProperty("状态 1有效 0无效")
+	private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/data/domain/DataWxTpClick.java

@@ -0,0 +1,39 @@
+package com.zhongzheng.modules.data.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;
+
+/**
+ * 微信模板消息点击数据对象 data_wx_tp_click
+ *
+ * @author hjl
+ * @date 2022-08-09
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("data_wx_tp_click")
+public class DataWxTpClick implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 消息ID */
+    private Long informId;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** $column.columnComment */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 状态 1有效 0无效 */
+    private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/data/mapper/DataWxTpClickMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.data.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.data.domain.DataWxTpClick;
+
+/**
+ * 微信模板消息点击数据Mapper接口
+ *
+ * @author hjl
+ * @date 2022-08-09
+ */
+public interface DataWxTpClickMapper extends BaseMapper<DataWxTpClick> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/data/service/IDataWxTpClickService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.data.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.data.bo.DataWxTpClickAddBo;
+import com.zhongzheng.modules.data.bo.DataWxTpClickEditBo;
+import com.zhongzheng.modules.data.bo.DataWxTpClickQueryBo;
+import com.zhongzheng.modules.data.domain.DataWxTpClick;
+import com.zhongzheng.modules.data.vo.DataWxTpClickVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 微信模板消息点击数据Service接口
+ *
+ * @author hjl
+ * @date 2022-08-09
+ */
+public interface IDataWxTpClickService extends IService<DataWxTpClick> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	DataWxTpClickVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<DataWxTpClickVo> queryList(DataWxTpClickQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入微信模板消息点击数据
+	 * @param bo 微信模板消息点击数据新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(DataWxTpClickAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改微信模板消息点击数据
+	 * @param bo 微信模板消息点击数据编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(DataWxTpClickEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -0,0 +1,100 @@
+package com.zhongzheng.modules.data.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.data.bo.DataWxTpClickAddBo;
+import com.zhongzheng.modules.data.bo.DataWxTpClickEditBo;
+import com.zhongzheng.modules.data.bo.DataWxTpClickQueryBo;
+import com.zhongzheng.modules.data.domain.DataWxTpClick;
+import com.zhongzheng.modules.data.mapper.DataWxTpClickMapper;
+import com.zhongzheng.modules.data.service.IDataWxTpClickService;
+import com.zhongzheng.modules.data.vo.DataWxTpClickVo;
+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 hjl
+ * @date 2022-08-09
+ */
+@Service
+public class DataWxTpClickServiceImpl extends ServiceImpl<DataWxTpClickMapper, DataWxTpClick> implements IDataWxTpClickService {
+
+    @Override
+    public DataWxTpClickVo queryById(Long id){
+        DataWxTpClick db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, DataWxTpClickVo.class);
+    }
+
+    @Override
+    public List<DataWxTpClickVo> queryList(DataWxTpClickQueryBo bo) {
+        LambdaQueryWrapper<DataWxTpClick> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getInformId() != null, DataWxTpClick::getInformId, bo.getInformId());
+        lqw.eq(bo.getStatus() != null, DataWxTpClick::getStatus, bo.getStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<DataWxTpClickVo> entity2Vo(Collection<DataWxTpClick> collection) {
+        List<DataWxTpClickVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, DataWxTpClickVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<DataWxTpClick> page = (Page<DataWxTpClick>)collection;
+            Page<DataWxTpClickVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(DataWxTpClickAddBo bo) {
+        DataWxTpClick add = BeanUtil.toBean(bo, DataWxTpClick.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(DataWxTpClickEditBo bo) {
+        DataWxTpClick update = BeanUtil.toBean(bo, DataWxTpClick.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(DataWxTpClick entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/data/vo/DataWxTpClickVo.java

@@ -0,0 +1,35 @@
+package com.zhongzheng.modules.data.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 hjl
+ * @date 2022-08-09
+ */
+@Data
+@ApiModel("微信模板消息点击数据视图对象")
+public class DataWxTpClickVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 消息ID */
+	@Excel(name = "消息ID")
+	@ApiModelProperty("消息ID")
+	private Long informId;
+	/** 状态 1有效 0无效 */
+	@Excel(name = "状态 1有效 0无效")
+	@ApiModelProperty("状态 1有效 0无效")
+	private Integer status;
+}

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

@@ -66,4 +66,7 @@ public class InformSysUserAddBo {
     /** 状态 1有效 0无效 */
     @ApiModelProperty("状态 1有效 0无效")
     private Integer status;
+    /** 学员用户ID */
+    @ApiModelProperty("学员用户ID")
+    private Long studentUserId;
 }

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

@@ -84,4 +84,8 @@ public class InformSysUserEditBo {
     private Integer status;
 
     private List<Long> ids;
+
+    /** 学员用户ID */
+    @ApiModelProperty("学员用户ID")
+    private Long studentUserId;
 }

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

@@ -78,4 +78,7 @@ public class InformSysUserQueryBo extends BaseEntity {
 	/** 状态 1有效 0无效 */
 	@ApiModelProperty("状态 1有效 0无效")
 	private Integer status;
+	/** 学员用户ID */
+	@ApiModelProperty("学员用户ID")
+	private Long studentUserId;
 }

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

@@ -60,4 +60,6 @@ private static final long serialVersionUID=1L;
     private Long orderGoodsId;
     /** 状态 1有效 0无效 */
     private Integer status;
+    /** 学员用户ID */
+    private Long studentUserId;
 }

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

@@ -36,7 +36,7 @@ public interface IInformUserService extends IService<InformUser> {
 	 * @param bo 通知绑定学员新增业务对象
 	 * @return
 	 */
-	Boolean insertByAddBo(InformUserAddBo bo);
+	Long insertByAddBo(InformUserAddBo bo);
 
 	/**
 	 * 根据编辑业务对象修改通知绑定学员

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

@@ -129,12 +129,13 @@ public class InformUserServiceImpl extends ServiceImpl<InformUserMapper, InformU
     }
 
     @Override
-    public Boolean insertByAddBo(InformUserAddBo bo) {
+    public Long insertByAddBo(InformUserAddBo bo) {
         InformUser add = BeanUtil.toBean(bo, InformUser.class);
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
+        this.save(add);
+        return add.getId();
     }
 
     @Override

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

@@ -80,4 +80,8 @@ public class InformSysUserVo {
 	@Excel(name = "状态 1有效 0无效")
 	@ApiModelProperty("状态 1有效 0无效")
 	private Integer status;
+	/** 学员用户ID */
+	@Excel(name = "学员用户ID")
+	@ApiModelProperty("学员用户ID")
+	private Long studentUserId;
 }

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

@@ -1640,13 +1640,13 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     informUserAddBo.setRemind("您新开通的课程已有2天，尽快去学习吧");
                     informUserAddBo.setGoodsId(goodsVo.getGoodsId());
                     informUserAddBo.setText("您开通《"+goods.getGoodsName()+"》课程已有2天，但未开始学习，请尽快去学习吧。");
-                    iInformUserService.insertByAddBo(informUserAddBo);
+                    Long informId = iInformUserService.insertByAddBo(informUserAddBo);
                     if(Validator.isNotEmpty(userVo.getOpenId())){
                         Map<String,String> paramMap = new HashMap<>();
                         paramMap.put("first","您新开通的课程已超过2天没有学习，请合理安排学习时间！");
                         paramMap.put("keyword1",goods.getGoodsName());
                         paramMap.put("keyword2","未开始学习");
-                        paramMap.put("pagepath","pages2/wd/course?id="+goodsVo.getGoodsId()+"&gid="+goodsVo.getGradeId()+"&orderGoodsId="+goodsVo.getOrderGoodsId());
+                        paramMap.put("pagepath","pages2/wd/course?id="+goodsVo.getGoodsId()+"&gid="+goodsVo.getGradeId()+"&orderGoodsId="+goodsVo.getOrderGoodsId()+"&informId="+informId);
                         iWxLoginService.sendSmallTpMsg(userVo.getOpenId(),paramMap);
                     }
                 }
@@ -1724,13 +1724,13 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     informUserAddBo.setRemind("您新开通的课程已有5天，尽快去学习吧");
                     informUserAddBo.setGoodsId(goodsVo.getGoodsId());
                     informUserAddBo.setText("您开通《"+goods.getGoodsName()+"》课程已有5天，但未开始学习，请尽快去学习吧。");
-                    iInformUserService.insertByAddBo(informUserAddBo);
+                    Long informId = iInformUserService.insertByAddBo(informUserAddBo);
                     if(Validator.isNotEmpty(userVo.getOpenId())){
                         Map<String,String> paramMap = new HashMap<>();
                         paramMap.put("first","您新开通的课程已超过5天没有学习，请合理安排学习时间！");
                         paramMap.put("keyword1",goods.getGoodsName());
                         paramMap.put("keyword2","未开始学习");
-                        paramMap.put("pagepath","pages2/wd/course?id="+goodsVo.getGoodsId()+"&gid="+goodsVo.getGradeId()+"&orderGoodsId="+goodsVo.getOrderGoodsId());
+                        paramMap.put("pagepath","pages2/wd/course?id="+goodsVo.getGoodsId()+"&gid="+goodsVo.getGradeId()+"&orderGoodsId="+goodsVo.getOrderGoodsId()+"&informId="+informId);
                         iWxLoginService.sendSmallTpMsg(userVo.getOpenId(),paramMap);
                     }
                 }
@@ -1775,6 +1775,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     informUserAddBo.setRemind("学员学习提醒，请尽快处理");
                     informUserAddBo.setGoodsId(goodsVo.getGoodsId());
                     informUserAddBo.setText("学员"+userVo.getRealname()+"，开通《"+goods.getGoodsName()+"》课程已有7天，但未开始学习，请尽快与学员沟通情况。");
+                    informUserAddBo.setStudentUserId(userVo.getUserId());
                     iInformSysUserService.insertByAddBo(informUserAddBo);
                 }
                 if (informRemindVo.getNoteStatus().equals(1)) {
@@ -1791,6 +1792,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     informUserAddBo.setRemind("学员学习提醒，请尽快处理");
                     informUserAddBo.setGoodsId(goodsVo.getGoodsId());
                     informUserAddBo.setText("学员"+userVo.getRealname()+"，开通《"+goods.getGoodsName()+"》课程已有7天，但未开始学习，请尽快与学员沟通情况。");
+                    informUserAddBo.setStudentUserId(userVo.getUserId());
                     Map<String, Object> param = new HashMap<>();
                     param.put("name", userVo.getRealname());
                     param.put("goodsName", goods.getGoodsName());
@@ -1874,13 +1876,13 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     informUserAddBo.setRemind("您已超过3天没有学习课程，尽快去学习吧");
                     informUserAddBo.setGoodsId(goodsVo.getGoodsId());
                     informUserAddBo.setText("您已超过3天没有学习《"+goods.getGoodsName()+"》课程，为了您的学习效果，请尽快去学习吧。");
-                    iInformUserService.insertByAddBo(informUserAddBo);
+                    Long informId = iInformUserService.insertByAddBo(informUserAddBo);
                     if(Validator.isNotEmpty(userVo.getOpenId())){
                         Map<String,String> paramMap = new HashMap<>();
                         paramMap.put("first","您已超过3天没有学习，请合理安排学习时间！");
                         paramMap.put("keyword1",goods.getGoodsName());
                         paramMap.put("keyword2","已超过3天没有学习");
-                        paramMap.put("pagepath","pages2/wd/course?id="+goodsVo.getGoodsId()+"&gid="+goodsVo.getGradeId()+"&orderGoodsId="+goodsVo.getOrderGoodsId());
+                        paramMap.put("pagepath","pages2/wd/course?id="+goodsVo.getGoodsId()+"&gid="+goodsVo.getGradeId()+"&orderGoodsId="+goodsVo.getOrderGoodsId()+"&informId="+informId);
                         iWxLoginService.sendSmallTpMsg(userVo.getOpenId(),paramMap);
                     }
                 }
@@ -1956,13 +1958,13 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     informUserAddBo.setRemind("您已超过5天没有学习课程，尽快去学习吧");
                     informUserAddBo.setGoodsId(goodsVo.getGoodsId());
                     informUserAddBo.setText("您已超过5天没有学习《"+goods.getGoodsName()+"》课程，为了您的学习效果，请尽快去学习吧。");
-                    iInformUserService.insertByAddBo(informUserAddBo);
+                    Long informId = iInformUserService.insertByAddBo(informUserAddBo);
                     if(Validator.isNotEmpty(userVo.getOpenId())){
                         Map<String,String> paramMap = new HashMap<>();
                         paramMap.put("first","您已超过5天没有学习，请合理安排学习时间！");
                         paramMap.put("keyword1",goods.getGoodsName());
                         paramMap.put("keyword2","已超过5天没有学习");
-                        paramMap.put("pagepath","pages2/wd/course?id="+goodsVo.getGoodsId()+"&gid="+goodsVo.getGradeId()+"&orderGoodsId="+goodsVo.getOrderGoodsId());
+                        paramMap.put("pagepath","pages2/wd/course?id="+goodsVo.getGoodsId()+"&gid="+goodsVo.getGradeId()+"&orderGoodsId="+goodsVo.getOrderGoodsId()+"&informId="+informId);
                         iWxLoginService.sendSmallTpMsg(userVo.getOpenId(),paramMap);
                     }
                 }
@@ -2007,6 +2009,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     informUserAddBo.setRemind("学员学习提醒，请尽快处理");
                     informUserAddBo.setGoodsId(goodsVo.getGoodsId());
                     informUserAddBo.setText("学员"+userVo.getRealname()+"，已超过7天没有学习《"+goods.getGoodsName()+"》课程，请尽快与学员沟通情况。");
+                    informUserAddBo.setStudentUserId(userVo.getUserId());
                     iInformSysUserService.insertByAddBo(informUserAddBo);
                 }
                 if (informRemindVo.getNoteStatus().equals(1)) {
@@ -2023,6 +2026,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     informUserAddBo.setRemind("学员学习提醒，请尽快处理");
                     informUserAddBo.setGoodsId(goodsVo.getGoodsId());
                     informUserAddBo.setText("学员"+userVo.getRealname()+"，已超过7天没有学习《"+goods.getGoodsName()+"》课程，请尽快与学员沟通情况。");
+                    informUserAddBo.setStudentUserId(userVo.getUserId());
                     Map<String, Object> param = new HashMap<>();
                     param.put("goodsName", goods.getGoodsName());
                     param.put("day", "7");

zhongzheng-system/src/main/resources/mapper/modules/data/DataWxTpClickMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.modules.data.mapper.DataWxTpClickMapper">
+
+    <resultMap type="com.zhongzheng.modules.data.domain.DataWxTpClick" id="DataWxTpClickResult">
+        <result property="id" column="id"/>
+        <result property="informId" column="inform_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="gradeId" column="grade_id"/>
         <result property="orderGoodsId" column="order_goods_id"/>
         <result property="status" column="status"/>
+        <result property="studentUserId" column="student_user_id"/>
     </resultMap>