Merge commit '2f5c9fa1baedf046fbaece14dd901d8e09065c10' into master-jdk17

YunaiV
2 parents b7fab264 2f5c9fa1
Showing 13 changed files with 76 additions and 5 deletions
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/contract/CrmContractProductMapper.java
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/product/ErpProductServiceImpl.java
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockCheckService.java
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockCheckServiceImpl.java
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInService.java
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInServiceImpl.java
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutService.java
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutServiceImpl.java
yudao-module-mall/yudao-module-product/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuPageReqVO.java
yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java
@@ -20,4 +20,8 @@ public interface CrmContractProductMapper extends BaseMapperX&lt;CrmContractProduct
         return selectList(new LambdaQueryWrapperX<CrmContractProductDO>().eq(CrmContractProductDO::getContractId, contractId));
     }
  
+    default int deleteByContractId(Long contractId) {
+        return delete(new LambdaQueryWrapperX<CrmContractProductDO>().eq(CrmContractProductDO::getContractId, contractId));
+    }
+
 }
@@ -240,7 +240,9 @@ 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);
  
         // 3. 记录操作日志上下文
@@ -190,7 +190,8 @@ public class CrmReceivableServiceImpl implements CrmReceivableService {
             return null;
         }
         CrmReceivablePlanDO receivablePlan = receivablePlanService.getReceivablePlan(planId);
-        return receivablePlan.getPeriod();
+        // 计划已被删除时查询返回 null：期数返回 null，避免 NPE 导致删除/更新回款失败
+        return receivablePlan == null ? null : receivablePlan.getPeriod();
     }
  
     @Override
