【feat】【v3】

1.修改缓存清除逻辑

src/main/java/com/punchsettle/server/service/manager/impl/SettleManagerImpl.java

@@ -13,19 +13,6 @@ import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import com.punchsettle.server.atomic.entity.Account;
-import com.punchsettle.server.atomic.entity.AccountTransferHistory;
-import com.punchsettle.server.atomic.entity.User;
-import com.punchsettle.server.atomic.service.IAccountService;
-import com.punchsettle.server.atomic.service.IAccountTransferHistoryService;
-import com.punchsettle.server.atomic.service.IUserService;
-import com.punchsettle.server.constant.AccountCategoryEnum;
-import com.punchsettle.server.constant.PointsDistributeStatusEnum;
-import com.punchsettle.server.constant.TransferCategoryEnum;
-import com.punchsettle.server.pojo.account.AccountQuery;
-import com.punchsettle.server.pojo.settle.SettleUserHistoryQuery;
-import com.punchsettle.server.service.manager.IAccountManager;
-import com.punchsettle.server.service.manager.ICacheManager;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
@@ -34,33 +21,46 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import com.punchsettle.server.atomic.ContinueTask;
+import com.punchsettle.server.atomic.entity.Account;
+import com.punchsettle.server.atomic.entity.AccountTransferHistory;
 import com.punchsettle.server.atomic.entity.PiStatus;
 import com.punchsettle.server.atomic.entity.PiTask;
 import com.punchsettle.server.atomic.entity.PiTaskExt;
 import com.punchsettle.server.atomic.entity.PiTaskHistory;
 import com.punchsettle.server.atomic.entity.SettleTaskRelaHistory;
 import com.punchsettle.server.atomic.entity.SettleUserHistory;
+import com.punchsettle.server.atomic.entity.User;
+import com.punchsettle.server.atomic.service.IAccountService;
+import com.punchsettle.server.atomic.service.IAccountTransferHistoryService;
 import com.punchsettle.server.atomic.service.IPiStatusService;
 import com.punchsettle.server.atomic.service.IPiTaskExtService;
 import com.punchsettle.server.atomic.service.IPiTaskHistoryService;
 import com.punchsettle.server.atomic.service.IPiTaskService;
-import com.punchsettle.server.atomic.service.ISettleUserHistoryService;
 import com.punchsettle.server.atomic.service.ISettleTaskRelaHistoryService;
+import com.punchsettle.server.atomic.service.ISettleUserHistoryService;
+import com.punchsettle.server.atomic.service.IUserService;
 import com.punchsettle.server.common.utils.Assert;
+import com.punchsettle.server.constant.AccountCategoryEnum;
 import com.punchsettle.server.constant.ArchiveStatusEnum;
 import com.punchsettle.server.constant.CacheNameConstant;
 import com.punchsettle.server.constant.ContinueStageEnum;
 import com.punchsettle.server.constant.ContinueStatusEnum;
+import com.punchsettle.server.constant.PointsDistributeStatusEnum;
 import com.punchsettle.server.constant.PunchInResultEnum;
 import com.punchsettle.server.constant.SettleResultEnum;
+import com.punchsettle.server.constant.TransferCategoryEnum;
 import com.punchsettle.server.constant.VersionStatusEnum;
+import com.punchsettle.server.pojo.account.AccountQuery;
 import com.punchsettle.server.pojo.punchIn.PiStatusQuery;
 import com.punchsettle.server.pojo.punchIn.PiTaskData;
 import com.punchsettle.server.pojo.punchIn.PiTaskExtQuery;
 import com.punchsettle.server.pojo.punchIn.PiTaskHistoryQuery;
 import com.punchsettle.server.pojo.punchIn.PiTaskQuery;
 import com.punchsettle.server.pojo.settle.SettleData;
+import com.punchsettle.server.pojo.settle.SettleUserHistoryQuery;
 import com.punchsettle.server.pojo.settle.SettleUserHistoryVO;
+import com.punchsettle.server.service.manager.IAccountManager;
+import com.punchsettle.server.service.manager.ICacheManager;
 import com.punchsettle.server.service.manager.IPunchInCoreManager;
 import com.punchsettle.server.service.manager.ISettleCoreManager;
 import com.punchsettle.server.service.manager.ISettleManager;
@@ -275,7 +275,10 @@ public class SettleManagerImpl implements ISettleManager {
             piStatusService.batchAdd(addPiStatusList);
         }
 
-        userIds.forEach(userId -> cacheManager.batchEvictLike(Arrays.asList(CacheNameConstant.SETTLE_USER_HISTORY, CacheNameConstant.STAT_TASK_LINE), String.valueOf(userId)));
+        userIds.forEach(userId -> {
+            cacheManager.batchEvict(Arrays.asList(CacheNameConstant.STAT_TASK_LINE), userId);
+            cacheManager.batchEvictLike(Arrays.asList(CacheNameConstant.SETTLE_USER_HISTORY), String.valueOf(userId));
+        });
     }
 
     /**