Commit 1791731434ae105b1c0bd5a0195ed0d146a7c867
1 parent
8809b50d
style: 统一 CRM、ERP 和佣金提现的代码注释
精简合同删除、回款期数与提现初始化注释,对齐库存服务计数方法的 Javadoc。
Showing
6 changed files
with
9 additions
and
9 deletions
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
| ... | ... | @@ -240,7 +240,7 @@ public class CrmContractServiceImpl implements CrmContractService { |
| 240 | 240 | |
| 241 | 241 | // 2.1 删除合同 |
| 242 | 242 | contractMapper.deleteById(id); |
| 243 | - // 2.2 删除合同产品明细,避免残留明细仍计入产品引用计数、把关联产品的删除路径锁死 | |
| 243 | + // 2.2 删除合同产品 | |
| 244 | 244 | contractProductMapper.deleteByContractId(id); |
| 245 | 245 | // 2.3 删除数据权限 |
| 246 | 246 | crmPermissionService.deletePermission(CrmBizTypeEnum.CRM_CONTRACT.getType(), id); | ... | ... |
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java
| ... | ... | @@ -190,7 +190,7 @@ public class CrmReceivableServiceImpl implements CrmReceivableService { |
| 190 | 190 | return null; |
| 191 | 191 | } |
| 192 | 192 | CrmReceivablePlanDO receivablePlan = receivablePlanService.getReceivablePlan(planId); |
| 193 | - // 计划已被删除时查询返回 null:期数返回 null,避免 NPE 导致删除/更新回款失败 | |
| 193 | + // 回款计划可能已被删除 | |
| 194 | 194 | return receivablePlan == null ? null : receivablePlan.getPeriod(); |
| 195 | 195 | } |
| 196 | 196 | ... | ... |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockCheckService.java
| ... | ... | @@ -82,10 +82,10 @@ public interface ErpStockCheckService { |
| 82 | 82 | List<ErpStockCheckItemDO> getStockCheckItemListByCheckIds(Collection<Long> checkIds); |
| 83 | 83 | |
| 84 | 84 | /** |
| 85 | - * 获得指定产品的库存盘点单项数量(产品删除前的引用校验) | |
| 85 | + * 获得引用指定产品的库存盘点项数量 | |
| 86 | 86 | * |
| 87 | 87 | * @param productId 产品编号 |
| 88 | - * @return 库存盘点单项数量 | |
| 88 | + * @return 数量 | |
| 89 | 89 | */ |
| 90 | 90 | Long getStockCheckItemCountByProductId(Long productId); |
| 91 | 91 | ... | ... |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInService.java
| ... | ... | @@ -82,10 +82,10 @@ public interface ErpStockInService { |
| 82 | 82 | List<ErpStockInItemDO> getStockInItemListByInIds(Collection<Long> inIds); |
| 83 | 83 | |
| 84 | 84 | /** |
| 85 | - * 获得指定产品的其它入库单项数量(产品删除前的引用校验) | |
| 85 | + * 获得引用指定产品的其它入库项数量 | |
| 86 | 86 | * |
| 87 | 87 | * @param productId 产品编号 |
| 88 | - * @return 其它入库单项数量 | |
| 88 | + * @return 数量 | |
| 89 | 89 | */ |
| 90 | 90 | Long getStockInItemCountByProductId(Long productId); |
| 91 | 91 | ... | ... |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutService.java
| ... | ... | @@ -82,10 +82,10 @@ public interface ErpStockOutService { |
| 82 | 82 | List<ErpStockOutItemDO> getStockOutItemListByOutIds(Collection<Long> outIds); |
| 83 | 83 | |
| 84 | 84 | /** |
| 85 | - * 获得指定产品的其它出库单项数量(产品删除前的引用校验) | |
| 85 | + * 获得引用指定产品的其它出库项数量 | |
| 86 | 86 | * |
| 87 | 87 | * @param productId 产品编号 |
| 88 | - * @return 其它出库单项数量 | |
| 88 | + * @return 数量 | |
| 89 | 89 | */ |
| 90 | 90 | Long getStockOutItemCountByProductId(Long productId); |
| 91 | 91 | ... | ... |
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 { |
| 190 | 190 | |
| 191 | 191 | // 2.1 计算手续费 |
| 192 | 192 | Integer feePrice = calculateFeePrice(createReqVO.getPrice(), tradeConfig.getBrokerageWithdrawFeePercent()); |
| 193 | - // 2.2 创建佣金提现记录(初始状态显式置为「审核中」,不依赖 DDL 列默认值——否则列 DEFAULT NULL 时建单 status 为空,审核恒拒) | |
| 193 | + // 2.2 创建佣金提现记录,状态为审核中 | |
| 194 | 194 | BrokerageWithdrawDO withdraw = BeanUtils.toBean(createReqVO, BrokerageWithdrawDO.class) |
| 195 | 195 | .setUserId(userId).setFeePrice(feePrice) |
| 196 | 196 | .setStatus(BrokerageWithdrawStatusEnum.AUDITING.getStatus()); | ... | ... |