Merge branch 'developer' into feature-02-22

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/out/PendingTaskApiServiceImpl.java

@@ -147,6 +147,7 @@ public class PendingTaskApiServiceImpl implements PendingTaskApiService {
         pendingTaskBO.setRelationId(relationId);
         pendingTaskBO.setClerkId(newExeutiveClerkId);
         pendingTaskBO.setFinishFlag(1);
+        pendingTaskBO.setFinishTime(new Date());
         boolean b = pendingTaskService.changeByRelationId(pendingTaskBO);
         return ServiceResponse.success(b);
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/CheckQywxSettingApiServiceImpl.java

@@ -108,7 +108,7 @@ public class CheckQywxSettingApiServiceImpl implements CheckQywxSettingApiServic
         titleSub = StringUtils.isBlank(titleSub) ? "加好友异常" : titleSub;
         String key = ALERT_KEY + wxEnterpriseId;
         RBucket<Object> bucket = RedisUtil.getRedisClient().getBucket(key);
-        boolean b = bucket.trySet(1, 60L, TimeUnit.SECONDS);
+        boolean b = bucket.trySet(1, 2L, TimeUnit.HOURS);
         if (!b) {
             return;
         }