From 3179fbb9c77eeb5260593e9df20046285dc56fe6 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 03 七月 2026 11:00:08 +0800
Subject: [PATCH] 1.销售模块修改 2.CRM模块修改
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java | 65 +++++++++++++++++++++++++++++++-
1 files changed, 63 insertions(+), 2 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java
index c3bf261..17c99a9 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java
@@ -6,6 +6,7 @@
import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
+import cn.iocoder.yudao.module.crm.api.contract.CrmContractApi;
import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderSaveReqVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO;
@@ -56,6 +57,8 @@
private ErpProductService productService;
@Resource
private CrmCustomerApi customerApi;
+ @Resource
+ private CrmContractApi contractApi;
@Resource
private ErpAccountService accountService;
@@ -147,11 +150,13 @@
throw exception(approve ? SALE_ORDER_APPROVE_FAIL : SALE_ORDER_PROCESS_FAIL);
}
// 1.3 瀛樺湪閿�鍞嚭搴撳崟锛屾棤娉曞弽瀹℃牳
- if (!approve && saleOrder.getOutCount().compareTo(BigDecimal.ZERO) > 0) {
+ BigDecimal outCount = saleOrder.getOutCount() != null ? saleOrder.getOutCount() : BigDecimal.ZERO;
+ if (!approve && outCount.compareTo(BigDecimal.ZERO) > 0) {
throw exception(SALE_ORDER_PROCESS_FAIL_EXISTS_OUT);
}
// 1.4 瀛樺湪閿�鍞��璐у崟锛屾棤娉曞弽瀹℃牳
- if (!approve && saleOrder.getReturnCount().compareTo(BigDecimal.ZERO) > 0) {
+ BigDecimal returnCount = saleOrder.getReturnCount() != null ? saleOrder.getReturnCount() : BigDecimal.ZERO;
+ if (!approve && returnCount.compareTo(BigDecimal.ZERO) > 0) {
throw exception(SALE_ORDER_PROCESS_FAIL_EXISTS_RETURN);
}
@@ -163,6 +168,62 @@
}
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void cancelSaleOrder(Long id) {
+ // 1.1 鏍￠獙瀛樺湪
+ ErpSaleOrderDO saleOrder = validateSaleOrderExists(id);
+ // 1.2 鏍￠獙鐘舵�侊細鍙湁宸插鏍哥殑璁㈠崟鎵嶈兘浣滃簾
+ if (!ErpAuditStatus.APPROVE.getStatus().equals(saleOrder.getStatus())) {
+ throw exception(SALE_ORDER_CANCEL_FAIL_NOT_APPROVE, saleOrder.getNo());
+ }
+ // 1.3 瀛樺湪閿�鍞嚭搴撳崟锛屾棤娉曚綔搴�
+ BigDecimal outCount = saleOrder.getOutCount() != null ? saleOrder.getOutCount() : BigDecimal.ZERO;
+ if (outCount.compareTo(BigDecimal.ZERO) > 0) {
+ throw exception(SALE_ORDER_CANCEL_FAIL_EXISTS_OUT);
+ }
+ // 1.4 瀛樺湪閿�鍞��璐у崟锛屾棤娉曚綔搴�
+ BigDecimal returnCount = saleOrder.getReturnCount() != null ? saleOrder.getReturnCount() : BigDecimal.ZERO;
+ if (returnCount.compareTo(BigDecimal.ZERO) > 0) {
+ throw exception(SALE_ORDER_CANCEL_FAIL_EXISTS_RETURN);
+ }
+
+ // 2. 鏇存柊鐘舵�佷负宸蹭綔搴�
+ int updateCount = saleOrderMapper.updateByIdAndStatus(id, saleOrder.getStatus(),
+ new ErpSaleOrderDO().setStatus(ErpAuditStatus.CANCEL.getStatus()));
+ if (updateCount == 0) {
+ throw exception(SALE_ORDER_CANCEL_FAIL);
+ }
+
+ // 3. 鍚屾鏇存柊鍏宠仈鍚堝悓鐘舵�佷负宸蹭綔搴�
+ if (saleOrder.getContractId() != null) {
+ contractApi.updateContractStatus(saleOrder.getContractId(), 50).getCheckedData(); // 50 = 宸蹭綔搴�
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void enableSaleOrder(Long id) {
+ // 1.1 鏍￠獙瀛樺湪
+ ErpSaleOrderDO saleOrder = validateSaleOrderExists(id);
+ // 1.2 鏍￠獙鐘舵�侊細鍙湁宸蹭綔搴熺殑璁㈠崟鎵嶈兘閲嶆柊鍚敤
+ if (!ErpAuditStatus.CANCEL.getStatus().equals(saleOrder.getStatus())) {
+ throw exception(SALE_ORDER_ENABLE_FAIL_NOT_CANCEL, saleOrder.getNo());
+ }
+
+ // 2. 鏇存柊鐘舵�佷负宸插鏍�
+ int updateCount = saleOrderMapper.updateByIdAndStatus(id, saleOrder.getStatus(),
+ new ErpSaleOrderDO().setStatus(ErpAuditStatus.APPROVE.getStatus()));
+ if (updateCount == 0) {
+ throw exception(SALE_ORDER_ENABLE_FAIL);
+ }
+
+ // 3. 鍚屾鏇存柊鍏宠仈鍚堝悓鐘舵�佷负瀹℃牳閫氳繃
+ if (saleOrder.getContractId() != null) {
+ contractApi.updateContractStatus(saleOrder.getContractId(), 20).getCheckedData(); // 20 = 瀹℃牳閫氳繃
+ }
+ }
+
private List<ErpSaleOrderItemDO> validateSaleOrderItems(List<ErpSaleOrderSaveReqVO.Item> list) {
// 1. 鏍￠獙浜у搧瀛樺湪
List<ErpProductDO> productList = productService.validProductList(
--
Gitblit v1.9.3