fix 模考预约判断条件

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

@@ -78,5 +78,5 @@ public class UserMockSubscribeAddBo {
     private Long firstHandTime;
     /** 题号ID*/
     @ApiModelProperty("题号ID")
-    private String recordId;
+    private String recordIds;
 }

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

@@ -98,6 +98,6 @@ public class UserMockSubscribeEditBo {
 
     /** 题号ID */
     @ApiModelProperty("题号ID")
-    private String recordId;
+    private String recordIds;
 
 }

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

@@ -120,5 +120,5 @@ public class UserMockSubscribeQueryBo extends BaseEntity {
 
 	/** 题号ID */
 	@ApiModelProperty("题号ID")
-	private String recordId;
+	private String recordIds;
 }

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

@@ -68,5 +68,5 @@ private static final long serialVersionUID=1L;
     /** 第一次交卷时间 */
     private Long firstHandTime;
     /** 题号ID */
-    private String recordId;
+    private String recordIds;
 }

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

@@ -79,7 +79,7 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
         lqw.eq(bo.getFirstScore() != null, UserMockSubscribe::getFirstScore, bo.getFirstScore());
         lqw.eq(bo.getFirstSubjectiveScore() != null, UserMockSubscribe::getFirstSubjectiveScore, bo.getFirstSubjectiveScore());
         lqw.eq(bo.getFirstHandTime() != null, UserMockSubscribe::getFirstHandTime, bo.getFirstHandTime());
-        lqw.eq(bo.getRecordId() != null, UserMockSubscribe::getRecordId, bo.getRecordId());
+        lqw.eq(bo.getRecordIds() != null, UserMockSubscribe::getRecordIds, bo.getRecordIds());
         return entity2Vo(this.list(lqw));
     }
 
@@ -130,19 +130,18 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
                 throw new CustomException("已存在同类型模考预约，不能再预约了哦~");
             }
             //已预约模考还没结束，或已参加
-            if (!(System.currentTimeMillis()/1000 > formatTime(userMockSubscribe.getApplySiteExamTime(), userMockSubscribe.getApplySiteEndTime()))
-                    && userMockSubscribe.getHandStatus() == 0) {
+            if (!(System.currentTimeMillis()/1000 > formatTime(userMockSubscribe.getApplySiteExamTime(), userMockSubscribe.getApplySiteEndTime())
+                    && userMockSubscribe.getHandStatus() == 0)) {
                 throw new CustomException("已存在同类型模考预约，不能再预约了哦~");
             }
-
         }
 
         //判断关联商品
-        List<Long> goodsIds = iOrderService.getUserGoods(bo.getUserId());
-        if (goodsIds.size() > 0) {
-            LambdaQueryWrapper<MockMajorSubjectGoods> lq = Wrappers.lambdaQuery();
-            lq.eq(MockMajorSubjectGoods::getMockMajorSubjectId, bo.getMockMajorSubjectId());
-            List<MockMajorSubjectGoods> mockMajorSubjectGoodsList = iMockMajorSubjectGoodsService.list(lq);
+        LambdaQueryWrapper<MockMajorSubjectGoods> lq = Wrappers.lambdaQuery();
+        lq.eq(MockMajorSubjectGoods::getMockMajorSubjectId, bo.getMockMajorSubjectId());
+        List<MockMajorSubjectGoods> mockMajorSubjectGoodsList = iMockMajorSubjectGoodsService.list(lq);
+        if (mockMajorSubjectGoodsList != null && mockMajorSubjectGoodsList.size() > 0) {
+            List<Long> goodsIds = iOrderService.getUserGoods(bo.getUserId());
             List<Long> userGoods = new ArrayList<>();
             mockMajorSubjectGoodsList.stream().forEach(mockMajorSubjectGoods -> {
                 userGoods.add(mockMajorSubjectGoods.getGoodsId());
@@ -159,7 +158,6 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
         this.save(add);
-        //TODO:发送站内信
 
         return add.getSubscribeId();
     }
@@ -194,10 +192,10 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
             }
         }
         update.setUpdateTime(DateUtils.getNowTime());
-        if (Validator.isNotEmpty(bo.getRecordId()) && userMockSubscribeVo.getRecordId() != null) {
-            update.setRecordId(userMockSubscribeVo.getRecordId() + "," + bo.getRecordId());
-        }else if (Validator.isNotEmpty(bo.getRecordId()) && userMockSubscribeVo.getRecordId() == null) {
-            update.setRecordId(userMockSubscribeVo.getRecordId() + bo.getRecordId());
+        if (Validator.isNotEmpty(bo.getRecordIds()) && userMockSubscribeVo.getRecordIds() != null) {
+            update.setRecordIds(userMockSubscribeVo.getRecordIds() + "," + bo.getRecordIds());
+        }else if (Validator.isNotEmpty(bo.getRecordIds()) && userMockSubscribeVo.getRecordIds() == null) {
+            update.setRecordIds(userMockSubscribeVo.getRecordIds() + bo.getRecordIds());
         }
         return this.updateById(update);
     }

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

@@ -168,5 +168,5 @@ public class UserMockSubscribeVo {
 	/** 做题ID */
 	@Excel(name = "做题ID")
 	@ApiModelProperty("做题ID")
-	private String recordId;
+	private String recordIds;
 }

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

@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="firstScore" column="first_score"/>
         <result property="firstSubjectiveScore" column="first_subjective_score"/>
         <result property="firstHandTime" column="first_hand_time"/>
-        <result property="recordId" column="record_id"/>
+        <result property="recordIds" column="record_ids"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.UserMockSubscribeVo" id="UserMockSubscribeVoResult">
@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="firstScore" column="first_score"/>
         <result property="firstSubjectiveScore" column="first_subjective_score"/>
         <result property="firstHandTime" column="first_hand_time"/>
-        <result property="recordId" column="record_id"/>
+        <result property="recordIds" column="record_ids"/>
     </resultMap>
     <select id="getInfo" parameterType="java.lang.Long" resultMap="UserMockSubscribeVoResult">
         SELECT 	ums.*,