wangli/nanopart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REQ-3581: 接口

Browse Source
This commit is contained in:
yanglin 2025-02-27 09:54:14 +08:00
parent 9b88c9e1ec
commit 42e3058f28
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/enums/EssContractState.java
View File

@ -4,11 +4,13 @@ package cn.axzo.nanopart.ess.api.enums;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.experimental.Accessors;
/** /**
* @author yanglin * @author yanglin
*/ */
@Getter @Getter
@Accessors(fluent = true)
@RequiredArgsConstructor(access = AccessLevel.PRIVATE) @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
public enum EssContractState { public enum EssContractState {

28
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/ContractManager.java
View File

@ -1,6 +1,19 @@
package cn.axzo.nanopart.ess.server.ess; package cn.axzo.nanopart.ess.server.ess;
import static cn.axzo.nanopart.ess.server.utils.BizAssertions.fail;
import static java.util.stream.Collectors.toList;
import java.util.Arrays;
import java.util.List;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.stereotype.Component;
import com.tencentcloudapi.common.exception.TencentCloudSDKException;
import com.tencentcloudapi.essbasic.v20210526.models.ApproverItem;
import com.tencentcloudapi.essbasic.v20210526.models.ChannelCreateFlowByFilesResponse;
import cn.axzo.basics.common.exception.ServiceException; import cn.axzo.basics.common.exception.ServiceException;
import cn.axzo.nanopart.ess.api.domain.contract.EssApproveDetail; import cn.axzo.nanopart.ess.api.domain.contract.EssApproveDetail;
import cn.axzo.nanopart.ess.api.enums.EssContractState; import cn.axzo.nanopart.ess.api.enums.EssContractState;
@ -16,19 +29,8 @@ import cn.axzo.nanopart.ess.server.ess.mq.EssBroadcaster;
import cn.axzo.nanopart.ess.server.ess.support.ContractSupport; import cn.axzo.nanopart.ess.server.ess.support.ContractSupport;
import cn.axzo.nanopart.ess.server.utils.BizAssertions; import cn.axzo.nanopart.ess.server.utils.BizAssertions;
import cn.axzo.nanopart.ess.server.utils.BizTransactional; import cn.axzo.nanopart.ess.server.utils.BizTransactional;
import com.tencentcloudapi.common.exception.TencentCloudSDKException;
import com.tencentcloudapi.essbasic.v20210526.models.ApproverItem;
import com.tencentcloudapi.essbasic.v20210526.models.ChannelCreateFlowByFilesResponse;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.stereotype.Component;
import java.util.Arrays;
import java.util.List;
import static cn.axzo.nanopart.ess.server.utils.BizAssertions.fail;
import static java.util.stream.Collectors.toList;
/** /**
* @author yanglin * @author yanglin
@ -92,7 +94,7 @@ public class ContractManager {
essLogDao.logRequest("revokeContract", request.getEssContractId(), request); essLogDao.logRequest("revokeContract", request.getEssContractId(), request);
// lock when updating state // lock when updating state
EssContract contract = essContractDao.findForUpdateOrNull(request.getEssContractId()); EssContract contract = essContractDao.findForUpdateOrNull(request.getEssContractId());
BizAssertions.assertFalse(contract.isFinalState(), "合同已是终态 {}, 无法撤销", contract.getState().getDescription()); BizAssertions.assertFalse(contract.isFinalState(), "合同已是终态 {}, 无法撤销", contract.getState().description());
EssPerson superAdmin = getContractSuperAdmin(contract); EssPerson superAdmin = getContractSuperAdmin(contract);
essClient.revokeContract(superAdmin, contract.getEssContractId(), request.getReason()); essClient.revokeContract(superAdmin, contract.getEssContractId(), request.getReason());
updateContractState(contract, EssContractState.CANCEL, null, request.getReason()); updateContractState(contract, EssContractState.CANCEL, null, request.getReason());
@ -105,7 +107,7 @@ public class ContractManager {
BizAssertions.assertNotNull(reload, "合同不存在: {}", contract.getEssContractId()); BizAssertions.assertNotNull(reload, "合同不存在: {}", contract.getEssContractId());
if (reload.isFinalState()) { if (reload.isFinalState()) {
log.warn("合同[{}]已是最终状态[{}], 无法更新状态至{}", reload.getEssContractId(), reload.getState(), log.warn("合同[{}]已是最终状态[{}], 无法更新状态至{}", reload.getEssContractId(), reload.getState(),
state.getDescription()); state.description());
} }
else { else {
essContractDao.updateState(contract, state, approveDetails, essMessage); essContractDao.updateState(contract, state, approveDetails, essMessage);