fix 模板消息

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

@@ -100,13 +100,13 @@ public class CourseSectionWatchPerServiceImpl extends ServiceImpl<CourseSectionW
     public CheckSectionWatchVo checkSectionWatchPer(SectionWatchQueryBo bo) {
         //校验商品有效期
         Goods goods = goodsService.getById(bo.getGoodsId());
-        if (ObjectUtils.isNotNull(goods.getValidityStartTime()) && ObjectUtils.isNotNull(goods.getValidityEndTime())){
+       /* if (ObjectUtils.isNotNull(goods.getValidityStartTime()) && ObjectUtils.isNotNull(goods.getValidityEndTime())){
             Long validityStartTime = goods.getValidityStartTime();
             Long validityEndTime = goods.getValidityEndTime();
             if (DateUtils.getNowTime() < validityStartTime || DateUtils.getNowTime() > validityEndTime){
                 throw new CustomException("该商品不在有效期");
             }
-        }
+        }*/
         CheckSectionWatchVo watchVo = new CheckSectionWatchVo();
         watchVo.setGoodsId(bo.getGoodsId());
         watchVo.setCourseId(bo.getCourseId());

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserSubscribeAddBo.java

@@ -113,4 +113,19 @@ public class UserSubscribeAddBo {
     /** 签署文件路径 */
     @ApiModelProperty("签署文件路径")
     private String reportFile;
+    /** 考点ID */
+    @ApiModelProperty("考点ID")
+    private Long siteId;
+    /** 0 未同步 1成功 2失败 */
+    @ApiModelProperty("0 未同步 1成功 2失败")
+    private Integer syncStatus;
+    /** 考场地址 */
+    @ApiModelProperty("考场地址")
+    private String roomAddress;
+    /** 同步结果信息 */
+    @ApiModelProperty("同步结果信息")
+    private String syncResult;
+    /** 考场名称 */
+    @ApiModelProperty("考场名称")
+    private String roomName;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserSubscribeEditBo.java

@@ -136,4 +136,19 @@ public class UserSubscribeEditBo {
     /** 签署文件路径 */
     @ApiModelProperty("签署文件路径")
     private String reportFile;
+    /** 考点ID */
+    @ApiModelProperty("考点ID")
+    private Long siteId;
+    /** 0 未同步 1成功 2失败 */
+    @ApiModelProperty("0 未同步 1成功 2失败")
+    private Integer syncStatus;
+    /** 考场地址 */
+    @ApiModelProperty("考场地址")
+    private String roomAddress;
+    /** 同步结果信息 */
+    @ApiModelProperty("同步结果信息")
+    private String syncResult;
+    /** 考场名称 */
+    @ApiModelProperty("考场名称")
+    private String roomName;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserSubscribeQueryBo.java

@@ -127,4 +127,19 @@ public class UserSubscribeQueryBo extends BaseEntity {
 	/** 订单商品ID */
 	@ApiModelProperty("订单商品ID")
 	private Long orderGoodsId;
+	/** 考点ID */
+	@ApiModelProperty("考点ID")
+	private Long siteId;
+	/** 0 未同步 1成功 2失败 */
+	@ApiModelProperty("0 未同步 1成功 2失败")
+	private Integer syncStatus;
+	/** 考场地址 */
+	@ApiModelProperty("考场地址")
+	private String roomAddress;
+	/** 同步结果信息 */
+	@ApiModelProperty("同步结果信息")
+	private String syncResult;
+	/** 考场名称 */
+	@ApiModelProperty("考场名称")
+	private String roomName;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserSubscribe.java

@@ -88,4 +88,14 @@ private static final long serialVersionUID=1L;
     private String seatNumber;
     /** 签署文件路径 */
     private String reportFile;
+    /** 考点ID */
+    private Long siteId;
+    /** 0 未同步 1成功 2失败 */
+    private Integer syncStatus;
+    /** 考场地址 */
+    private String roomAddress;
+    /** 同步结果信息 */
+    private String syncResult;
+    /** 考场名称 */
+    private String roomName;
 }

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

@@ -28,6 +28,7 @@ import com.zhongzheng.modules.course.service.IMajorService;
 import com.zhongzheng.modules.exam.bo.ExamApplyQueryBo;
 import com.zhongzheng.modules.exam.bo.ExamApplySiteTimeJson;
 import com.zhongzheng.modules.exam.mapper.ExamApplyMapper;
+import com.zhongzheng.modules.exam.service.IExamApplySiteService;
 import com.zhongzheng.modules.exam.vo.ExamApplySiteTimeVo;
 import com.zhongzheng.modules.exam.vo.ExamApplySiteVo;
 import com.zhongzheng.modules.exam.vo.ExamApplyVo;
@@ -108,6 +109,9 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
     @Autowired
     private IUserService iUserService;
 
+    @Autowired
+    private IExamApplySiteService iExamApplySiteService;
+
     @Autowired
     private IMajorService majorService;
 
@@ -964,6 +968,8 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             userSubscribeAddBo.setImportNo(importNo);
             userSubscribeAddBo.setCreateTime(DateUtils.getNowTime());
             userSubscribeAddBo.setUpdateTime(DateUtils.getNowTime());
+            ExamApplySiteVo examApplySiteVo = iExamApplySiteService.queryById(applySiteId);
+            userSubscribeAddBo.setSiteId(examApplySiteVo.getSiteId());
             String errorMsg = null;
             try{
                  errorMsg = this.insertByAddBoImport(userSubscribeAddBo);
@@ -1245,8 +1251,6 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 continue;
             }
 
-
-
             ExamApplyQueryBo queryTimeTrainBo = new ExamApplyQueryBo();
             queryTimeTrainBo.setApplySiteId(applySiteId);
             queryTimeTrainBo.setStartTime(startTrainTime);
@@ -1287,6 +1291,8 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             userSubscribeAddBo.setImportNo(importNo);
             userSubscribeAddBo.setCreateTime(DateUtils.getNowTime());
             userSubscribeAddBo.setUpdateTime(DateUtils.getNowTime());
+            ExamApplySiteVo examApplySiteVo = iExamApplySiteService.queryById(applySiteId);
+            userSubscribeAddBo.setSiteId(examApplySiteVo.getSiteId());
             String errorMsg = null;
             try{
                 errorMsg = this.insertByAddBoImport(userSubscribeAddBo);

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserSubscribeVo.java

@@ -224,4 +224,24 @@ public class UserSubscribeVo {
 	@Excel(name = "签署文件路径")
 	@ApiModelProperty("签署文件路径")
 	private String reportFile;
+	/** 考点ID */
+	@Excel(name = "考点ID")
+	@ApiModelProperty("考点ID")
+	private Long siteId;
+	/** 0 未同步 1成功 2失败 */
+	@Excel(name = "0 未同步 1成功 2失败")
+	@ApiModelProperty("0 未同步 1成功 2失败")
+	private Integer syncStatus;
+	/** 考场地址 */
+	@Excel(name = "考场地址")
+	@ApiModelProperty("考场地址")
+	private String roomAddress;
+	/** 同步结果信息 */
+	@Excel(name = "同步结果信息")
+	@ApiModelProperty("同步结果信息")
+	private String syncResult;
+	/** 考场名称 */
+	@Excel(name = "考场名称")
+	@ApiModelProperty("考场名称")
+	private String roomName;
 }

zhongzheng-system/src/main/resources/mapper/modules/user/UserSubscribeMapper.xml

@@ -26,6 +26,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="reportStatus" column="report_status"/>
         <result property="seatNumber" column="seat_number"/>
         <result property="reportFile" column="report_file"/>
+        <result property="siteId" column="site_id"/>
+        <result property="syncStatus" column="sync_status"/>
+        <result property="roomAddress" column="room_address"/>
+        <result property="syncResult" column="sync_result"/>
+        <result property="roomName" column="room_name"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.UserSubscribeVo" id="UserSubscribeVo">
@@ -72,6 +77,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="reportStatus" column="report_status"/>
         <result property="seatNumber" column="seat_number"/>
         <result property="reportFile" column="report_file"/>
+        <result property="siteId" column="site_id"/>
+        <result property="syncStatus" column="sync_status"/>
+        <result property="roomAddress" column="room_address"/>
+        <result property="syncResult" column="sync_result"/>
+        <result property="roomName" column="room_name"/>
     </resultMap>
 
     <select id="listSubscribe" parameterType="com.zhongzheng.modules.user.bo.UserSubscribeQueryBo" resultMap="UserSubscribeVo">