From 4bc513be11e671caf20ec6013a51dee42c2ed96e Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期六, 07 十一月 2026 18:31:26 +0800
Subject: [PATCH] fix(crm): 禁止物料类合同开票
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImpl.java | 31 +++++++++++++++
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java | 1
yudao-module-crm/src/test/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImplTest.java | 60 ++++++++++++++++++++++++++++++
3 files changed, 92 insertions(+), 0 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
index f9cee65..ca2faba 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
@@ -145,6 +145,7 @@
ErrorCode INVOICE_SUBMIT_FAIL_NOT_EDITABLE = new ErrorCode(1_020_016_004, "鍙湁鑽夌鎴栧鏍镐笉閫氳繃鐘舵�佺殑寮�绁ㄦ墠鑳芥彁浜ゅ鎵�");
ErrorCode INVOICE_AUDIT_FAIL_NOT_PROCESS = new ErrorCode(1_020_016_005, "鍙湁瀹℃壒涓姸鎬佺殑寮�绁ㄦ墠鑳藉鏍�");
ErrorCode INVOICE_AUDIT_REJECT_REASON_REQUIRED = new ErrorCode(1_020_016_013, "瀹℃牳涓嶉�氳繃鏃跺繀椤诲~鍐欎笉閫氳繃鍘熷洜");
+ ErrorCode INVOICE_CREATE_FAIL_MATERIAL_NOT_ALLOWED = new ErrorCode(1_020_016_014, "鐗╂枡涓嶅厑璁稿紑绁�");
ErrorCode INVOICE_CREATE_FAIL_CONTRACT_NOT_APPROVE = new ErrorCode(1_020_016_006, "鍒涘缓寮�绁ㄥけ璐ワ紝鍘熷洜锛氬悎鍚屼笉鏄鏍搁�氳繃鐘舵��");
ErrorCode INVOICE_CREATE_FAIL_PRICE_EXCEEDS_LIMIT = new ErrorCode(1_020_016_007, "鍒涘缓寮�绁ㄥけ璐ワ紝鍘熷洜锛氬紑绁ㄩ噾棰濊秴鍑哄悎鍚岄噾棰濓紝鐩墠鍙紑绁細{} 鍏�");
ErrorCode RECEIVABLE_CREATE_FAIL_INVOICE_NOT_EXISTS = new ErrorCode(1_020_016_008, "鍒涘缓鍥炴澶辫触锛屽師鍥狅細鍏宠仈鐨勫紑绁ㄤ笉瀛樺湪");
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImpl.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImpl.java
index 91e98c9..09fb01a 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImpl.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImpl.java
@@ -13,6 +13,7 @@
import cn.iocoder.yudao.module.crm.controller.admin.invoice.vo.invoice.CrmInvoicePageReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.invoice.vo.invoice.CrmInvoiceSaveReqVO;
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.invoice.CrmInvoiceDO;
import cn.iocoder.yudao.module.crm.dal.mysql.invoice.CrmInvoiceMapper;
import cn.iocoder.yudao.module.crm.dal.redis.no.CrmNoRedisDAO;
@@ -30,6 +31,9 @@
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
+import cn.iocoder.yudao.module.mdm.enums.MdmItemTypeEnum;
import com.mzt.logapi.context.LogRecordContext;
import com.mzt.logapi.service.impl.DiffParseFunction;
import com.mzt.logapi.starter.annotation.LogRecord;
@@ -87,6 +91,8 @@
private CrmContractService contractService;
@Resource
private CrmPermissionService permissionService;
+ @Resource
+ private MdmItemApi mdmItemApi;
@Resource
private AdminUserApi adminUserApi;
@@ -104,6 +110,7 @@
public Long createInvoice(CrmInvoiceSaveReqVO createReqVO) {
// 1.1 鏍¢獙鍏宠仈鏁版嵁瀛樺湪锛堝紑绁ㄩ噾棰濅笉鍐嶅彈鍚堝悓閲戦闄愬埗锛屼粎鍓嶇鎻愮ず鍙紑绁ㄩ噾棰濓級
validateRelationDataExists(createReqVO);
+ validateContractItemsInvoiceable(createReqVO.getContractId());
// 1.3 鐢熸垚寮�绁ㄧ紪鍙�
String no = noRedisDAO.generate(CrmNoRedisDAO.INVOICE_PREFIX);
if (invoiceMapper.selectByNo(no) != null) {
@@ -140,6 +147,29 @@
throw exception(INVOICE_CREATE_FAIL_CONTRACT_NOT_APPROVE);
}
reqVO.setCustomerId(contract.getCustomerId()); // 璁剧疆瀹㈡埛缂栧彿
+ }
+ }
+
+ /**
+ * 鍚堝悓涓寘鍚墿鏂欐椂涓嶅厑璁稿紑绁紝鍙湁浜у搧绫婚攢鍞唴瀹规墠鍙繘鍏ュ紑绁ㄦ祦绋嬨��
+ */
+ void validateContractItemsInvoiceable(Long contractId) {
+ if (contractId == null) {
+ return;
+ }
+ List<CrmContractProductDO> contractProducts = contractService.getContractProductListByContractId(contractId);
+ if (CollUtil.isEmpty(contractProducts)) {
+ return;
+ }
+ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
+ CollectionUtils.convertSet(contractProducts, CrmContractProductDO::getItemId));
+ boolean containsMaterial = contractProducts.stream()
+ .map(CrmContractProductDO::getItemId)
+ .map(itemMap::get)
+ .filter(ObjectUtil::isNotNull)
+ .anyMatch(item -> MdmItemTypeEnum.MATERIAL.getType().equals(item.getItemType()));
+ if (containsMaterial) {
+ throw exception(INVOICE_CREATE_FAIL_MATERIAL_NOT_ALLOWED);
}
}
@@ -210,6 +240,7 @@
&& ObjUtil.notEqual(invoice.getAuditStatus(), CrmAuditStatusEnum.REJECT.getStatus())) {
throw exception(INVOICE_SUBMIT_FAIL_NOT_EDITABLE);
}
+ validateContractItemsInvoiceable(invoice.getContractId());
// 2. 鏍¢獙瀹℃壒閰嶇疆宸插惎鐢ㄤ笖閰嶇疆浜嗘湁鏁堝鎵逛汉锛堟湭閰嶇疆鏃舵姏鍑哄甫鏄庣‘鎻愮ず鐨勪笟鍔″紓甯革級
approvalConfigApi.validateApprovalEnabledAndGetApprovers(INVOICE_APPROVE_BIZ_TYPE);
diff --git a/yudao-module-crm/src/test/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImplTest.java b/yudao-module-crm/src/test/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImplTest.java
new file mode 100644
index 0000000..85fdab4
--- /dev/null
+++ b/yudao-module-crm/src/test/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImplTest.java
@@ -0,0 +1,60 @@
+package cn.iocoder.yudao.module.crm.service.invoice;
+
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.module.crm.dal.dataobject.contract.CrmContractProductDO;
+import cn.iocoder.yudao.module.crm.service.contract.CrmContractService;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
+import cn.iocoder.yudao.module.mdm.enums.MdmItemTypeEnum;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class CrmInvoiceServiceImplTest {
+
+ @Mock
+ private CrmContractService contractService;
+ @Mock
+ private MdmItemApi mdmItemApi;
+ @InjectMocks
+ private CrmInvoiceServiceImpl invoiceService;
+
+ @Test
+ void validateContractItemsInvoiceable_rejectsMaterial() {
+ mockContractItem(MdmItemTypeEnum.MATERIAL);
+
+ ServiceException exception = assertThrows(ServiceException.class,
+ () -> invoiceService.validateContractItemsInvoiceable(1L));
+
+ assertEquals("鐗╂枡涓嶅厑璁稿紑绁�", exception.getMessage());
+ }
+
+ @Test
+ void validateContractItemsInvoiceable_allowsProduct() {
+ mockContractItem(MdmItemTypeEnum.PRODUCT);
+
+ assertDoesNotThrow(() -> invoiceService.validateContractItemsInvoiceable(1L));
+ }
+
+ private void mockContractItem(MdmItemTypeEnum itemType) {
+ CrmContractProductDO contractProduct = CrmContractProductDO.builder().itemId(10L).build();
+ MdmItemRespDTO item = new MdmItemRespDTO();
+ item.setId(10L);
+ item.setItemType(itemType.getType());
+ when(contractService.getContractProductListByContractId(1L)).thenReturn(List.of(contractProduct));
+ when(mdmItemApi.getItemMap(Set.of(10L))).thenReturn(Map.of(10L, item));
+ }
+
+}
--
Gitblit v1.9.3