fix 考试时间

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamApplyQueryBo.java

@@ -99,5 +99,14 @@ public class ExamApplyQueryBo extends BaseEntity {
 	@Excel(name = "*考试地点")
 	private String applySiteAddress;
 
+	@ApiModelProperty("考试开始时间")
+	private String startTime;
+
+	@ApiModelProperty("考试 结束时间")
+	private String endTime;
+
+	@ApiModelProperty("考试地址Id")
+	private Long applySiteId;
+
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/mapper/ExamApplyMapper.java

@@ -63,4 +63,6 @@ public interface ExamApplyMapper extends BaseMapper<ExamApply> {
 
     Long checkSiteHave(ExamApplyQueryBo bo);
 
+    Long checkSiteTimeHave(ExamApplyQueryBo bo);
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderGoodsRefundServiceImpl.java

@@ -181,7 +181,6 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
         if("OK".equals(payResult.get("return_msg"))&&Validator.isNotEmpty(payResult.get("refund_id"))){
             return refundCall(payResult.get("refund_id"),add.getRefundId(),orderGoods.getOrderGoodsId(),order,goods.getGoodsType(),orderGoods.getGradeId(),bo.getUserId(),goods.getGoodsId());
         }else{
-
             throw new CustomException("退款错误"+ JSON.toJSONString(payResult));
         }
     }

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

@@ -649,9 +649,20 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 continue;
             }
 
+            ExamApplyQueryBo queryBo = new ExamApplyQueryBo();
+            queryBo.setStatus(new ArrayList<Integer>(Arrays.asList(1)));
+            queryBo.setApplyId(applyId);
+            queryBo.setApplySiteAddress(userSubscribeImport.getApplySiteAddress());
+            Long applySiteId = examApplyMapper.checkSiteHave(queryBo);
+            if (Validator.isEmpty(applySiteId)) {
+                userSubscribeImport.setCause("该考试不存在此考试地点");
+                userSubscribeImports.add(userSubscribeImport);
+                continue;
+            }
 
 
-
+            String startTime = "";
+            String endTime = "";
             if (!StringUtils.isEmpty(userSubscribeImport.getApplySiteTime())) {
                 String[] split = userSubscribeImport.getApplySiteTime().split("-");
                 if (split.length < 2) {
@@ -659,8 +670,8 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                     userSubscribeImports.add(userSubscribeImport);
                     continue;
                 }
-                String startTime = split[0];
-                String endTime = split[1];
+                startTime = split[0];
+                endTime = split[1];
                /* startTime = startTime.replace(":", "-");
                 endTime = endTime.replace(":", "-");*/
 
@@ -671,6 +682,19 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
             }
+
+            ExamApplyQueryBo queryTimeBo = new ExamApplyQueryBo();
+            queryTimeBo.setApplySiteId(applySiteId);
+            queryTimeBo.setStartTime(startTime);
+            queryTimeBo.setEndTime(endTime);
+            Long siteTime = examApplyMapper.checkSiteTimeHave(queryTimeBo);
+            if (Validator.isEmpty(siteTime)) {
+                userSubscribeImport.setCause("该考试时间段不存在");
+                userSubscribeImports.add(userSubscribeImport);
+                continue;
+            }
+
+
             String importNo = ServletUtils.getEncoded("IMPORT");
             userSubscribeAddBo.setImportNo(importNo);
             userSubscribeAddBo.setCreateTime(DateUtils.getNowTime());
@@ -811,10 +835,11 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
 
             ExamApplyQueryBo queryBo = new ExamApplyQueryBo();
             queryBo.setApplyId(applyId);
+            queryBo.setStatus(new ArrayList<Integer>(Arrays.asList(1)));
             queryBo.setApplySiteAddress(userSubscribeImport.getApplySiteAddress());
-            Long siteNum = examApplyMapper.checkSiteHave(queryBo);
-            if (Validator.isEmpty(siteNum)) {
-                userSubscribeImport.setCause("考试地点不存在");
+            Long applySiteId = examApplyMapper.checkSiteHave(queryBo);
+            if (Validator.isEmpty(applySiteId)) {
+                userSubscribeImport.setCause("该考试不存在此考试地点");
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
             }
@@ -833,6 +858,9 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 continue;
             }
 
+
+            String startTime = "";
+            String endTime = "";
             if (Validator.isNotEmpty(userSubscribeImport.getApplySiteTime())) {
                 String[] split = userSubscribeImport.getApplySiteTime().split("-");
                 if (split.length < 2) {
@@ -840,8 +868,8 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                     userSubscribeImports.add(userSubscribeImport);
                     continue;
                 }
-                String startTime = split[0];
-                String endTime = split[1];
+                 startTime = split[0];
+                 endTime = split[1];
                /* startTime = startTime.replace(":", "-");
                 endTime = endTime.replace(":", "-");*/
 
@@ -852,6 +880,16 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
             }
+            ExamApplyQueryBo queryTimeBo = new ExamApplyQueryBo();
+            queryTimeBo.setApplySiteId(applySiteId);
+            queryTimeBo.setStartTime(startTime);
+            queryTimeBo.setEndTime(endTime);
+            Long siteTime = examApplyMapper.checkSiteTimeHave(queryTimeBo);
+            if (Validator.isEmpty(siteTime)) {
+                userSubscribeImport.setCause("该考试时间段不存在");
+                userSubscribeImports.add(userSubscribeImport);
+                continue;
+            }
 
 
             if (StringUtils.isEmpty(userSubscribeImport.getApplySiteAddressTrain())|| Validator.isEmpty(userSubscribeImport.getApplySiteExamTrainTime())|| Validator.isEmpty(userSubscribeImport.getApplySiteTime())) {
@@ -859,8 +897,23 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
             }
