From 962f78c8383e7c884ddb08c951c15e5ba6eb4cb8 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 23 十月 2026 15:43:33 +0800
Subject: [PATCH] fix: 完善审批流程与业务状态校验
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java | 136 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 128 insertions(+), 8 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
index f9edb8a..3280495 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
@@ -5,20 +5,27 @@
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.spring.SpringUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
+import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractImportExcelVO;
+import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractImportReqVO;
+import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractImportRespVO;
import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractPageReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractSaveReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractTransferReqVO;
import cn.iocoder.yudao.module.crm.dal.dataobject.contract.CrmContractConfigDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.contract.CrmContractDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.contract.CrmContractProductDO;
+import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.quotation.CrmSaleQuotationDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.quotation.CrmSaleQuotationProductDO;
import cn.iocoder.yudao.module.crm.dal.mysql.contract.CrmContractMapper;
import cn.iocoder.yudao.module.crm.dal.mysql.contract.CrmContractProductMapper;
+import cn.iocoder.yudao.module.crm.dal.mysql.customer.CrmCustomerMapper;
import cn.iocoder.yudao.module.crm.dal.redis.no.CrmNoRedisDAO;
import cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum;
import cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum;
@@ -57,6 +64,7 @@
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -88,6 +96,8 @@
private CrmContractMapper contractMapper;
@Resource
private CrmContractProductMapper contractProductMapper;
+ @Resource
+ private CrmCustomerMapper customerMapper;
@Resource
private CrmNoRedisDAO noRedisDAO;
@@ -166,9 +176,9 @@
updateReqVO.setOwnerUserId(null); // 涓嶅厑璁告洿鏂扮殑瀛楁
// 1.1 鏍￠獙瀛樺湪
CrmContractDO oldContract = validateContractExists(updateReqVO.getId());
- // 1.2 鍙湁鑽夌銆佸鎵逛腑锛屽彲浠ョ紪杈戯紱
+ // 1.2 鍙湁鑽夌銆佸鏍镐笉閫氳繃锛屽彲浠ョ紪杈戯紱
if (!ObjectUtils.equalsAny(oldContract.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus(),
- CrmAuditStatusEnum.PROCESS.getStatus())) {
+ CrmAuditStatusEnum.REJECT.getStatus())) {
throw exception(CONTRACT_UPDATE_FAIL_NOT_DRAFT);
}
// 1.3 鏍￠獙浜у搧椤圭殑鏈夋晥鎬�
@@ -262,7 +272,12 @@
public void deleteContract(Long id) {
// 1.1 鏍￠獙瀛樺湪
CrmContractDO contract = validateContractExists(id);
- // 1.2 濡傛灉琚� CrmReceivableDO 鎵�浣跨敤锛屽垯涓嶅厑璁稿垹闄�
+ // 1.2 鍙湁鑽夌銆佸鏍镐笉閫氳繃锛屽彲浠ュ垹闄わ紱
+ if (!ObjectUtils.equalsAny(contract.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus(),
+ CrmAuditStatusEnum.REJECT.getStatus())) {
+ throw exception(CONTRACT_DELETE_FAIL_NOT_EDITABLE);
+ }
+ // 1.3 濡傛灉琚� CrmReceivableDO 鎵�浣跨敤锛屽垯涓嶅厑璁稿垹闄�
if (receivableService.getReceivableCountByContractId(contract.getId()) > 0) {
throw exception(CONTRACT_DELETE_FAIL);
}
@@ -341,6 +356,7 @@
@Transactional(rollbackFor = Exception.class)
@LogRecord(type = CRM_CONTRACT_TYPE, subType = CRM_CONTRACT_SUBMIT_SUB_TYPE, bizNo = "{{#id}}",
success = CRM_CONTRACT_SUBMIT_SUCCESS)
+ @CrmPermission(bizType = CrmBizTypeEnum.CRM_CONTRACT, bizId = "#id", level = CrmPermissionLevelEnum.WRITE)
public void submitContract(Long id) {
// 1. 鏍￠獙瀛樺湪 + 鍙彁浜ょ姸鎬侊紙鏈彁浜� / 瀹℃牳涓嶉�氳繃锛�
CrmContractDO contract = validateContractExists(id);
@@ -353,7 +369,9 @@
approvalConfigApi.validateApprovalEnabledAndGetApprovers(CONTRACT_APPROVE_BIZ_TYPE);
// 3. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋滐紝閬垮厤娈嬬暀銆屽鏍镐笉閫氳繃銆嶇殑鍘熷洜
- contractMapper.submitAndResetAuditInfo(id, CrmAuditStatusEnum.PROCESS.getStatus());
+ if (contractMapper.submitAndResetAuditInfo(id, CrmAuditStatusEnum.PROCESS.getStatus()) != 1) {
+ throw exception(CONTRACT_SUBMIT_FAIL_NOT_EDITABLE);
+ }
// 4. 璁板綍鏃ュ織
LogRecordContext.putVariable("contractName", contract.getName());
@@ -381,13 +399,17 @@
if (StrUtil.isBlank(reviewRemark)) {
throw exception(CONTRACT_AUDIT_REJECT_REASON_REQUIRED);
}
- contractMapper.auditContract(id, CrmAuditStatusEnum.REJECT.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (contractMapper.auditContract(id, CrmAuditStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(CONTRACT_AUDIT_FAIL_NOT_PROCESS);
+ }
return;
}
// 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄鏍搁�氳繃
- contractMapper.auditContract(id, CrmAuditStatusEnum.APPROVE.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (contractMapper.auditContract(id, CrmAuditStatusEnum.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(CONTRACT_AUDIT_FAIL_NOT_PROCESS);
+ }
}
// ======================= 鏌ヨ鐩稿叧 =======================
@@ -561,4 +583,102 @@
}
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public CrmContractImportRespVO importContractList(List<CrmContractImportExcelVO> importContracts,
+ CrmContractImportReqVO importReqVO) {
+ // 1. 鏍￠獙闈炵┖
+ importContracts = filterList(importContracts, item -> StrUtil.isNotBlank(item.getName()));
+ if (CollUtil.isEmpty(importContracts)) {
+ throw exception(CONTRACT_IMPORT_LIST_IS_EMPTY);
+ }
+ // 2. 鏍￠獙璐熻矗浜猴紙涓虹┖鍒欓粯璁ゅ綋鍓嶆搷浣滀汉锛�
+ Long ownerUserId = importReqVO.getOwnerUserId() != null ? importReqVO.getOwnerUserId() : getLoginUserId();
+ adminUserApi.validateUser(ownerUserId);
+
+ // 3. 閫愭潯澶勭悊
+ CrmContractImportRespVO respVO = CrmContractImportRespVO.builder()
+ .createContractNames(new ArrayList<>())
+ .updateContractNames(new ArrayList<>())
+ .failureContractNames(new LinkedHashMap<>())
+ .build();
+ importContracts.forEach(importContract -> {
+ try {
+ // 3.1 瑙ｆ瀽瀹㈡埛
+ CrmCustomerDO customer = customerMapper.selectByCustomerName(importContract.getCustomerName());
+ if (customer == null) {
+ throw exception(CONTRACT_IMPORT_CUSTOMER_NOT_EXISTS, importContract.getCustomerName());
+ }
+ // 3.2 鍒ゆ柇鏄惁瀛樺湪
+ CrmContractDO existContract = contractMapper.selectByNameAndCustomerId(
+ importContract.getName(), customer.getId());
+ if (existContract == null) {
+ // 3.2.1 鏂板
+ String no = noRedisDAO.generate(CrmNoRedisDAO.CONTRACT_NO_PREFIX);
+ if (contractMapper.selectByNo(no) != null) {
+ throw exception(CONTRACT_NO_EXISTS);
+ }
+ CrmContractDO contract = BeanUtils.toBean(importContract, CrmContractDO.class)
+ .setCustomerId(customer.getId()).setOwnerUserId(ownerUserId)
+ .setNo(no).setAuditStatus(CrmAuditStatusEnum.DRAFT.getStatus());
+ if (contract.getOrderDate() == null) {
+ contract.setOrderDate(LocalDateTime.now());
+ }
+ if (contract.getDiscountPercent() == null) {
+ contract.setDiscountPercent(BigDecimal.ZERO);
+ }
+ if (contract.getTotalPrice() == null) {
+ calculateTotalPrice(contract, Collections.emptyList());
+ }
+ contractMapper.insert(contract);
+ // 鍒涘缓鏁版嵁鏉冮檺
+ crmPermissionService.createPermission(new CrmPermissionCreateReqBO()
+ .setBizType(CrmBizTypeEnum.CRM_CONTRACT.getType()).setBizId(contract.getId())
+ .setUserId(ownerUserId).setLevel(CrmPermissionLevelEnum.OWNER.getLevel()));
+ respVO.getCreateContractNames().add(importContract.getName());
+ // 璁板綍鎿嶄綔鏃ュ織
+ getSelf().importContractLog(contract, false);
+ return;
+ }
+ // 3.2.2 宸插瓨鍦紝鍒ゆ柇鏄惁鍏佽鏇存柊
+ if (!importReqVO.getUpdateSupport()) {
+ respVO.getFailureContractNames().put(importContract.getName(),
+ StrUtil.format(CONTRACT_NAME_EXISTS.getMsg(), importContract.getName()));
+ return;
+ }
+ CrmContractDO updateContract = BeanUtils.toBean(importContract, CrmContractDO.class)
+ .setId(existContract.getId()).setCustomerId(customer.getId());
+ contractMapper.updateById(updateContract);
+ respVO.getUpdateContractNames().add(importContract.getName());
+ // 璁板綍鎿嶄綔鏃ュ織
+ getSelf().importContractLog(updateContract, true);
+ } catch (ServiceException ex) {
+ respVO.getFailureContractNames().put(importContract.getName(), ex.getMessage());
+ }
+ });
+ return respVO;
+ }
+
+ /**
+ * 璁板綍瀵煎叆鍚堝悓鏃剁殑鎿嶄綔鏃ュ織
+ *
+ * @param contract 鍚堝悓淇℃伅
+ * @param isUpdate 鏄惁鏇存柊锛泃rue - 鏇存柊锛宖alse - 鏂板
+ */
+ @LogRecord(type = CRM_CONTRACT_TYPE, subType = CRM_CONTRACT_IMPORT_SUB_TYPE, bizNo = "{{#contract.id}}",
+ success = CRM_CONTRACT_IMPORT_SUCCESS)
+ public void importContractLog(CrmContractDO contract, boolean isUpdate) {
+ LogRecordContext.putVariable("contract", contract);
+ LogRecordContext.putVariable("isUpdate", isUpdate);
+ }
+
+ /**
+ * 鑾峰緱鑷韩鐨勪唬鐞嗗璞★紝瑙ｅ喅 AOP 鐢熸晥闂
+ *
+ * @return 鑷繁
+ */
+ private CrmContractServiceImpl getSelf() {
+ return SpringUtil.getBean(getClass());
+ }
+
}
--
Gitblit v1.9.3