fix 合并

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

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.grade.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -39,6 +40,7 @@ import com.zhongzheng.modules.grade.service.IUserPeriodService;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 /**
@@ -305,7 +307,12 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
     }
 
     private void sendPeriodSMS(UserPeriodEditBo bo) {
-    //    String key = bo.getGoodsId()+"-"+bo.getUserId()+
+        String key = "Period-"+bo.getGoodsId()+"-"+bo.getUserId();
+        Long value = redisCache.getCacheObject(key);
+        if(Validator.isNotEmpty(value)){
+            return;
+        }
+        redisCache.setCacheObject(key,1L,1, TimeUnit.MINUTES);//1分钟
         GoodsVo goodsVo1 = iGoodsService.queryById(bo.getGoodsId());
         if (bo.getStatus().equals(1)) {
             InformRemindVo informRemindVo = informRemindService.queryById(9L);
@@ -383,6 +390,12 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
     }
 
     private void sendPeriodSevenSMS(UserPeriodEditBo bo) {
+        String key = "PeriodSeven-"+bo.getGoodsId()+"-"+bo.getUserId();
+        Long value = redisCache.getCacheObject(key);
+        if(Validator.isNotEmpty(value)){
+            return;
+        }
+        redisCache.setCacheObject(key,1L,1, TimeUnit.MINUTES);//1分钟
         GoodsVo goodsVo1 = iGoodsService.queryById(bo.getGoodsId());
         if (bo.getStatus().equals(1)) {
             InformRemindVo informRemindVo = informRemindService.queryById(11L);

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

@@ -1367,41 +1367,6 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             userSbusciEditBo.setSubscribeId(userSubscribeVo.getSubscribeId());
 
 
-
-          /*  ExamApplyQueryBo queryTimeBo = new ExamApplyQueryBo();
-            queryTimeBo.setApplySiteId(applyId);
-            queryTimeBo.setStartTime(startTime);
-            queryTimeBo.setEndTime(endTime);
-            queryTimeBo.setExamTime(userSbusciEditBo.getApplySiteExamTime());
-            Long siteTime = examApplyMapper.checkSiteTimeHave(queryTimeBo);
-            if (Validator.isEmpty(siteTime)) {
-                userSubscribeImport.setCause("该考试时间段不存在");
-                userSubscribeImports.add(userSubscribeImport);
-                continue;
-            }*/
-           /* if (!StringUtils.isEmpty(userSubscribeImport.getApplySiteAddressTrain())) {
-                userSbusciEditBo.setApplySiteAddressTrain(userSubscribeImport.getApplySiteAddressTrain());
-            }
-
-            if (userSubscribeImport.getApplySiteExamTrainTime() != null) {
-                userSbusciEditBo.setApplySiteExamTrainTime(Convert.toLong(DateUtils.dateTime("yyyy/MM/dd",userSubscribeImport.getApplySiteExamTrainTime()).getTime()/1000));
-            }*/
-
-           /* if (!StringUtils.isEmpty(userSubscribeImport.getApplySiteTrainTime())) {
-                String[] split = userSubscribeImport.getApplySiteTrainTime().split(":");
-                if (split.length < 2) {
-                    userSubscribeImport.setCause("考试时间段错误");
-                    userSubscribeImports.add(userSubscribeImport);
-                    continue;
-                }
-                String startTime = split[0];
-                String endTime = split[1];
-               *//* startTime = startTime.replace(":", "-");
-                endTime = endTime.replace(":", "-");*//*
-
-                userSbusciEditBo.setApplySiteStartTrainTime(startTime);
-                userSbusciEditBo.setApplySiteEndTrainTime(endTime);
-            }*/
             userSbusciEditBo.setPerformance(userSubscribeImport.getPerformance());
             userSbusciEditBo.setCertificateCode(userSubscribeImport.getCertificateCode());
             userSbusciEditBo.setUpdateTime(DateUtils.getNowTime());
@@ -1425,10 +1390,19 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 };
 
                 userSubscribeEditBo.setSubscribeId(s);
-                sendExamcancel(userSubscribeEditBo);
+                //新老数据对比
+                if(userSubscribeVo.getSubscribeStatus()!=userSbusciEditBo.getSubscribeStatus()){
+                    //有变化才发送短信
+                    sendExamcancel(userSubscribeEditBo);
+                }
+
             }
             if (!StringUtils.isEmpty(userSubscribeImport.getResult())) {
-                sendExamPass(userSbusciEditBo);
+                //新老数据对比
+                if(userSubscribeVo.getResult()!=userSbusciEditBo.getResult()){
+                    sendExamPass(userSbusciEditBo);
+                }
+
             }
             successImports.add(userSubscribeImport);
         }