REQ-3540: 续费

This commit is contained in:
yanglin 2025-03-17 17:33:17 +08:00
parent 442343be57
commit 172fcacab5
2 changed files with 7 additions and 12 deletions

View File

@ -59,13 +59,6 @@ public class FileDatabaseDao extends ServiceImpl<FileDatabaseMapper, FileDatabas
.remove();
}
public void setActivated(String code) {
lambdaUpdate() //
.eq(FileDatabase::getCode, code) //
.set(FileDatabase::getState, FileDatabaseState.ACTIVATED) //
.update();
}
public void updateUsedCapacity(String code, int usedFileSize) {
lambdaUpdate() //
.eq(FileDatabase::getCode, code) //

View File

@ -11,13 +11,13 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.Future;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
import org.springframework.transaction.support.TransactionTemplate;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import cn.axzo.apollo.workspace.api.workspace.WorkspaceApi;
import cn.axzo.apollo.workspace.api.workspace.req.GetSimpleWorkspaceReqV2;
@ -103,7 +103,7 @@ public class FileDatabaseService {
if (reload.isActivated())
return;
indexManager.copySubTree(template, null, new ScopedCopyFileVisitor(copiedOssFiles, db));
fileDatabaseDao.setActivated(reload.getCode());
fileDatabaseDao.updateState(db.getCode(), FileDatabaseState.ACTIVATED);
});
});
asyncUtils.getOrTimeout(future, "激活等待超时, 激活任务在后台运行, 请稍后刷新查看");
@ -118,7 +118,7 @@ public class FileDatabaseService {
if (db == null || !db.isActivated())
return;
fileDatabaseDao.updateUsedCapacity(db.getCode(), indexQueryService.getUsedFileSize(db));
db = fileDatabaseDao.findForUpdateOrNull(indexNode.scopeCode());
db = fileDatabaseDao.findForUpdateOrNull(db.getCode());
if (db.isCapacityExhausted())
fileDatabaseDao.updateState(db.getCode(), FileDatabaseState.CAPACITY_EXHAUSTED);
}
@ -127,8 +127,10 @@ public class FileDatabaseService {
public void renew(FileDatabaseRenewRequest request) {
request.checkExpiredDate();
FileDatabase db = fileDatabaseDao.getForUpdateOrThrow(request.getCode());
updateCapacity(request).set(FileDatabase::getState,
db.isCapacityExhausted() ? FileDatabaseState.CAPACITY_EXHAUSTED : FileDatabaseState.ACTIVATED).update();
updateCapacity(request) //
.set(FileDatabase::getState,
db.isCapacityExhausted() ? FileDatabaseState.CAPACITY_EXHAUSTED : FileDatabaseState.ACTIVATED) //
.update();
}
@BizTransactional