Merge remote-tracking branch 'origin/Payment-Configuration' into Payment-Configuration

fs-admin/src/main/java/com/fs/his/task/Task.java

@@ -1706,7 +1706,7 @@ public class Task {
 
 
             if(nowCount>1){ // 重试一次后放弃
-                logger.error("im会员定时发课重试三次后放弃，key{}", key);
+                logger.error("im会员定时发课重试1次后放弃，key{}", key);
                 redisTemplate.opsForHash().delete(redisKey, key);
                 continue;
             }
@@ -1768,8 +1768,8 @@ public class Task {
                 e.printStackTrace();
             }
 
-            if(nowCount>3){ // 重试三次后放弃
-                logger.error("im 会员催课重试三次后放弃，key{}", key);
+            if(nowCount>1){ // 重试三次后放弃
+                logger.error("im 会员催课重试1次后放弃，key{}", key);
                 redisTemplate.opsForHash().delete(redisKey, key);
                 continue;
             }