搜索条件新增

zhongzheng-admin/src/main/java/com/zhongzheng/controller/schedule/ScheduleController.java

@@ -11,6 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.text.ParseException;
+
 /**
  * 定时任务
  *
@@ -79,7 +81,7 @@ public class ScheduleController extends BaseController {
      */
     @ApiOperation("考试预约提醒")
     @GetMapping("/issue")
-    public AjaxResult updateIssue(UserQueryBo bo) {
+    public AjaxResult updateIssue(UserQueryBo bo) throws ParseException {
         iScheduleService.updateIssue(bo);
         return AjaxResult.success();
     }

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

@@ -10,6 +10,7 @@ import com.zhongzheng.modules.polyv.vo.PolyvVideoVo;
 import com.zhongzheng.modules.polyv.vo.PolyvVo;
 import com.zhongzheng.modules.user.bo.UserQueryBo;
 
+import java.text.ParseException;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -30,5 +31,5 @@ public interface IScheduleService extends IService<PolyvVideo> {
 
     void closeTimeOutOrder();
 
-    void updateIssue(UserQueryBo bo);
+    void updateIssue(UserQueryBo bo) throws ParseException;
 }

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

@@ -62,6 +62,7 @@ import com.zhongzheng.modules.polyv.vo.PolyvVo;
 import com.zhongzheng.modules.schedule.service.IScheduleService;
 import com.zhongzheng.modules.user.bo.UserExamGoodsSupplementAddBo;
 import com.zhongzheng.modules.user.bo.UserQueryBo;
+import com.zhongzheng.modules.user.bo.UserSubscribeQueryBo;
 import com.zhongzheng.modules.user.domain.UserExamGoods;
 import com.zhongzheng.modules.user.domain.UserSubscribe;
 import com.zhongzheng.modules.user.service.IUserExamGoodsService;
@@ -78,6 +79,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.io.IOException;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -523,7 +525,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
     }
 
     @Override
-    public void updateIssue(UserQueryBo bo) {
+    public void updateIssue(UserQueryBo bo) throws ParseException {
         InformQueryBo informQueryBo = new InformQueryBo();
         informQueryBo.setIssue(1);
         informQueryBo.setIssueStatus(2);
@@ -537,6 +539,30 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
             informUser.setUpdateTime(DateUtils.getNowTime());
             iInformUserService.update(informUser,lqw);
         }
+        updateApply();
+    }
+
+    private void updateApply() throws ParseException {
+        UserSubscribeQueryBo userSubscribeQueryBo = new UserSubscribeQueryBo();
+        userSubscribeQueryBo.setExceed(1L);
+        List<UserSubscribeVo> userSubscribeVos = iUserSubscribeService.listSubscribe(userSubscribeQueryBo);
+        for (UserSubscribeVo userSubscribeVo : userSubscribeVos) {
+            Date date = new Date();
+            Long times = userSubscribeVo.getApplySiteExamTime();//时间戳
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+            String dateString = formatter.format(times);
+            String dateForma =null;
+            dateForma = dateString+" "+userSubscribeVo.getApplySiteStartTime().replace("-", ":");
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+            Long time = sdf.parse(dateForma).getTime() / 1000;
+            if (System.currentTimeMillis()/1000 > time){
+                UserSubscribe userSubscribe = new UserSubscribe();
+                userSubscribe.setSubscribeId(userSubscribeVo.getSubscribeId());
+                userSubscribe.setExamExpend(1);
+                userSubscribe.setUpdateTime(DateUtils.getNowTime());
+                iUserSubscribeService.updateById(userSubscribe);
+            }
+        }
     }
 
 

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

@@ -89,4 +89,7 @@ public class UserSubscribeQueryBo extends BaseEntity {
 	/** 1 前培次数消耗 */
 	@ApiModelProperty("前培id")
 	private Long beforeId;
+
+	@ApiModelProperty("查询超过过期时间，未消耗考试次数 1")
+	private Long exceed;
 }

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

@@ -192,6 +192,12 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             update.setRemark(bo.getRemark());
             update.setBeforeId(bo.getBeforeId());
             update.setBeforeStatus(bo.getBeforeStatus());
+            if (bo.getBeforeStatus() != null && bo.getBeforeStatus().equals(1)){
+                update.setBeforeExpend(1);
+            }
+            else if (bo.getBeforeStatus() != null && bo.getBeforeStatus().equals(0)){
+                update.setBeforeExpend(0);
+            }
             update.setUpdateTime(DateUtils.getNowTime());
             boolean b = this.updateById(update);
         }
@@ -470,7 +476,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             }
 
             if (userSubscribeImport.getApplySiteExamTrainTime() != null) {
-                userSubscribeAddBo.setApplySiteExamTrainTime(Convert.toLong(userSubscribeImport.getApplySiteExamTrainTime().getDay()));
+                userSubscribeAddBo.setApplySiteExamTrainTime(Convert.toLong(userSubscribeImport.getApplySiteExamTrainTime().getTime()/1000));
             }
 
             if (!StringUtils.isEmpty(userSubscribeImport.getApplySiteTrainTime())) {
@@ -635,7 +641,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             }
 
             if (userSubscribeImport.getApplySiteExamTime() != null) {
-                userSbusciEditBo.setApplySiteExamTime(Convert.toLong(userSubscribeImport.getApplySiteExamTime().getDay()));
+                userSbusciEditBo.setApplySiteExamTime(Convert.toLong(userSubscribeImport.getApplySiteExamTime().getTime()/1000));
             } else {
                 userSubscribeImport.setCause("考试时间未填");
                 userSubscribeImports.add(userSubscribeImport);
@@ -668,7 +674,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             }
 
             if (userSubscribeImport.getApplySiteExamTrainTime() != null) {
-                userSbusciEditBo.setApplySiteExamTrainTime(Convert.toLong(userSubscribeImport.getApplySiteExamTrainTime().getDay()));
+                userSbusciEditBo.setApplySiteExamTrainTime(Convert.toLong(userSubscribeImport.getApplySiteExamTrainTime().getTime()/1000));
             }
 
             if (!StringUtils.isEmpty(userSubscribeImport.getApplySiteTrainTime())) {

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

@@ -112,6 +112,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           <if test="beforeId != null ">
             and us.before_id =#{beforeId}
         </if>
+        <if test="exceed != null ">
+            and unix_timestamp(now()) > us.apply_site_exam_time and us.exam_expend is NULL and us.subscribe_status = 1
+        </if>
         <if test="majorId != null and majorId != '' ">
             and (SELECT m.id FROM goods g LEFT JOIN major m on g.major_id= m.id where us.goods_id = g.goods_id) = #{majorId}
         </if>