@@ -136,6 +136,9 @@ ErrorCode PURCHASE_ORDER_ITEM_RETURN_FAIL_IN_EXCEED = new ErrorCode(1_030_101_00
     ErrorCode PRODUCT_DELETE_FAIL_SALE_ORDER_EXISTS = new ErrorCode(1_030_500_005, "产品已被销售订单引用，无法删除");
     ErrorCode PRODUCT_DELETE_FAIL_SALE_OUT_EXISTS = new ErrorCode(1_030_500_006, "产品已被销售出库单引用，无法删除");
     ErrorCode PRODUCT_DELETE_FAIL_SALE_RETURN_EXISTS = new ErrorCode(1_030_500_007, "产品已被销售退货单引用，无法删除");
+    ErrorCode PRODUCT_DELETE_FAIL_STOCK_IN_EXISTS = new ErrorCode(1_030_500_008, "产品已被其它入库单引用，无法删除");
+    ErrorCode PRODUCT_DELETE_FAIL_STOCK_OUT_EXISTS = new ErrorCode(1_030_500_009, "产品已被其它出库单引用，无法删除");
+    ErrorCode PRODUCT_DELETE_FAIL_STOCK_CHECK_EXISTS = new ErrorCode(1_030_500_010, "产品已被盘点单引用，无法删除");
  
     // ========== ERP 产品分类 1-030-501-000 ==========
     ErrorCode PRODUCT_CATEGORY_NOT_EXISTS = new ErrorCode(1_030_501_000, "产品分类不存在");
@@ -18,6 +18,9 @@ import cn.iocoder.yudao.module.erp.service.purchase.ErpPurchaseReturnService;
 import cn.iocoder.yudao.module.erp.service.sale.ErpSaleOrderService;
 import cn.iocoder.yudao.module.erp.service.sale.ErpSaleOutService;
 import cn.iocoder.yudao.module.erp.service.sale.ErpSaleReturnService;
+import cn.iocoder.yudao.module.erp.service.stock.ErpStockCheckService;
+import cn.iocoder.yudao.module.erp.service.stock.ErpStockInService;
+import cn.iocoder.yudao.module.erp.service.stock.ErpStockOutService;
 import jakarta.annotation.Resource;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -63,6 +66,15 @@ public class ErpProductServiceImpl implements ErpProductService {
     @Resource
     @Lazy // 延迟加载，避免循环依赖
     private ErpSaleReturnService saleReturnService;
+    @Resource
+    @Lazy // 延迟加载，避免循环依赖
+    private ErpStockInService stockInService;
+    @Resource
+    @Lazy // 延迟加载，避免循环依赖
+    private ErpStockOutService stockOutService;
+    @Resource
+    @Lazy // 延迟加载，避免循环依赖
+    private ErpStockCheckService stockCheckService;
  
     @Override
     public Long createProduct(ProductSaveReqVO createReqVO) {
@@ -107,6 +119,15 @@ public class ErpProductServiceImpl implements ErpProductService {
         if (saleReturnService.getSaleReturnItemCountByProductId(id) > 0) {
             throw exception(PRODUCT_DELETE_FAIL_SALE_RETURN_EXISTS);
         }
+        if (stockInService.getStockInItemCountByProductId(id) > 0) {
+            throw exception(PRODUCT_DELETE_FAIL_STOCK_IN_EXISTS);
+        }
+        if (stockOutService.getStockOutItemCountByProductId(id) > 0) {
+            throw exception(PRODUCT_DELETE_FAIL_STOCK_OUT_EXISTS);
+        }
+        if (stockCheckService.getStockCheckItemCountByProductId(id) > 0) {
+            throw exception(PRODUCT_DELETE_FAIL_STOCK_CHECK_EXISTS);
+        }
         // 删除
         productMapper.deleteById(id);
     }
@@ -81,4 +81,12 @@ public interface ErpStockCheckService {
      */
     List<ErpStockCheckItemDO> getStockCheckItemListByCheckIds(Collection<Long> checkIds);
  
+    /**
+     * 获得指定产品的库存盘点单项数量（产品删除前的引用校验）
+     *
+     * @param productId 产品编号
+     * @return 库存盘点单项数量
+     */
+    Long getStockCheckItemCountByProductId(Long productId);
+
 }
 \ No newline at end of file
@@ -229,4 +229,9 @@ public class ErpStockCheckServiceImpl implements ErpStockCheckService {
         return stockCheckItemMapper.selectListByCheckIds(checkIds);
     }
  
+    @Override
+    public Long getStockCheckItemCountByProductId(Long productId) {
+        return stockCheckItemMapper.selectCount(ErpStockCheckItemDO::getProductId, productId);
+    }
+
 }
@@ -81,4 +81,12 @@ public interface ErpStockInService {
      */
     List<ErpStockInItemDO> getStockInItemListByInIds(Collection<Long> inIds);
  
+    /**
+     * 获得指定产品的其它入库单项数量（产品删除前的引用校验）
+     *
+     * @param productId 产品编号
+     * @return 其它入库单项数量
+     */
+    Long getStockInItemCountByProductId(Long productId);
+
 }
 \ No newline at end of file
@@ -225,4 +225,9 @@ public class ErpStockInServiceImpl implements ErpStockInService {
         return stockInItemMapper.selectListByInIds(inIds);
     }
  
+    @Override
+    public Long getStockInItemCountByProductId(Long productId) {
+        return stockInItemMapper.selectCount(ErpStockInItemDO::getProductId, productId);
+    }
+
 }
@@ -81,4 +81,12 @@ public interface ErpStockOutService {
      */
     List<ErpStockOutItemDO> getStockOutItemListByOutIds(Collection<Long> outIds);
  
+    /**
+     * 获得指定产品的其它出库单项数量（产品删除前的引用校验）
+     *
+     * @param productId 产品编号
+     * @return 其它出库单项数量
+     */
+    Long getStockOutItemCountByProductId(Long productId);
+
 }
 \ No newline at end of file
@@ -225,4 +225,9 @@ public class ErpStockOutServiceImpl implements ErpStockOutService {
         return stockOutItemMapper.selectListByOutIds(outIds);
     }
  
+    @Override
+    public Long getStockOutItemCountByProductId(Long productId) {
+        return stockOutItemMapper.selectCount(ErpStockOutItemDO::getProductId, productId);
+    }
+
 }
@@ -45,7 +45,7 @@ public class AppProductSpuPageReqVO extends PageParam {
         if (StrUtil.isEmpty(sortField)) {
             return true;
         }
-        return StrUtil.equalsAny(sortField, SORT_FIELD_PRICE, SORT_FIELD_SALES_COUNT);
+        return StrUtil.equalsAny(sortField, SORT_FIELD_PRICE, SORT_FIELD_SALES_COUNT, SORT_FIELD_CREATE_TIME);
     }
  
 }
@@ -190,9 +190,10 @@ public class BrokerageWithdrawServiceImpl implements BrokerageWithdrawService {
  
         // 2.1 计算手续费
         Integer feePrice = calculateFeePrice(createReqVO.getPrice(), tradeConfig.getBrokerageWithdrawFeePercent());
-        // 2.2 创建佣金提现记录
+        // 2.2 创建佣金提现记录（初始状态显式置为「审核中」，不依赖 DDL 列默认值——否则列 DEFAULT NULL 时建单 status 为空，审核恒拒）
         BrokerageWithdrawDO withdraw = BeanUtils.toBean(createReqVO, BrokerageWithdrawDO.class)
-                .setUserId(userId).setFeePrice(feePrice);
+                .setUserId(userId).setFeePrice(feePrice)
+                .setStatus(BrokerageWithdrawStatusEnum.AUDITING.getStatus());
         brokerageWithdrawMapper.insert(withdraw);
  
         // 3. 创建用户佣金记录