+
+            ExamApplyQueryBo queryTrainBo = new ExamApplyQueryBo();
+            queryTrainBo.setApplyId(applyId);
+            queryTrainBo.setStatus(new ArrayList<Integer>(Arrays.asList(2)));
+            queryTrainBo.setApplySiteAddress(userSubscribeImport.getApplySiteAddressTrain());
+            Long applySiteIdTrain = examApplyMapper.checkSiteHave(queryTrainBo);
+            if (Validator.isEmpty(applySiteIdTrain)) {
+                userSubscribeImport.setCause("该考试不存在此考培地点");
+                userSubscribeImports.add(userSubscribeImport);
+                continue;
+            }
+
+
             userSubscribeAddBo.setApplySiteAddressTrain(userSubscribeImport.getApplySiteAddressTrain());
 
+
+
             if (userSubscribeImport.getApplySiteExamTrainTime() != null) {
                 try{
                     userSubscribeAddBo.setApplySiteExamTrainTime(Convert.toLong(DateUtils.dateTimeThrow("yyyy/MM/dd",userSubscribeImport.getApplySiteExamTrainTime()).getTime()/1000));
@@ -870,7 +923,8 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                     continue;
                 }
             }
-
+            String startTrainTime = "";
+            String endTrainTime = "";
             if (!StringUtils.isEmpty(userSubscribeImport.getApplySiteTrainTime())) {
                 String[] split = userSubscribeImport.getApplySiteTrainTime().split("-");
                 if (split.length < 2) {
@@ -878,14 +932,31 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                     userSubscribeImports.add(userSubscribeImport);
                     continue;
                 }
-                String startTime = split[0];
-                String endTime = split[1];
+                 startTrainTime = split[0];
+                 endTrainTime = split[1];
               /*  startTime = startTime.replace(":", "-");
                 endTime = endTime.replace(":", "-");*/
 
-                userSubscribeAddBo.setApplySiteStartTrainTime(startTime);
-                userSubscribeAddBo.setApplySiteEndTrainTime(endTime);
+                userSubscribeAddBo.setApplySiteStartTrainTime(startTrainTime);
+                userSubscribeAddBo.setApplySiteEndTrainTime(endTrainTime);
+            }else{
+                userSubscribeImport.setCause("该考培时间段不存在");
+                userSubscribeImports.add(userSubscribeImport);
+                continue;
+            }
+
+            ExamApplyQueryBo queryTimeTrainBo = new ExamApplyQueryBo();
+            queryTimeTrainBo.setApplySiteId(applySiteId);
+            queryTimeTrainBo.setStartTime(startTrainTime);
+            queryTimeTrainBo.setEndTime(endTrainTime);
+            Long siteTrainTime = examApplyMapper.checkSiteTimeHave(queryTimeTrainBo);
+            if (Validator.isEmpty(siteTrainTime)) {
+                userSubscribeImport.setCause("该考培时间段不存在");
+                userSubscribeImports.add(userSubscribeImport);
+                continue;
             }
+
+
             String importNo = ServletUtils.getEncoded("IMPORT");
             userSubscribeAddBo.setImportNo(importNo);
             userSubscribeAddBo.setCreateTime(DateUtils.getNowTime());
@@ -1066,6 +1137,15 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 continue;
             }
 
+            ExamApplyQueryBo queryBo = new ExamApplyQueryBo();
+            queryBo.setApplyId(applyId);
+            queryBo.setApplySiteAddress(userSubscribeImport.getApplySiteAddress());
+            Long siteId = examApplyMapper.checkSiteHave(queryBo);
+            if (Validator.isEmpty(siteId)) {
+                userSubscribeImport.setCause("考试地点不存在");
+                userSubscribeImports.add(userSubscribeImport);
+                continue;
+            }
 
             if (userSubscribeImport.getApplySiteExamTime() != null) {
                 try{

zhongzheng-system/src/main/resources/mapper/modules/exam/ExamApplyMapper.xml

@@ -385,7 +385,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="checkSiteHave" parameterType="com.zhongzheng.modules.exam.bo.ExamApplyQueryBo" resultType="long">
         SELECT
-            COUNT( 1 )
+        eas.id
             FROM
             exam_apply_site eas
                 LEFT JOIN exam_site es ON es.site_id = eas.site_id
@@ -397,5 +397,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="applyId != null and applyId != ''">
             AND eas.apply_id = #{applyId}
         </if>
+        <if test="status != null and status.size()!=0 ">
+            AND eas.status in
+            <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        limit 1
+    </select>
+
+    <select id="checkSiteTimeHave" parameterType="com.zhongzheng.modules.exam.bo.ExamApplyQueryBo" resultType="long">
+        SELECT count(*) FROM exam_apply_site_time  where apply_site_id = #{applySiteId} and site_time like concat('%', #{startTime}, '%') and site_time like concat('%', #{endTime}, '%')
     </select>
 </mapper>