fix 模板消息

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/vo/ExamUserApplyVo.java

@@ -76,4 +76,7 @@ public class ExamUserApplyVo {
 	@ApiModelProperty("总人数")
 	private Integer totalPeople;
 
+	@ApiModelProperty("订单商品")
+	private Long orderGoodsId;
+
 }

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

@@ -1371,6 +1371,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                 informUserAddBo.setRemind("考试预约提醒");
                 informUserAddBo.setGoodsId(examUserApplyVo.getGoodsId());
                 informUserAddBo.setGradeId(examUserApplyVo.getGradeId());
+                informUserAddBo.setOrderGoodsId(examUserApplyVo.getOrderGoodsId());
                 GoodsVo goodsVo1 = iGoodsService.queryById(examUserApplyVo.getGoodsId());
                 informUserAddBo.setText("尊敬的用户：七大员新考考试预约已经开始，预约截至时间" + res + "，请马上点击进行预约考试。");
                 iInformUserService.insertByAddBo(informUserAddBo);
@@ -1388,6 +1389,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                 informUserAddBo.setGoodsId(examUserApplyVo.getGoodsId());
                 GoodsVo goodsVo1 = iGoodsService.queryById(examUserApplyVo.getGoodsId());
                 informUserAddBo.setGradeId(examUserApplyVo.getGradeId());
+                informUserAddBo.setOrderGoodsId(examUserApplyVo.getOrderGoodsId());
                 informUserAddBo.setText("尊敬的用户：七大员新考考试预约已经开始，预约截至时间" + res + "，请马上点击进行预约考试。");
                 UserVo userVo = iUserService.queryById(examUserApplyVo.getUserId());
                 Map<String, Object> param = new HashMap<>();
@@ -1407,7 +1409,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                 informUserAddBo.setSystemStatus(4);
                 informUserAddBo.setRemind("考试预约提醒");
                 informUserAddBo.setGoodsId(examUserApplyVo.getGoodsId());
-                GoodsVo goodsVo1 = iGoodsService.queryById(examUserApplyVo.getGoodsId());
+                informUserAddBo.setOrderGoodsId(examUserApplyVo.getOrderGoodsId());
                 informUserAddBo.setGradeId(examUserApplyVo.getGradeId());
                 informUserAddBo.setText("尊敬的用户：七大员新考考试预约已经开始，预约截至时间" + res + "，请马上点击进行预约考试。");
                 UserVo userVo = iUserService.queryById(examUserApplyVo.getUserId());
@@ -1423,7 +1425,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     paramMap.put("keyword3",examUserApplyVo.getTotalPeople()+"");
                     paramMap.put("keyword4",examUserApplyVo.getApplyName());
                     paramMap.put("remark","请及时处理");
-                    paramMap.put("pagepath","pages2/appointment/appointment_success?subscribeId="+examUserApplyVo.getApplyId());
+                    paramMap.put("pagepath","pages2/appointment/index?goodsId="+examUserApplyVo.getGoodsId()+"&gradeId="+examUserApplyVo.getGradeId()+"&orderGoodsId="+examUserApplyVo.getOrderGoodsId()+"&applyId="+examUserApplyVo.getApplyId());
                     iWxLoginService.sendQdySubTpMsg(userVo.getOpenId(),paramMap);
                 }
             }

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

@@ -49,6 +49,7 @@ public class UserVisitLogServiceImpl extends ServiceImpl<UserVisitLogMapper, Use
         lqw.eq(StrUtil.isNotBlank(bo.getFromPlat()), UserVisitLog::getFromPlat, bo.getFromPlat());
         lqw.eq(StrUtil.isNotBlank(bo.getIp()), UserVisitLog::getIp, bo.getIp());
         lqw.between(StringUtils.isNotBlank(bo.getStartTime()),UserVisitLog::getCreateTime,bo.getStartTime(),bo.getEndTime());
+        lqw.orderByDesc(UserVisitLog::getId);
         return entity2Vo(this.list(lqw));
     }
 

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

@@ -36,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="applyEndTime" column="apply_end_time"/>
         <result property="gradeId" column="grade_id"/>
         <result property="totalPeople" column="total_people"/>
+        <result property="orderGoodsId" column="order_goods_id"/>
     </resultMap>
 
     <select id="queryUserList" parameterType="com.zhongzheng.modules.inform.bo.InformUserQueryBo" resultMap="InformUserVo">
@@ -72,7 +73,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cgg.goods_id,
         cgg.grade_id,
         ea.apply_end_time,
-        eas.total_people
+        eas.total_people,
+        cgu.order_goods_id
         FROM
         exam_apply ea
         LEFT JOIN exam_apply_goods eag on ea.apply_id = eag.apply_id