fix 合并

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/UserPeriodServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.zhongzheng.common.core.redis.RedisCache;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.modules.base.service.ICertificateTpService;
@@ -82,6 +83,9 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
     @Value("${aliyun.sms.passTheReminder}")
     private String passTheReminder;
 
+    @Autowired
+    private RedisCache redisCache;
+
     @Autowired
     private com.zhongzheng.modules.alisms.service.IAliSmsService IAliSmsService;
 
@@ -301,6 +305,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
     }
 
     private void sendPeriodSMS(UserPeriodEditBo bo) {
+    //    String key = bo.getGoodsId()+"-"+bo.getUserId()+
         GoodsVo goodsVo1 = iGoodsService.queryById(bo.getGoodsId());
         if (bo.getStatus().equals(1)) {
             InformRemindVo informRemindVo = informRemindService.queryById(9L);

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

@@ -608,6 +608,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
             }
+            System.out.println(userSubscribeImport);
             System.out.println(userSubscribeImport.getApplySiteExamTime());
             System.out.println("考试日期");
             //查询商品
@@ -732,8 +733,6 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
             }
-
-
             String startTime = "";
             String endTime = "";
             if (!StringUtils.isEmpty(userSubscribeImport.getApplySiteTime())) {
@@ -768,13 +767,14 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             }
 
             ExamApplyQueryBo queryTimeBo = new ExamApplyQueryBo();
+            queryTimeBo.setApplySiteId(applySiteId);
             queryTimeBo.setApplyId(applyId);
             queryTimeBo.setStartTime(startTime);
             queryTimeBo.setEndTime(endTime);
             queryTimeBo.setExamTime(userSubscribeAddBo.getApplySiteExamTime());
             queryTimeBo.setApplySiteAddress(userSubscribeImport.getApplySiteAddress());
             Long siteTime = examApplyMapper.checkSiteTimeHave(queryTimeBo);
-            if (Validator.isEmpty(siteTime)) {
+            if (Validator.isEmpty(siteTime)||siteTime.equals(0L)) {
                 userSubscribeImport.setCause("该考试时间段不存在");
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
@@ -788,6 +788,10 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 continue;
             }
             int num = findPeopleNum(queryTimeBo,siteTimeJson);
+            System.out.println(startTime);
+            System.out.println(endTime);
+            System.out.println(num);
+            System.out.println(sitePeopleNum);
             if(num==-1||num<=sitePeopleNum){
                 userSubscribeImport.setCause("考点人数已满");
                 userSubscribeImports.add(userSubscribeImport);
@@ -997,13 +1001,14 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 continue;
             }
             ExamApplyQueryBo queryTimeBo = new ExamApplyQueryBo();
+            queryTimeBo.setApplySiteId(applySiteId);
             queryTimeBo.setApplyId(applyId);
             queryTimeBo.setStartTime(startTime);
             queryTimeBo.setEndTime(endTime);
             queryTimeBo.setExamTime(userSubscribeAddBo.getApplySiteExamTime());
             queryTimeBo.setApplySiteAddress(userSubscribeImport.getApplySiteAddress());
             Long siteTime = examApplyMapper.checkSiteTimeHave(queryTimeBo);
-            if (Validator.isEmpty(siteTime)) {
+            if (Validator.isEmpty(siteTime)||siteTime.equals(0L)) {
                 userSubscribeImport.setCause("该考试时间段不存在");
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
@@ -1054,7 +1059,6 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                     continue;
                 }
             }
-            System.out.println(userSubscribeAddBo.getApplySiteExamTrainTime()+"考培时间");
 
             String startTrainTime = "";
             String endTrainTime = "";
@@ -1398,6 +1402,8 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSbusciEditBo.setApplySiteStartTrainTime(startTime);
                 userSbusciEditBo.setApplySiteEndTrainTime(endTime);
             }*/
+            userSbusciEditBo.setPerformance(userSubscribeImport.getPerformance());
+            userSbusciEditBo.setCertificateCode(userSubscribeImport.getCertificateCode());
             userSbusciEditBo.setUpdateTime(DateUtils.getNowTime());
             this.updateById(userSbusciEditBo);
             //考试状态由正常改为非正常
@@ -1410,10 +1416,6 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 objectLambdaUpdateWrapper.set(UserSubscribe::getCertificateCode,null);
                 objectLambdaUpdateWrapper.set(UserSubscribe::getUpdateTime,DateUtils.getNowTime());
                 this.update(null, objectLambdaUpdateWrapper);
-            }else{
-                userSbusciEditBo.setPerformance(userSubscribeImport.getPerformance());
-                userSbusciEditBo.setCertificateCode(userSubscribeImport.getCertificateCode());
-
             }
             if (userSubscribeImport.getSubscribeStatus().equals("取消")) {
                 userSbusciEditBo.setSubscribeStatus(0);