From 1791731434ae105b1c0bd5a0195ed0d146a7c867 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Thu, 22 Oct 2026 21:21:24 +0800 Subject: [PATCH] style: 统一 CRM、ERP 和佣金提现的代码注释 --- yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java | 2 +- yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java | 2 +- yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockCheckService.java | 4 ++-- yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInService.java | 4 ++-- yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutService.java | 4 ++-- yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java | 2 +- 6 files changed, 9 insertions(+), 9 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 ce116e0..9d601b7 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 @@ -240,7 +240,7 @@ public class CrmContractServiceImpl implements CrmContractService { // 2.1 删除合同 contractMapper.deleteById(id); - // 2.2 删除合同产品明细，避免残留明细仍计入产品引用计数、把关联产品的删除路径锁死 + // 2.2 删除合同产品 contractProductMapper.deleteByContractId(id); // 2.3 删除数据权限 crmPermissionService.deletePermission(CrmBizTypeEnum.CRM_CONTRACT.getType(), id); diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java index 1485307..3c11cb1 100644 --- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java +++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java @@ -190,7 +190,7 @@ public class CrmReceivableServiceImpl implements CrmReceivableService { return null; } CrmReceivablePlanDO receivablePlan = receivablePlanService.getReceivablePlan(planId); - // 计划已被删除时查询返回 null：期数返回 null，避免 NPE 导致删除/更新回款失败 + // 回款计划可能已被删除 return receivablePlan == null ? null : receivablePlan.getPeriod(); } diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockCheckService.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockCheckService.java index 058bf6a..f050dbf 100644 --- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockCheckService.java +++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockCheckService.java @@ -82,10 +82,10 @@ public interface ErpStockCheckService { List getStockCheckItemListByCheckIds(Collection checkIds); /** - * 获得指定产品的库存盘点单项数量（产品删除前的引用校验） + * 获得引用指定产品的库存盘点项数量 * * @param productId 产品编号 - * @return 库存盘点单项数量 + * @return 数量 */ Long getStockCheckItemCountByProductId(Long productId); diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInService.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInService.java index fa3e9e1..23fd9cd 100644 --- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInService.java +++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInService.java @@ -82,10 +82,10 @@ public interface ErpStockInService { List getStockInItemListByInIds(Collection inIds); /** - * 获得指定产品的其它入库单项数量（产品删除前的引用校验） + * 获得引用指定产品的其它入库项数量 * * @param productId 产品编号 - * @return 其它入库单项数量 + * @return 数量 */ Long getStockInItemCountByProductId(Long productId); diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutService.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutService.java index 1456236..1638cf5 100644 --- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutService.java +++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutService.java @@ -82,10 +82,10 @@ public interface ErpStockOutService { List getStockOutItemListByOutIds(Collection outIds); /** - * 获得指定产品的其它出库单项数量（产品删除前的引用校验） + * 获得引用指定产品的其它出库项数量 * * @param productId 产品编号 - * @return 其它出库单项数量 + * @return 数量 */ Long getStockOutItemCountByProductId(Long productId); diff --git a/yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java b/yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java index ccee473..5db6568 100644 --- a/yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java +++ b/yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java @@ -190,7 +190,7 @@ public class BrokerageWithdrawServiceImpl implements BrokerageWithdrawService { // 2.1 计算手续费 Integer feePrice = calculateFeePrice(createReqVO.getPrice(), tradeConfig.getBrokerageWithdrawFeePercent()); - // 2.2 创建佣金提现记录（初始状态显式置为「审核中」，不依赖 DDL 列默认值——否则列 DEFAULT NULL 时建单 status 为空，审核恒拒） + // 2.2 创建佣金提现记录，状态为审核中 BrokerageWithdrawDO withdraw = BeanUtils.toBean(createReqVO, BrokerageWithdrawDO.class) .setUserId(userId).setFeePrice(feePrice) .setStatus(BrokerageWithdrawStatusEnum.AUDITING.getStatus()); -- libgit2 0.21.4